filedictrb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c8fd3a6260d33ec56a995b4116af3cdb60ec8b52fa8aee688c7fd0b305b14ae
-  data.tar.gz: '0349634431c7e9abde136b1503e4ae23a8855236cdafb21ee9157f946456c16c'
+  metadata.gz: aad965d1fb0dd25c74c20f917b2f71e0d48fc7d6dea59bab8ad2c5990b3fb8fe
+  data.tar.gz: cd8c479f17d113b19d5ef89d565aeab6c51305e1e0f81dab3d8d6a538555009b
 SHA512:
-  metadata.gz: 5811b3a6fba572d75e39d9fec5d7e2d6cb1bde1701604d80e0fa040de624b7b7c7edca928293fa9814b91614a3c5d6289f15e55becc7e4b1153d34212216ec39
-  data.tar.gz: db8da5021c456578f8654bce8feab2a7f4138f9c3f405423fb441ff3248cc3924b451da94473d5eac1b9d3eccda643d22582b278dbaebb6a7087f819bf896e08
+  metadata.gz: 2dc64caded0eadba4cb03da2dfb926b3c488d6773df59087752953371e5dfabeeac4625478f0ac33a26c4a60f76105a8026ee49aa6e2c700437c0e992ba6a6fe
+  data.tar.gz: 7e392f4e734fbe940fb4d86c7a04700edcad3cbab286d4103f6846dbcadb1f2fd01ac8a6a272dd31e542ded3fb919fcfa6b566919161ab1cc3782a56692a2281

data/ext/filedict/filedict.h

@@ -27,6 +27,7 @@ typedef size_t (*filedict_hash_function_t)(const char *);
 typedef struct filedict_t {
     const char *error;
     int fd;
+    int flags;
     void *data;
     size_t data_len;
     filedict_hash_function_t hash_function;
@@ -96,6 +97,7 @@ static size_t filedict_copy_string(char *dest, const char *src, size_t max_len)
 static void filedict_init(filedict_t *filedict) {
     filedict->error = NULL;
     filedict->fd = 0;
+    filedict->flags = 0;
     filedict->data_len = 0;
     filedict->data = NULL;
     filedict->hash_function = filedict_default_hash_function;
@@ -110,6 +112,7 @@ static void filedict_deinit(filedict_t *filedict) {
     if (filedict->fd) {
         close(filedict->fd);
         filedict->fd = 0;
+        filedict->flags = 0;
     }
 }
 
@@ -146,6 +149,7 @@ static void filedict_open_f(
     int flags,
     unsigned int initial_bucket_count
 ) {
+    filedict->flags = flags;
     filedict->fd = open(filename, flags, 0666);
     if (filedict->fd == -1) { filedict->error = strerror(errno); return; }
 
@@ -154,7 +158,7 @@ static void filedict_open_f(
     filedict->data = mmap(
         NULL,
         filedict->data_len,
-        PROT_READ | PROT_WRITE,
+        PROT_READ | ((flags & O_RDWR) ? PROT_WRITE : 0),
         MAP_SHARED,
         filedict->fd,
         0
@@ -163,8 +167,11 @@ static void filedict_open_f(
 
     filedict_header_t *data = (filedict_header_t *)filedict->data;
     assert(initial_bucket_count <= UINT_MAX);
-    data->initial_bucket_count = initial_bucket_count;
-    data->hashmap_count = 1;
+
+    if (data->initial_bucket_count == 0) {
+        data->initial_bucket_count = initial_bucket_count;
+        data->hashmap_count = 1;
+    }
 }
 
 /*
@@ -272,7 +279,7 @@ try_again:
     filedict->data = mmap(
         filedict->data,
         new_data_len,
-        PROT_READ | PROT_WRITE,
+        PROT_READ | ((filedict->flags & O_RDWR) ? PROT_WRITE : 0),
         MAP_SHARED,
         filedict->fd,
         0
@@ -286,6 +293,27 @@ try_again:
     goto try_again;
 }
 
+/*
+ * Resizes the filedict based on the header hashmap count and initial bucket count.
+ * Naturally, your pointers into the map will become invalid after calling this.
+ */
+static void filedict_resize(filedict_t *filedict) {
+    filedict_header_t *header = (filedict_header_t*)filedict->data;
+    size_t computed_size = filedict_file_size(header->initial_bucket_count, header->hashmap_count);
+
+    munmap(filedict->data, filedict->data_len);
+    filedict->data = mmap(
+        filedict->data,
+        computed_size,
+        PROT_READ | ((filedict->flags & O_RDWR) ? PROT_WRITE : 0),
+        MAP_SHARED,
+        filedict->fd,
+        0
+    );
+    if (filedict->data == MAP_FAILED) { filedict->error = strerror(errno); return; }
+    filedict->data_len = computed_size;
+}
+
 /*
  * There are 3 "levels" to a filedict. From top to bottom:
  * 1. Hashmap - which hashmap are we looking at? We create additional hashmaps to handle overflow.
@@ -365,19 +393,8 @@ static int filedict_read_advance_hashmap(filedict_read_t *read) {
     size_t offset = filedict_file_size(header->initial_bucket_count, read->hashmap_i);
 
     if (offset >= filedict->data_len) {
-        /* Need to resize! */
-        size_t computed_size = filedict_file_size(header->initial_bucket_count, header->hashmap_count);
-        munmap(filedict->data, filedict->data_len);
-        filedict->data = mmap(
-            filedict->data,
-            computed_size,
-            PROT_READ | PROT_WRITE,
-            MAP_SHARED,
-            filedict->fd,
-            0
-        );
-        if (filedict->data == MAP_FAILED) { filedict->error = strerror(errno); return 0; }
-        filedict->data_len = computed_size;
+        filedict_resize(filedict);
+        if (filedict->error) log_return(0);
         header = (filedict_header_t*)filedict->data;
     }
 

data/lib/filedict/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Filedict
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filedictrb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Uses filedict to emulate a file-backed Hash<Set<String>>