From: Ben Pfaff Date: Tue, 20 Sep 2011 04:34:13 +0000 (-0700) Subject: range-set: Rename "insert" function "set1", "delete" to "set0". X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=52852e8feec36031e33665b3bf011e7e54f62783 range-set: Rename "insert" function "set1", "delete" to "set0". An upcoming commit will introduce a new "range-tower" data structure that can actually insert and delete ranges. It makes sense not to use different terminology for the two data structures, so renaming these functions makes sense. --- diff --git a/src/data/datasheet.c b/src/data/datasheet.c index ad8333256c..bee55f0f77 100644 --- a/src/data/datasheet.c +++ b/src/data/datasheet.c @@ -978,7 +978,7 @@ static void axis_make_available (struct axis *axis, unsigned long int start, unsigned long int width) { - range_set_insert (axis->available, start, width); + range_set_set1 (axis->available, start, width); } /* Extends the total physical length of AXIS by WIDTH and returns @@ -1228,7 +1228,7 @@ source_create_empty (size_t n_bytes) size_t row_size = n_bytes + 4 * sizeof (void *); size_t max_memory_rows = settings_get_workspace () / row_size; source->avail = range_set_create (); - range_set_insert (source->avail, 0, n_bytes); + range_set_set1 (source->avail, 0, n_bytes); source->data = sparse_xarray_create (n_bytes, MAX (max_memory_rows, 4)); source->backing = NULL; source->backing_rows = 0; @@ -1247,7 +1247,7 @@ source_create_casereader (struct casereader *reader) size_t n_columns; size_t i; - range_set_delete (source->avail, 0, n_bytes); + range_set_set0 (source->avail, 0, n_bytes); source->backing = reader; source->backing_rows = casereader_count_cases (reader); @@ -1301,7 +1301,7 @@ static void source_release_column (struct source *source, int ofs, int width) { assert (width >= 0); - range_set_insert (source->avail, ofs, width_to_n_bytes (width)); + range_set_set1 (source->avail, ofs, width_to_n_bytes (width)); if (source->backing != NULL) source->n_used--; } diff --git a/src/libpspp/range-set.c b/src/libpspp/range-set.c index da83edd894..fc02f3720f 100644 --- a/src/libpspp/range-set.c +++ b/src/libpspp/range-set.c @@ -106,8 +106,8 @@ range_set_destroy (struct range_set *rs) /* Inserts the region starting at START and extending for WIDTH into RS. */ void -range_set_insert (struct range_set *rs, - unsigned long int start, unsigned long int width) +range_set_set1 (struct range_set *rs, + unsigned long int start, unsigned long int width) { unsigned long int end = start + width; struct range_set_node *node; @@ -155,8 +155,8 @@ range_set_insert (struct range_set *rs, /* Deletes the region starting at START and extending for WIDTH from RS. */ void -range_set_delete (struct range_set *rs, - unsigned long int start, unsigned long int width) +range_set_set0 (struct range_set *rs, + unsigned long int start, unsigned long int width) { unsigned long int end = start + width; struct range_set_node *node; diff --git a/src/libpspp/range-set.h b/src/libpspp/range-set.h index 9e665e994e..5b79f0e6dd 100644 --- a/src/libpspp/range-set.h +++ b/src/libpspp/range-set.h @@ -53,10 +53,10 @@ struct range_set *range_set_create_pool (struct pool *); struct range_set *range_set_clone (const struct range_set *, struct pool *); void range_set_destroy (struct range_set *); -void range_set_insert (struct range_set *, - unsigned long int start, unsigned long int width); -void range_set_delete (struct range_set *, - unsigned long int start, unsigned long int width); +void range_set_set1 (struct range_set *, + unsigned long int start, unsigned long int width); +void range_set_set0 (struct range_set *, + unsigned long int start, unsigned long int width); bool range_set_allocate (struct range_set *, unsigned long int request, unsigned long int *start, unsigned long int *width); bool range_set_allocate_fully (struct range_set *, unsigned long int request, @@ -104,7 +104,7 @@ range_set_is_empty (const struct range_set *rs) /* Returns the node representing the first contiguous region of 1-bits in RS, or a null pointer if RS is empty. - Any call to range_set_insert, range_set_delete, or + Any call to range_set_set1, range_set_set0, or range_set_allocate invalidates the returned node. */ static inline const struct range_set_node * range_set_first (const struct range_set *rs) @@ -117,7 +117,7 @@ range_set_first (const struct range_set *rs) pointer if NODE is the last region in RS. If NODE is null, returns the first region in RS, as for range_set_first. - Any call to range_set_insert, range_set_delete, or + Any call to range_set_set1, range_set_set0, or range_set_allocate invalidates the returned node. */ static inline const struct range_set_node * range_set_next (const struct range_set *rs, const struct range_set_node *node) @@ -129,7 +129,7 @@ range_set_next (const struct range_set *rs, const struct range_set_node *node) /* Returns the node representing the last contiguous region of 1-bits in RS, or a null pointer if RS is empty. - Any call to range_set_insert, range_set_delete, or + Any call to range_set_set1, range_set_set0, or range_set_allocate invalidates the returned node. */ static inline const struct range_set_node * range_set_last (const struct range_set *rs) @@ -142,7 +142,7 @@ range_set_last (const struct range_set *rs) pointer if NODE is the first region in RS. If NODE is null, returns the last region in RS, as for range_set_last. - Any call to range_set_insert, range_set_delete, or + Any call to range_set_set1, range_set_set0, or range_set_allocate invalidates the returned node. */ static inline const struct range_set_node * range_set_prev (const struct range_set *rs, const struct range_set_node *node) diff --git a/src/libpspp/sparse-xarray.c b/src/libpspp/sparse-xarray.c index f839b0f2a8..12509fdff5 100644 --- a/src/libpspp/sparse-xarray.c +++ b/src/libpspp/sparse-xarray.c @@ -207,7 +207,7 @@ dump_sparse_xarray_to_disk (struct sparse_xarray *sx) sx->disk_rows = NULL; return false; } - range_set_insert (sx->disk_rows, idx, 1); + range_set_set1 (sx->disk_rows, idx, 1); } sparse_array_destroy (sx->memory); sx->memory = NULL; @@ -264,7 +264,7 @@ write_disk_row (struct sparse_xarray *sx, unsigned long int row, return ext_array_write (sx->disk, ofs + start, n, data); else { - range_set_insert (sx->disk_rows, row, 1); + range_set_set1 (sx->disk_rows, row, 1); return (ext_array_write (sx->disk, ofs, start, sx->default_row) && ext_array_write (sx->disk, ofs + start, n, data) && ext_array_write (sx->disk, ofs + start + n, diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c index 1bb9238cae..c1fc708d50 100644 --- a/tests/libpspp/range-set-test.c +++ b/tests/libpspp/range-set-test.c @@ -254,7 +254,7 @@ make_pattern (unsigned int pattern) unsigned long int width = 0; struct range_set *rs = range_set_create_pool (NULL); while (next_region (pattern, start + width, &start, &width)) - range_set_insert (rs, start, width); + range_set_set1 (rs, start, width); check_pattern (rs, pattern); return rs; } @@ -294,7 +294,7 @@ test_insert (void) unsigned int final_pat; rs = make_pattern (init_pat); - range_set_insert (rs, i, j - i); + range_set_set1 (rs, i, j - i); final_pat = init_pat | bit_range (i, j - i); check_pattern (rs, final_pat); rs2 = range_set_clone (rs, NULL); @@ -327,7 +327,7 @@ test_delete (void) unsigned int final_pat; rs = make_pattern (init_pat); - range_set_delete (rs, i, j - i); + range_set_set0 (rs, i, j - i); final_pat = init_pat & ~bit_range (i, j - i); check_pattern (rs, final_pat); range_set_destroy (rs); @@ -461,7 +461,7 @@ test_pool (void) Makes sure that this doesn't cause a double-free. */ pool = pool_create (); rs = range_set_create_pool (pool); - range_set_insert (rs, 1, 10); + range_set_set1 (rs, 1, 10); range_set_destroy (rs); pool_destroy (pool); @@ -469,7 +469,7 @@ test_pool (void) Makes sure that this doesn't cause a leak. */ pool = pool_create (); rs = range_set_create_pool (pool); - range_set_insert (rs, 1, 10); + range_set_set1 (rs, 1, 10); pool_destroy (pool); }