CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.7)
 project(SimpleArchiver C)
 
-set(SimpleArchiver_VERSION 1.7)
+set(SimpleArchiver_VERSION 1.0)
 
 set(SimpleArchiver_SOURCES
     src/main.c

Changelog.md

@@ -2,12 +2,6 @@
 
 ## Upcoming Changes
 
-## Version 1.7
-
-Refactor the internal hash-map data structure.
-
-Minor update to CMakeLists.txt.
-
 ## Version 1.6
 
 Enforce "safe-links" on extraction by ensuring every extracted symlink actually

src/data_structures/hash_map.c

@@ -76,17 +76,19 @@ int simple_archiver_hash_map_internal_pick_in_list(void *data, void *ud) {
 
 uint64_t simple_archiver_hash_default_fn(const void *key, size_t key_size) {
   uint64_t seed = 0;
-  uint64_t temp;
+  uint64_t temp = 0;
+  size_t count = 0;
   for (size_t idx = 0; idx < key_size; ++idx) {
-    temp = (uint64_t)(((uint8_t*)key)[idx]) + seed;
-    if (idx % 3 == 0) {
-      temp ^= 0xA5A538A5A9B5A5A5;
-    } else if (idx % 3 == 1) {
-      temp ^= 0xD7A58BD7A58BD7AA;
-    } else {
-      temp ^= 0x8B7A8B8B87CB8B84;
+    temp |= ((uint64_t) * ((uint8_t *)key + idx)) << (8 * count);
+    ++count;
+    if (count >= 8) {
+      count = 0;
+      seed += temp;
+      temp = 0;
     }
-    seed += simple_archiver_algo_lcg_defaults(temp);
+  }
+  if (temp != 0) {
+    seed += temp;
   }
 
   return simple_archiver_algo_lcg_defaults(seed);
@@ -104,7 +106,7 @@ int simple_archiver_hash_map_internal_rehash(SDArchiverHashMap *hash_map) {
   }
   SDArchiverHashMap new_hash_map;
   new_hash_map.hash_fn = hash_map->hash_fn;
-  new_hash_map.buckets_size = (hash_map->buckets_size - 1) * 2 + 1;
+  new_hash_map.buckets_size = hash_map->buckets_size * 2;
   // Pointers have the same size (at least on the same machine), so
   // sizeof(void*) should be ok.
   new_hash_map.buckets = malloc(sizeof(void *) * new_hash_map.buckets_size);
@@ -152,7 +154,7 @@ SDArchiverHashMap *simple_archiver_hash_map_init_custom_hasher(
     uint64_t (*hash_fn)(const void *, size_t)) {
   SDArchiverHashMap *hash_map = malloc(sizeof(SDArchiverHashMap));
   hash_map->hash_fn = hash_fn;
-  hash_map->buckets_size = SC_SA_DS_HASH_MAP_START_BUCKET_SIZE + 1;
+  hash_map->buckets_size = SC_SA_DS_HASH_MAP_START_BUCKET_SIZE;
   // Pointers have the same size (at least on the same machine), so
   // sizeof(void*) should be ok.
   hash_map->buckets = malloc(sizeof(void *) * hash_map->buckets_size);

src/data_structures/test.c

@@ -219,59 +219,6 @@ int main(void) {
     simple_archiver_hash_map_free(&hash_map);
   }
 
-  // Test hashing.
-  //{
-  //  printf("Distribution of 13 over 33...\n");
-  //  unsigned int counts[33];
-  //  memset(counts, 0, sizeof(unsigned int) * 33);
-
-  //  uint64_t hash;
-
-  //  hash = simple_archiver_hash_default_fn("/", 2);
-  //  printf("%s in bucket %lu (%lu)\n", "/", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/faq", 5);
-  //  printf("%s in bucket %lu (%lu)\n", "/faq", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/FAQ", 5);
-  //  printf("%s in bucket %lu (%lu)\n", "/FAQ", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/url", 5);
-  //  printf("%s in bucket %lu (%lu)\n", "/url", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/home", 6);
-  //  printf("%s in bucket %lu (%lu)\n", "/home", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/blog", 6);
-  //  printf("%s in bucket %lu (%lu)\n", "/blog", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/test", 6);
-  //  printf("%s in bucket %lu (%lu)\n", "/test", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/menu", 6);
-  //  printf("%s in bucket %lu (%lu)\n", "/menu", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/posts", 7);
-  //  printf("%s in bucket %lu (%lu)\n", "/posts", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/about", 7);
-  //  printf("%s in bucket %lu (%lu)\n", "/about", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/media", 7);
-  //  printf("%s in bucket %lu (%lu)\n", "/media", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/social", 8);
-  //  printf("%s in bucket %lu (%lu)\n", "/social", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-  //  hash = simple_archiver_hash_default_fn("/projects", 10);
-  //  printf("%s in bucket %lu (%lu)\n", "/projects", hash % 33, hash);
-  //  counts[hash % 33] += 1;
-
-  //  for (unsigned int idx = 0; idx < 33; ++idx) {
-  //    printf("Bucket %u: %u\n", idx, counts[idx]);
-  //  }
-  //}
-
   // Test PriorityHeap.
   {
     SDArchiverPHeap *priority_heap = simple_archiver_priority_heap_init();