X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fprocedure.c;h=91e185a45a43f3d78802338d6b26536f0a9dc6b0;hb=ca7da17a401e015805db0ea70234c267d67535a3;hp=6a891c9baff9d14f47f90350827d5406c65c19a8;hpb=9db3101d0bbbcfb687acd3e442e550557e4e56b1;p=pspp-builds.git diff --git a/src/data/procedure.c b/src/data/procedure.c index 6a891c9b..91e185a4 100644 --- a/src/data/procedure.c +++ b/src/data/procedure.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,12 +32,12 @@ #include #include #include -#include #include #include #include #include +#include "xalloc.h" struct dataset { /* Cases are read from source, @@ -56,13 +56,6 @@ struct dataset { struct trns_chain *temporary_trns_chain; struct dictionary *dict; - /* Callback which occurs when a procedure provides a new source for - the dataset */ - replace_source_callback *replace_source ; - - /* Callback which occurs whenever the DICT is replaced by a new one */ - replace_dictionary_callback *replace_dict; - /* Callback which occurs whenever the transformation chain(s) have been modified */ transformation_change_callback_func *xform_callback; @@ -86,7 +79,7 @@ struct dataset { /* Cases just before ("lagging") the current one. */ int n_lag; /* Number of cases to lag. */ struct deque lag; /* Deque of lagged cases. */ - struct ccase *lag_cases; /* Lagged cases managed by deque. */ + struct ccase **lag_cases; /* Lagged cases managed by deque. */ /* Procedure data. */ enum @@ -144,7 +137,7 @@ proc_execute (struct dataset *ds) return proc_commit (ds) && ok; } -static struct casereader_class proc_casereader_class; +static const struct casereader_class proc_casereader_class; /* Opens dataset DS for reading cases with proc_read. proc_commit must be called when done. */ @@ -210,15 +203,15 @@ proc_is_open (const struct dataset *ds) } /* "read" function for procedure casereader. */ -static bool -proc_casereader_read (struct casereader *reader UNUSED, void *ds_, - struct ccase *c) +static struct ccase * +proc_casereader_read (struct casereader *reader UNUSED, void *ds_) { struct dataset *ds = ds_; enum trns_result retval = TRNS_DROP_CASE; + struct ccase *c; assert (ds->proc_state == PROC_OPEN); - for (;;) + for (; ; case_unref (c)) { casenumber case_nr; @@ -226,58 +219,47 @@ proc_casereader_read (struct casereader *reader UNUSED, void *ds_, if (retval == TRNS_ERROR) ds->ok = false; if (!ds->ok) - return false; + return NULL; /* Read a case from source. */ - if (!casereader_read (ds->source, c)) - return false; - case_resize (c, dict_get_next_value_idx (ds->dict)); + c = casereader_read (ds->source); + if (c == NULL) + return NULL; + c = case_unshare_and_resize (c, dict_get_next_value_idx (ds->dict)); caseinit_init_vars (ds->caseinit, c); /* Execute permanent transformations. */ case_nr = ds->cases_written + 1; retval = trns_chain_execute (ds->permanent_trns_chain, TRNS_CONTINUE, - c, case_nr); + &c, case_nr); caseinit_update_left_vars (ds->caseinit, c); if (retval != TRNS_CONTINUE) - { - case_destroy (c); - continue; - } + continue; /* Write case to collection of lagged cases. */ if (ds->n_lag > 0) { while (deque_count (&ds->lag) >= ds->n_lag) - case_destroy (&ds->lag_cases[deque_pop_back (&ds->lag)]); - case_clone (&ds->lag_cases[deque_push_front (&ds->lag)], c); + case_unref (ds->lag_cases[deque_pop_back (&ds->lag)]); + ds->lag_cases[deque_push_front (&ds->lag)] = case_ref (c); } /* Write case to replacement active file. */ ds->cases_written++; if (ds->sink != NULL) - { - struct ccase tmp; - if (ds->compactor != NULL) - case_map_execute (ds->compactor, c, &tmp); - else - case_clone (&tmp, c); - casewriter_write (ds->sink, &tmp); - } + casewriter_write (ds->sink, + case_map_execute (ds->compactor, case_ref (c))); /* Execute temporary transformations. */ if (ds->temporary_trns_chain != NULL) { retval = trns_chain_execute (ds->temporary_trns_chain, TRNS_CONTINUE, - c, ds->cases_written); + &c, ds->cases_written); if (retval != TRNS_CONTINUE) - { - case_destroy (c); - continue; - } + continue; } - return true; + return c; } } @@ -286,13 +268,13 @@ static void proc_casereader_destroy (struct casereader *reader, void *ds_) { struct dataset *ds = ds_; - struct ccase c; + struct ccase *c; /* Make sure transformations happen for every input case, in case they have side effects, and ensure that the replacement active file gets all the cases it should. */ - while (casereader_read (reader, &c)) - case_destroy (&c); + while ((c = casereader_read (reader)) != NULL) + case_unref (c); ds->proc_state = PROC_CLOSED; ds->ok = casereader_destroy (ds->source) && ds->ok; @@ -313,7 +295,7 @@ proc_commit (struct dataset *ds) /* Free memory for lagged cases. */ while (!deque_is_empty (&ds->lag)) - case_destroy (&ds->lag_cases[deque_pop_back (&ds->lag)]); + case_unref (ds->lag_cases[deque_pop_back (&ds->lag)]); free (ds->lag_cases); /* Dictionary from before TEMPORARY becomes permanent. */ @@ -341,7 +323,6 @@ proc_commit (struct dataset *ds) ds->discard_output = false; } ds->sink = NULL; - if ( ds->replace_source) ds->replace_source (ds->source); caseinit_clear (ds->caseinit); caseinit_mark_as_preinited (ds->caseinit, ds->dict); @@ -352,7 +333,7 @@ proc_commit (struct dataset *ds) } /* Casereader class for procedure execution. */ -static struct casereader_class proc_casereader_class = +static const struct casereader_class proc_casereader_class = { proc_casereader_read, proc_casereader_destroy, @@ -369,14 +350,14 @@ update_last_proc_invocation (struct dataset *ds) /* Returns a pointer to the lagged case from N_BEFORE cases before the current one, or NULL if there haven't been that many cases yet. */ -struct ccase * +const struct ccase * lagged_case (const struct dataset *ds, int n_before) { assert (n_before >= 1); assert (n_before <= ds->n_lag); if (n_before <= deque_count (&ds->lag)) - return &ds->lag_cases[deque_front (&ds->lag, n_before - 1)]; + return ds->lag_cases[deque_front (&ds->lag, n_before - 1)]; else return NULL; } @@ -498,7 +479,6 @@ proc_cancel_temporary_transformations (struct dataset *ds) dict_destroy (ds->dict); ds->dict = ds->permanent_dict; ds->permanent_dict = NULL; - if (ds->replace_dict) ds->replace_dict (ds->dict); trns_chain_destroy (ds->temporary_trns_chain); ds->temporary_trns_chain = NULL; @@ -532,13 +512,11 @@ proc_cancel_all_transformations (struct dataset *ds) /* Initializes procedure handling. */ struct dataset * -create_dataset (transformation_change_callback_func *cb, void *aux) +create_dataset (void) { struct dataset *ds = xzalloc (sizeof(*ds)); ds->dict = dict_create (); ds->caseinit = caseinit_create (); - ds->xform_callback = cb; - ds->xform_callback_aux = aux; proc_cancel_all_transformations (ds); return ds; } @@ -589,7 +567,6 @@ proc_discard_active_file (struct dataset *ds) casereader_destroy (ds->source); ds->source = NULL; - if ( ds->replace_source) ds->replace_source (NULL); proc_cancel_all_transformations (ds); } @@ -608,7 +585,6 @@ proc_set_active_file (struct dataset *ds, dict_destroy (ds->dict); ds->dict = dict; - if ( ds->replace_dict) ds->replace_dict (dict); proc_set_active_file_data (ds, source); } @@ -620,7 +596,6 @@ proc_set_active_file_data (struct dataset *ds, struct casereader *reader) { casereader_destroy (ds->source); ds->source = reader; - if (ds->replace_source) ds->replace_source (reader); caseinit_clear (ds->caseinit); caseinit_mark_as_preinited (ds->caseinit, ds->dict); @@ -636,6 +611,17 @@ proc_has_active_file (const struct dataset *ds) return ds->source != NULL; } +/* Returns the active file data source from DS, or a null pointer + if DS has no data source, and removes it from DS. */ +struct casereader * +proc_extract_active_file_data (struct dataset *ds) +{ + struct casereader *reader = ds->source; + ds->source = NULL; + + return reader; +} + /* Checks whether DS has a corrupted active file. If so, discards it and returns false. If not, returns true without doing anything. */ @@ -667,10 +653,10 @@ static trns_free_func case_limit_trns_free; static void add_case_limit_trns (struct dataset *ds) { - size_t case_limit = dict_get_case_limit (ds->dict); + casenumber case_limit = dict_get_case_limit (ds->dict); if (case_limit != 0) { - size_t *cases_remaining = xmalloc (sizeof *cases_remaining); + casenumber *cases_remaining = xmalloc (sizeof *cases_remaining); *cases_remaining = case_limit; add_transformation (ds, case_limit_trns_proc, case_limit_trns_free, cases_remaining); @@ -682,7 +668,7 @@ add_case_limit_trns (struct dataset *ds) *CASES_REMAINING. */ static int case_limit_trns_proc (void *cases_remaining_, - struct ccase *c UNUSED, casenumber case_nr UNUSED) + struct ccase **c UNUSED, casenumber case_nr UNUSED) { size_t *cases_remaining = cases_remaining_; if (*cases_remaining > 0) @@ -721,11 +707,11 @@ add_filter_trns (struct dataset *ds) /* FILTER transformation. */ static int filter_trns_proc (void *filter_var_, - struct ccase *c UNUSED, casenumber case_nr UNUSED) + struct ccase **c UNUSED, casenumber case_nr UNUSED) { struct variable *filter_var = filter_var_; - double f = case_num (c, filter_var); + double f = case_num (*c, filter_var); return (f != 0.0 && !var_is_num_missing (filter_var, f, MV_ANY) ? TRNS_CONTINUE : TRNS_DROP_CASE); }