filedictrb 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d09435d5e09d917e12a06932a75ddf365b081a9caa1253a3b11a53a235196c
-  data.tar.gz: 4cd1fedaa0035da30c2d9572eb28dd190cab901803089b164c36ba4d5776d36c
+  metadata.gz: f023c0d5acca6fc0f6355bae7c34f61eb5682f9f4652f83dd8befefac6f2c050
+  data.tar.gz: de7ba4f1fcf57e21771312bf9bb8daacdfc39a044e9ef263a81494bb6e976dca
 SHA512:
-  metadata.gz: d232d34e3b99221baf055c56ca672b2536d910103a3a4dd6bab1be9005270db86cda72690f1dd56ed230fb0214ef4cecae45a9f8ae5931b7ebcb3288df8492e2
-  data.tar.gz: de03f2dc36efad352a54f647f3275cc15bae641799e3b2ca258cdbb08100103493ac35e2c37e327f7f39feb2dc92eb80af6fb3c4cd645fad8794612ee0cffcfc
+  metadata.gz: 2cb1f1f1a43a0494aa95f8d31d0b1b490f63ce07c57bcc1e6af2003064656784034064cebefd8247b886174e3e57c600c4464e2eba69a61cf7720c6cee9fcc1e
+  data.tar.gz: 3f4f4dbf014f9af21ad104a3282f09ce7d07c22f70c60e5e33b43c58159bb403567e42116896091062a527bd881524d15db9b8724a16065395b0cdd6cdb715c1

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;
@@ -38,7 +39,7 @@ typedef struct filedict_header_t {
 } __attribute__ ((__packed__)) filedict_header_t;
 
 typedef struct filedict_read_t {
-    const filedict_t *filedict;
+    filedict_t *filedict;
     const char *key;
     const char *value;
     filedict_bucket_t *bucket;
@@ -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;
     }
 }
 
@@ -128,6 +131,28 @@ static size_t filedict_file_size(size_t initial_bucket_count, size_t hashmap_cou
     return result;
 }
 
+/*
+ * 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);
+    if (computed_size <= filedict->data_len) return;
+
+    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;
+}
+
 /*
  * This opens a new file for reading and writing, optionally letting you specify the initial bucket count.
  */
@@ -146,15 +171,24 @@ static void filedict_open_f(
     int flags,
     unsigned int initial_bucket_count
 ) {
+    struct stat info;
+
+    filedict->flags = flags;
     filedict->fd = open(filename, flags, 0666);
     if (filedict->fd == -1) { filedict->error = strerror(errno); return; }
+    if (fstat(filedict->fd, &info) != 0) { filedict->error = strerror(errno); return; }
+
+    if (info.st_size == 0 && (flags & O_RDWR)) {
+        filedict->data_len = filedict_file_size(initial_bucket_count, 1);
+        ftruncate(filedict->fd, filedict->data_len);
+    } else {
+        filedict->data_len = info.st_size;
+    }
 
-    filedict->data_len = filedict_file_size(initial_bucket_count, 1);
-    ftruncate(filedict->fd, filedict->data_len);
     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 +197,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 +309,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
@@ -353,7 +390,7 @@ static int filedict_read_advance_entry(filedict_read_t *read) {
  * Returns 0 when there are no more hashmaps, or the latest hashmap has no matching entries.
  */
 static int filedict_read_advance_hashmap(filedict_read_t *read) {
-    const filedict_t *filedict = read->filedict;
+    filedict_t *filedict = read->filedict;
 
     assert(filedict);
     assert(filedict->data);
@@ -363,6 +400,13 @@ static int filedict_read_advance_hashmap(filedict_read_t *read) {
     if (read->hashmap_i >= header->hashmap_count) log_return(0);
 
     size_t offset = filedict_file_size(header->initial_bucket_count, read->hashmap_i);
+
+    if (offset >= filedict->data_len) {
+        filedict_resize(filedict);
+        if (filedict->error) log_return(0);
+        header = (filedict_header_t*)filedict->data;
+    }
+
     filedict_bucket_t *hashmap = filedict->data + offset;
 
     read->bucket_count = (size_t)header->initial_bucket_count << read->hashmap_i;
@@ -377,7 +421,7 @@ static int filedict_read_advance_hashmap(filedict_read_t *read) {
 /*
  * Returns a "read" at the given key. If there's a hit, <return>.value will have the value.
  */
-static filedict_read_t filedict_get(const filedict_t *filedict, const char *key) {
+static filedict_read_t filedict_get(filedict_t *filedict, const char *key) {
     filedict_read_t read;
     read.filedict = filedict;
     read.key = key;

data/ext/filedictrb/hash.c

@@ -3,7 +3,6 @@
 
 extern VALUE mFiledict;
 VALUE cHash;
-VALUE mSetExt;
 VALUE cSet;
 
 ID id_add;
@@ -89,7 +88,7 @@ static VALUE fd_set_add(int argc, VALUE *argv, VALUE self) {
     VALUE fd_hash_ruby_object = rb_ivar_get(self, id_fd_hash);
 
     if (fd_hash_ruby_object == Qnil) {
-        return self;
+        return rb_call_super(argc, argv);
     }
 
     fd_hash_t *fd_hash = RTYPEDDATA_DATA(fd_hash_ruby_object);
@@ -124,8 +123,6 @@ static VALUE fd_hash_access(VALUE self, VALUE key) {
     rb_ivar_set(result, id_fd_hash, self);
     rb_ivar_set(result, id_fd_key, key);
 
-    rb_extend_object(result, mSetExt);
-
     return result;
 }
 
@@ -139,9 +136,8 @@ void fdrb_init_hash() {
 
     VALUE rb_cSet = rb_define_class("Set", rb_cObject);
     cSet = rb_define_class_under(mFiledict, "Set", rb_cSet);
-    mSetExt = rb_define_module_under(mFiledict, "SetExt");
 
-    rb_define_method(mSetExt, "add", fd_set_add, -1);
+    rb_define_method(cSet, "add", fd_set_add, -1);
 
     id_add = rb_intern("add");
     id_remove = rb_intern("remove");

data/lib/filedict/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filedictrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-04 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>>