X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvfm.h;h=9b577ed8abbb7bf58c99292a13ba46c9dc447cd1;hb=3bd4593ef9a57f23062c61ec465389f749ba3089;hp=f50b45ee38b5306337808d5059d33b3714f292c2;hpb=f9d47b5bba8416419cf3bcd3aa23c2d40a05fcac;p=pspp-builds.git diff --git a/src/vfm.h b/src/vfm.h index f50b45ee..9b577ed8 100644 --- a/src/vfm.h +++ b/src/vfm.h @@ -25,9 +25,7 @@ /* This is the time at which vfm was last invoked. */ extern time_t last_vfm_invocation; -/* This is the case that is to be filled in by input programs. */ -extern struct ccase *temp_case; - +struct ccase; typedef struct write_case_data *write_case_data; typedef int write_case_func (write_case_data); @@ -38,7 +36,8 @@ extern struct case_source *vfm_source; struct case_source { const struct case_source_class *class; /* Class. */ - void *aux; /* Auxiliary data. */ + size_t value_cnt; /* Number of `union value's in case. */ + void *aux; /* Auxiliary data. */ }; /* A case source class. */ @@ -46,16 +45,21 @@ struct case_source_class { const char *name; /* Identifying name. */ - /* Reads all the cases and calls WRITE_CASE passing the given - AUX data for each one. */ - void (*read) (struct case_source *, write_case_func *, write_case_data); + /* Returns the exact number of cases that READ will pass to + WRITE_CASE, if known, or -1 otherwise. */ + int (*count) (const struct case_source *); + + /* Reads the cases one by one into C and for each one calls + WRITE_CASE passing the given AUX data. */ + void (*read) (struct case_source *, + struct ccase *c, + write_case_func *write_case, write_case_data aux); /* Destroys the source. */ void (*destroy) (struct case_source *); }; -extern const struct case_source_class memory_source_class; -extern const struct case_source_class disk_source_class; +extern const struct case_source_class storage_source_class; extern const struct case_source_class data_list_source_class; extern const struct case_source_class file_type_source_class; extern const struct case_source_class input_program_source_class; @@ -63,14 +67,19 @@ extern const struct case_source_class get_source_class; extern const struct case_source_class import_source_class; extern const struct case_source_class sort_source_class; +struct dictionary; struct case_source *create_case_source (const struct case_source_class *, + const struct dictionary *, void *); +void free_case_source (struct case_source *); + int case_source_is_complex (const struct case_source *); int case_source_is_class (const struct case_source *, const struct case_source_class *); -struct case_list *memory_source_get_cases (const struct case_source *); -void memory_source_set_cases (const struct case_source *, - struct case_list *); + +struct casefile *storage_source_get_casefile (struct case_source *); +struct case_source *storage_source_create (struct casefile *, + const struct dictionary *); /* The replacement active file, to which cases are written. */ extern struct case_sink *vfm_sink; @@ -79,7 +88,13 @@ extern struct case_sink *vfm_sink; struct case_sink { const struct case_sink_class *class; /* Class. */ - void *aux; /* Auxiliary data. */ + void *aux; /* Auxiliary data. */ + + /* Cases written to a case sink belong to a dictionary, but + their data is compacted to drop scratch variables. */ + const struct dictionary *dict; /* Dictionary for cases. */ + int *idx_to_fv; /* `dict' index -> case `data' index. */ + size_t value_cnt; /* Number of `union value's in case. */ }; /* A case sink class. */ @@ -87,42 +102,45 @@ struct case_sink_class { const char *name; /* Identifying name. */ - /* Creates the sink and opens it for writing. */ + /* Opens the sink for writing. */ void (*open) (struct case_sink *); /* Writes a case to the sink. */ - void (*write) (struct case_sink *, struct ccase *); + void (*write) (struct case_sink *, const struct ccase *); /* Closes and destroys the sink. */ void (*destroy) (struct case_sink *); - /* Closes and destroys the sink and returns a source that can - read back the cases that were written, perhaps transformed - in some way. */ + /* Closes the sink and returns a source that can read back + the cases that were written, perhaps transformed in some + way. The sink must still be separately destroyed by + calling destroy(). */ struct case_source *(*make_source) (struct case_sink *); }; -extern const struct case_sink_class memory_sink_class; -extern const struct case_sink_class disk_sink_class; -extern const struct case_sink_class sort_sink_class; +extern const struct case_sink_class storage_sink_class; +extern const struct case_sink_class null_sink_class; -struct case_sink *create_case_sink (const struct case_sink_class *, void *); +struct case_sink *create_case_sink (const struct case_sink_class *, + const struct dictionary *, + void *); +void case_sink_open (struct case_sink *); +void case_sink_write (struct case_sink *, const struct ccase *); +void case_sink_destroy (struct case_sink *); +void free_case_sink (struct case_sink *); /* Number of cases to lag. */ extern int n_lag; -void procedure (void (*beginfunc) (void *aux), - int (*procfunc) (struct ccase *curcase, void *aux), - void (*endfunc) (void *aux), - void *aux); +void procedure (int (*proc_func) (struct ccase *, void *aux), void *aux); +void procedure_with_splits (void (*begin_func) (void *aux), + int (*proc_func) (struct ccase *, void *aux), + void (*end_func) (void *aux), + void *aux); struct ccase *lagged_case (int n_before); -void compact_case (struct ccase *dest, const struct ccase *src); -void write_active_file_to_disk (void); - -void process_active_file (void (*beginfunc) (void *), - int (*casefunc) (struct ccase *curcase, void *), - void (*endfunc) (void *), - void *aux); -void process_active_file_output_case (void); + +void multipass_procedure_with_splits (void (*) (const struct casefile *, + void *), + void *aux); #endif /* !vfm_h */