Changeset ad9178bf in mainline

Timestamp:

2023-10-27T18:20:03Z (13 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

694ca3d6

Parents:

55c5cb05

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 18:14:50)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 18:20:03)

Message:

Deduplicate ADT

Files:

• common/adt/bitmap.c (moved) (moved from kernel/generic/src/adt/bitmap.c )
• common/adt/checksum.c (moved) (moved from uspace/lib/c/generic/adt/checksum.c )
• common/adt/circ_buf.c (moved) (moved from uspace/lib/c/generic/adt/circ_buf.c )
• common/adt/hash_table.c (moved) (moved from uspace/lib/c/generic/adt/hash_table.c ) (1 diff)
• common/adt/list.c (moved) (moved from uspace/lib/c/generic/adt/list.c )
• common/adt/odict.c (moved) (moved from kernel/generic/src/adt/odict.c )
• common/adt/prodcons.c (moved) (moved from uspace/lib/c/generic/adt/prodcons.c )
• common/include/adt/bitmap.h (moved) (moved from kernel/generic/include/adt/bitmap.h )
• common/include/adt/checksum.h (moved) (moved from uspace/lib/c/include/adt/checksum.h )
• common/include/adt/circ_buf.h (moved) (moved from uspace/lib/c/include/adt/circ_buf.h )
• common/include/adt/fifo.h (moved) (moved from uspace/lib/c/include/adt/fifo.h )
• common/include/adt/gcdlcm.h (moved) (moved from uspace/lib/c/include/adt/gcdlcm.h )
• common/include/adt/hash.h (moved) (moved from uspace/lib/c/include/adt/hash.h ) (2 diffs)
• common/include/adt/hash_table.h (moved) (moved from uspace/lib/c/include/adt/hash_table.h )
• common/include/adt/list.h (moved) (moved from uspace/lib/c/include/adt/list.h )
• common/include/adt/odict.h (moved) (moved from kernel/generic/include/adt/odict.h )
• common/include/adt/prodcons.h (moved) (moved from uspace/lib/c/include/adt/prodcons.h )
• kernel/generic/include/adt/fifo.h (deleted)
• kernel/generic/include/adt/hash.h (deleted)
• kernel/generic/include/adt/hash_table.h (deleted)
• kernel/generic/include/adt/list.h (deleted)
• kernel/generic/meson.build (modified) (2 diffs)
• kernel/generic/src/adt/hash_table.c (deleted)
• kernel/generic/src/adt/list.c (deleted)
• uspace/lib/c/generic/adt/odict.c (deleted)
• uspace/lib/c/include/adt/odict.h (deleted)
• uspace/lib/c/meson.build (modified) (2 diffs)

common/adt/hash_table.c

@@ -52 +52 @@
 #include <adt/list.h>
 #include <assert.h>
-#include <member.h>
 #include <stdlib.h>
 #include <str.h>

common/include/adt/hash.h

@@ -35 +35 @@
 #define _LIBC_ADT_HASH_H_
 
+#include <stddef.h>
 #include <stdint.h>
-#include <types/common.h>
 
 /** Produces a uniform hash affecting all output bits from the skewed input. */
@@ -78 +78 @@
 static inline size_t hash_mix(size_t hash)
 {
-#ifdef __32_BITS__
-        return hash_mix32(hash);
-#elif defined(__64_BITS__)
-        return hash_mix64(hash);
-#else
-#error Unknown size_t size - cannot select proper hash mix function.
-#endif
+        if (sizeof(long) == 4)
+                return hash_mix32(hash);
+        else
+                return hash_mix64(hash);
 }
 

kernel/generic/meson.build

@@ -36 +36 @@
 
 generic_src += files(
+        'common/adt/bitmap.c',
+        'common/adt/hash_table.c',
+        'common/adt/list.c',
+        'common/adt/odict.c',
         'common/stdc/calloc.c',
         'common/stdc/ctype.c',
@@ -44 +48 @@
         'common/strtol.c',
 
-        'src/adt/bitmap.c',
-        'src/adt/hash_table.c',
-        'src/adt/list.c',
-        'src/adt/odict.c',
         'src/cap/cap.c',
         'src/console/chardev.c',

uspace/lib/c/meson.build

@@ -61 +61 @@
 
 src += files(
+        'common/adt/checksum.c',
+        'common/adt/circ_buf.c',
+        'common/adt/list.c',
+        'common/adt/hash_table.c',
+        'common/adt/odict.c',
+        'common/adt/prodcons.c',
         'common/stdc/ctype.c',
         'common/stdc/mem.c',
@@ -143 +149 @@
         'generic/loader.c',
         'generic/getopt.c',
-        'generic/adt/checksum.c',
-        'generic/adt/circ_buf.c',
-        'generic/adt/list.c',
-        'generic/adt/hash_table.c',
-        'generic/adt/odict.c',
-        'generic/adt/prodcons.c',
         'generic/time.c',
         'generic/tmpfile.c',