X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasewriter.c;h=4461d85e84cfc191821746df34e44b02dfc0f4ef;hb=6ef859a7962e2d98b192844b07f39017df11681b;hp=e277749c2e99fd6d2a10ec71946686bd1694233c;hpb=ed88deded6a59254dd55883308c4c20966efc77e;p=pspp
diff --git a/src/data/casewriter.c b/src/data/casewriter.c
index e277749c2e..4461d85e84 100644
--- a/src/data/casewriter.c
+++ b/src/data/casewriter.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 2007 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -37,6 +35,7 @@
struct casewriter
{
struct taint *taint;
+ size_t value_cnt;
casenumber case_cnt;
const struct casewriter_class *class;
void *aux;
@@ -49,6 +48,7 @@ static struct casewriter *create_casewriter_window (size_t value_cnt,
void
casewriter_write (struct casewriter *writer, struct ccase *c)
{
+ assert (case_get_value_cnt (c) >= writer->value_cnt);
writer->class->write (writer, writer->aux, c);
}
@@ -57,7 +57,7 @@ casewriter_write (struct casewriter *writer, struct ccase *c)
encountered on WRITER or on some object on which WRITER has a
dependency. */
bool
-casewriter_destroy (struct casewriter *writer)
+casewriter_destroy (struct casewriter *writer)
{
bool ok = true;
if (writer != NULL)
@@ -69,6 +69,14 @@ casewriter_destroy (struct casewriter *writer)
return ok;
}
+/* Returns the number of `union value's in each case written to
+ WRITER. */
+size_t
+casewriter_get_value_cnt (const struct casewriter *writer)
+{
+ return writer->value_cnt;
+}
+
/* Destroys WRITER and in its place returns a casereader that can
be used to read back the data written to WRITER. WRITER must
not be used again after calling this function, even as an
@@ -83,8 +91,7 @@ casewriter_destroy (struct casewriter *writer)
struct casereader *
casewriter_make_reader (struct casewriter *writer)
{
- struct casereader *reader;
- reader = writer->class->convert_to_reader (writer, writer->aux);
+ struct casereader *reader = writer->class->convert_to_reader (writer, writer->aux);
taint_propagate (writer->taint, casereader_get_taint (reader));
taint_destroy (writer->taint);
free (writer);
@@ -107,7 +114,7 @@ casewriter_rename (struct casewriter *writer)
occurred on WRITER, a clone of WRITER, or on some object on
which WRITER's data has a dependency, false otherwise. */
bool
-casewriter_error (const struct casewriter *writer)
+casewriter_error (const struct casewriter *writer)
{
return taint_is_tainted (writer->taint);
}
@@ -121,7 +128,7 @@ casewriter_error (const struct casewriter *writer)
taint_propagate to propagate to the casewriter's taint
structure, which may be obtained via casewriter_get_taint. */
void
-casewriter_force_error (struct casewriter *writer)
+casewriter_force_error (struct casewriter *writer)
{
taint_set_taint (writer->taint);
}
@@ -129,18 +136,21 @@ casewriter_force_error (struct casewriter *writer)
/* Returns WRITER's associate taint object, for use with
taint_propagate and other taint functions. */
const struct taint *
-casewriter_get_taint (const struct casewriter *writer)
+casewriter_get_taint (const struct casewriter *writer)
{
return writer->taint;
}
/* Creates and returns a new casewriter with the given CLASS and
- auxiliary data AUX. */
+ auxiliary data AUX. The casewriter accepts cases with
+ VALUE_CNT `union value's. */
struct casewriter *
-casewriter_create (const struct casewriter_class *class, void *aux)
+casewriter_create (size_t value_cnt,
+ const struct casewriter_class *class, void *aux)
{
struct casewriter *writer = xmalloc (sizeof *writer);
writer->taint = taint_create ();
+ writer->value_cnt = value_cnt;
writer->case_cnt = 0;
writer->class = class;
writer->aux = aux;
@@ -153,13 +163,13 @@ casewriter_create (const struct casewriter_class *class, void *aux)
which case they will be written to disk.
A casewriter created with this function may be passed to
- casewriter_make_reader.
+ casewriter_make_reader.
This is usually the right kind of casewriter to use. */
struct casewriter *
-autopaging_writer_create (size_t value_cnt)
+autopaging_writer_create (size_t value_cnt)
{
- return create_casewriter_window (value_cnt, get_workspace_cases (value_cnt));
+ return create_casewriter_window (value_cnt, settings_get_workspace_cases (value_cnt));
}
/* Returns a casewriter for cases with VALUE_CNT struct values
@@ -169,7 +179,7 @@ autopaging_writer_create (size_t value_cnt)
A casewriter created with this function may be passed to
casewriter_make_reader. */
struct casewriter *
-mem_writer_create (size_t value_cnt)
+mem_writer_create (size_t value_cnt)
{
return create_casewriter_window (value_cnt, CASENUMBER_MAX);
}
@@ -181,7 +191,7 @@ mem_writer_create (size_t value_cnt)
A casewriter created with this function may be passed to
casewriter_make_reader. */
struct casewriter *
-tmpfile_writer_create (size_t value_cnt)
+tmpfile_writer_create (size_t value_cnt)
{
return create_casewriter_window (value_cnt, 0);
}
@@ -195,10 +205,11 @@ static const struct casereader_random_class casereader_window_class;
memory until MAX_IN_CORE_CASES have been written, at which
point they will be written to disk. */
static struct casewriter *
-create_casewriter_window (size_t value_cnt, casenumber max_in_core_cases)
+create_casewriter_window (size_t value_cnt, casenumber max_in_core_cases)
{
struct casewindow *window = casewindow_create (value_cnt, max_in_core_cases);
- struct casewriter *writer = casewriter_create (&casewriter_window_class,
+ struct casewriter *writer = casewriter_create (value_cnt,
+ &casewriter_window_class,
window);
taint_propagate (casewindow_get_taint (window),
casewriter_get_taint (writer));
@@ -208,7 +219,7 @@ create_casewriter_window (size_t value_cnt, casenumber max_in_core_cases)
/* Writes case C to casewindow writer WINDOW. */
static void
casewriter_window_write (struct casewriter *writer UNUSED, void *window_,
- struct ccase *c)
+ struct ccase *c)
{
struct casewindow *window = window_;
casewindow_push_head (window, c);
@@ -226,13 +237,14 @@ casewriter_window_destroy (struct casewriter *writer UNUSED, void *window_)
the casereader. */
static struct casereader *
casewriter_window_convert_to_reader (struct casewriter *writer UNUSED,
- void *window_)
+ void *window_)
{
struct casewindow *window = window_;
- struct casereader *reader;
- reader = casereader_create_random (casewindow_get_value_cnt (window),
- casewindow_get_case_cnt (window),
- &casereader_window_class, window);
+ struct casereader *reader =
+ casereader_create_random (casewindow_get_value_cnt (window),
+ casewindow_get_case_cnt (window),
+ &casereader_window_class, window);
+
taint_propagate (casewindow_get_taint (window),
casereader_get_taint (reader));
return reader;
@@ -243,7 +255,7 @@ casewriter_window_convert_to_reader (struct casewriter *writer UNUSED,
OFFSET is beyond the end of file or upon I/O error. */
static bool
casereader_window_read (struct casereader *reader UNUSED, void *window_,
- casenumber offset, struct ccase *c)
+ casenumber offset, struct ccase *c)
{
struct casewindow *window = window_;
if (offset >= casewindow_get_case_cnt (window))
@@ -263,14 +275,14 @@ casereader_window_destroy (struct casereader *reader UNUSED, void *window_)
/* Discards CASE_CNT cases from the front of WINDOW. */
static void
casereader_window_advance (struct casereader *reader UNUSED, void *window_,
- casenumber case_cnt)
+ casenumber case_cnt)
{
struct casewindow *window = window_;
casewindow_pop_tail (window, case_cnt);
}
/* Class for casewindow writer. */
-static const struct casewriter_class casewriter_window_class =
+static const struct casewriter_class casewriter_window_class =
{
casewriter_window_write,
casewriter_window_destroy,
@@ -278,7 +290,7 @@ static const struct casewriter_class casewriter_window_class =
};
/* Class for casewindow reader. */
-static const struct casereader_random_class casereader_window_class =
+static const struct casereader_random_class casereader_window_class =
{
casereader_window_read,
casereader_window_destroy,