diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2010-07-06 14:53:14 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2010-07-06 14:58:48 -0700 |
| commit | fb1a26c3f64669a1b61740252c5db5fd5413c7e5 (patch) | |
| tree | 994631f1859b0adbe74bff895919f1636f798e81 /gl/modules/dev-map | |
| parent | d5427265e30522cfda098bb82ad3d4bff0a0d2bd (diff) | |
| download | coreutils-fb1a26c3f64669a1b61740252c5db5fd5413c7e5.tar.xz | |
du: Hash with a mechanism that's simpler and takes less memory.
* gl/lib/dev-map.c, gl/lib/dev-map.h, gl/modules/dev-map: Remove.
* gl/lib/ino-map.c, gl/lib/ino-map.h, gl/modules/ino-map: New files.
* gl/modules/dev-map-tests, gl/tests/test-dev-map.c: Remove.
* gl/modules/ino-map-tests, gl/tests/test-ino-map.c: New files.
* gl/lib/di-set.h (struct di_set): Renamed from struct di_set_state,
and now private. All uses changed.
(_ATTRIBUTE_NONNULL_): Don't assume C99.
(di_set_alloc): Renamed from di_set_init, with no size arg.
Now allocates the object rather than initializing it.
For now, this no longer takes an initial size; we can put this
back later if it is needed.
* gl/lib/di-set.c: Include hash.h, ino-map.h, and limits.h instead of
stdio.h, assert.h, stdint.h, sys/types.h (di-set.h includes that
now), sys/stat.h, and verify.h.
(N_DEV_BITS_4, N_INO_BITS_4, N_DEV_BITS_8, N_INO_BITS_8): Remove.
(struct dev_ino_4, struct dev_ino_8, struct dev_ino_full): Remove.
(enum di_mode): Remove.
(hashint): New typedef.
(HASHINT_MAX, LARGE_INO_MIN): New macros.
(struct di_ent): Now maps a dev_t to a inode set, instead of
containing a union.
(struct dev_map_ent): Remove.
(struct di_set): New type.
(is_encoded_ptr, decode_ptr, di_ent_create): Remove.
(di_ent_hash, di_ent_compare, di_ent_free, di_set_alloc, di_set_free):
(di_set_insert): Adjust to new representation.
(di_ino_hash, map_device, map_inode_number): New functions.
* gl/modules/di-set (Depends-on): Replace dev-map with ino-map.
Remove 'verify'.
* gl/tests/test-di-set.c: Adjust to the above changes to API.
* src/du.c (INITIAL_DI_SET_SIZE): Remove.
(hash_ins, main): Adjust to new di-set API.
Diffstat (limited to 'gl/modules/dev-map')
| -rw-r--r-- | gl/modules/dev-map | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gl/modules/dev-map b/gl/modules/dev-map deleted file mode 100644 index 91f437b27..000000000 --- a/gl/modules/dev-map +++ /dev/null @@ -1,23 +0,0 @@ -Description: -maintain a mapping of dev_t numbers to small integers - -Files: -lib/dev-map.c -lib/dev-map.h - -Depends-on: -hash - -configure.ac: - -Makefile.am: -lib_SOURCES += dev-map.c dev-map.h - -Include: -"dev-map.h" - -License -GPL - -Maintainer: -Jim Meyering |