prometheus-client-mmap 0.7.0.beta45.7 → 0.7.0.beta45.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9ed8e64e915588572b1eec01daf8cc1fe0b12f
-  data.tar.gz: 3ff520858018c2b87c5530b169b8c06d4ac3644e
+  metadata.gz: d3a4f6437893fb0f0ed20e69a0fccc1ad297de91
+  data.tar.gz: 7c5afaa261b5b1810b8b7e350a05977ca1ee3180
 SHA512:
-  metadata.gz: 51c868831e62e61ecd98f78f60f84e4e8e5e1c1662c0275fe54d49d632615431e39f76e9073baca0c78d4597e17d73a3c6f0efd9554bfcd93e3f0aada43b83da
-  data.tar.gz: dd9c23e607e733ba2eb60043e8b5a411cb8b5e0342b2349983fb51c9f65ff3cb4205b086bdbc8121aa618d77c7f52feb058ec5c965c224bac8d769aaf053b3a9
+  metadata.gz: 5c450ca0c85ecea836356cf21bc56f003e34a482e86351d59bb57b2cdb62d6b800d03ba4495398093bad39d4b59951f297ae5fa5d07352234befa730429435e8
+  data.tar.gz: 5a0cab7e6177d8b0aab8b836ed6160872aec54ba5978b83ef59f80f5d868c169f3dd843ae76e73060162b6dd638422f3806e5cc26efe5db07cc142104fdca979

data/ext/fast_mmaped_file/mmap.c

@@ -4,6 +4,7 @@
 #include <ruby/util.h>
 #include <sys/mman.h>
 
+#include "file_format.h"
 #include "mmap.h"
 #include "utils.h"
 
@@ -119,7 +120,6 @@ static void mm_free(mm_ipc *i_mm) {
     if (i_mm->t->path) {
         if (munmap(i_mm->t->addr, i_mm->t->len) != 0) {
             if (i_mm->t->path != (char *)-1 && i_mm->t->path != NULL) {
-                close(i_mm->t->fd);
                 free(i_mm->t->path);
             }
             free(i_mm);
@@ -134,7 +134,6 @@ static void mm_free(mm_ipc *i_mm) {
                 free(i_mm);
                 rb_raise(rb_eTypeError, "truncate");
             }
-            close(i_mm->t->fd);            
             free(i_mm->t->path);
         }
     }
@@ -167,7 +166,6 @@ VALUE mm_s_alloc(VALUE obj) {
     res = Data_Make_Struct(obj, mm_ipc, 0, mm_free, i_mm);
     i_mm->t = ALLOC_N(mm_mmap, 1);
     MEMZERO(i_mm->t, mm_mmap, 1);
-    i_mm->t->incr = EXP_INCR_SIZE;
     return res;
 }
 
@@ -217,24 +215,23 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     init = 0;
 
     if (size == 0 && (smode & O_RDWR)) {
-        if (lseek(fd, i_mm->t->incr - 1, SEEK_END) == -1) {
-            rb_raise(rb_eIOError, "Can't lseek %zu", i_mm->t->incr - 1);
+        if (lseek(fd, INITIAL_SIZE - 1, SEEK_END) == -1) {
+            rb_raise(rb_eIOError, "Can't lseek %zu", INITIAL_SIZE - 1);
         }
         if (write(fd, "\000", 1) != 1) {
             rb_raise(rb_eIOError, "Can't extend %s", path);
         }
         init = 1;
-        size = i_mm->t->incr;
+        size = INITIAL_SIZE;
     }
 
-    addr = mmap(0, size, pmode, vscope, fd, offset);    
+    addr = mmap(0, size, pmode, vscope, fd, offset);
+    close(fd);
 
     if (addr == MAP_FAILED || !addr) {
-        close(fd);
         rb_raise(rb_eArgError, "mmap failed (%d)", errno);
     }
 
-    i_mm->t->fd = fd;
     i_mm->t->addr = addr;
     i_mm->t->len = size;
     if (!init) {
@@ -317,9 +314,7 @@ VALUE mm_unmap(VALUE obj) {
     if (i_mm->t->path) {
         if (munmap(i_mm->t->addr, i_mm->t->len) != 0) {
             if (i_mm->t->path != (char *)-1 && i_mm->t->path != NULL) {
-                close(i_mm->t->fd);
                 free(i_mm->t->path);
-                i_mm->t->fd = -1;
                 i_mm->t->path = NULL;
             }
 
@@ -331,10 +326,8 @@ VALUE mm_unmap(VALUE obj) {
                 truncate(i_mm->t->path, i_mm->t->real) == -1) {
                 rb_raise(rb_eTypeError, "truncate");
             }
-            close(i_mm->t->fd);
             free(i_mm->t->path);
         }
-        i_mm->t->fd = -1;
         i_mm->t->path = NULL;
     }
     return Qnil;

data/ext/fast_mmaped_file/mmap.h

@@ -1,8 +1,8 @@
 #ifndef MMAP_H
 #define MMAP_H
 
-#include <unistd.h>
 #include <ruby.h>
+#include <unistd.h>
 
 #define MM_MODIFY 1
 #define MM_ORIGIN 2
@@ -17,21 +17,18 @@
 #define MM_TMP (1 << 5)
 
 #ifndef MMAP_RETTYPE
-#define MMAP_RETTYPE void * 
+#define MMAP_RETTYPE void *
 #endif
 
-#define EXP_INCR_SIZE 4096
-
 typedef struct {
     MMAP_RETTYPE addr;
     int smode, pmode, vscope;
     int advice, flag;
     VALUE key;
     int semid, shmid;
-    size_t len, real, incr;
+    size_t len, real;
     off_t offset;
     char *path, *template;
-    int fd;
 } mm_mmap;
 
 typedef struct {
@@ -39,14 +36,13 @@ typedef struct {
     mm_mmap *t;
 } mm_ipc;
 
-
-#define GET_MMAP(obj, i_mm, t_modify)                             \
-    Data_Get_Struct(obj, mm_ipc, i_mm);                          \
-    if (!i_mm->t->path) {                                        \
-        rb_raise(rb_eIOError, "unmapped file");                  \
-    }                                                            \
-    if ((t_modify & MM_MODIFY) && (i_mm->t->flag & MM_FROZEN)) { \
-        rb_error_frozen("mmap");                                 \
+#define GET_MMAP(obj, i_mm, t_modify)                                          \
+    Data_Get_Struct(obj, mm_ipc, i_mm);                                        \
+    if (!i_mm->t->path || i_mm->t->addr == 0 || i_mm->t->addr == MAP_FAILED) { \
+        rb_raise(rb_eIOError, "unmapped file");                                \
+    }                                                                          \
+    if ((t_modify & MM_MODIFY) && (i_mm->t->flag & MM_FROZEN)) {               \
+        rb_error_frozen("mmap");                                               \
     }
 
 VALUE mm_s_alloc(VALUE obj);

data/ext/fast_mmaped_file/utils.c

@@ -2,16 +2,30 @@
 
 #include "utils.h"
 
+static void va_save_exception(VALUE exception, const char *fmt, va_list args) {
+    VALUE message = rb_vsprintf(fmt, args);
+
+    VALUE current_thread = rb_thread_current();
+    rb_thread_local_aset(current_thread, rb_intern("prometheus_last_exception"), exception);
+    rb_thread_local_aset(current_thread, rb_intern("prometheus_last_exception_message"), message);
+}
+
 void save_exception(VALUE exception, const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
-    VALUE message = rb_vsprintf(fmt, args);
+    va_save_exception(exception, fmt, args);
     va_end(args);
+}
 
-    VALUE current_thread = rb_thread_current();
-    rb_thread_local_aset(current_thread, rb_intern("prometheus_last_exception"), exception);
-    rb_thread_local_aset(current_thread, rb_intern("prometheus_last_exception_message"), message);
+int with_exception(VALUE exception, const char *fmt, ...) {
+    va_list args;
+
+    va_start(args, fmt);
+    va_save_exception(exception, fmt, args);
+    va_end(args);
+
+    return FAILURE;
 }
 
 NORETURN(void raise_last_exception()) {

data/ext/fast_mmaped_file/utils.h

@@ -3,14 +3,18 @@
 
 #ifdef UNUSED
 #elif defined(__GNUC__)
-#define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#define UNUSED(x) UNUSED_##x __attribute__((unused))
 #elif defined(__LCLINT__)
 #define UNUSED(x) /*@unused@*/ x
 #else
 #define UNUSED(x) x
 #endif
 
+#define SUCCESS 1
+#define FAILURE 0
+
 NORETURN(void raise_last_exception());
 void save_exception(VALUE exception, const char *fmt, ...);
+int with_exception(VALUE exception, const char *fmt, ...);
 
 #endif

data/ext/fast_mmaped_file/value_access.c

@@ -10,56 +10,81 @@
 #include "mmap.h"
 #include "value_access.h"
 
-static int open_and_extend_file(mm_ipc *i_mm, size_t len) {
+#include "utils.h"
+
+static int open_and_extend_file(mm_ipc *i_mm, size_t len, int *fd_p) {
     int fd;
 
     if ((fd = open(i_mm->t->path, i_mm->t->smode)) == -1) {
-        rb_raise(rb_eArgError, "Can't open %s", i_mm->t->path);
+        return with_exception(rb_eArgError, "Can't open %s", i_mm->t->path);
     }
 
     if (lseek(fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
         close(fd);
-        rb_raise(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
+        return with_exception(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
     }
 
     if (write(fd, "\000", 1) != 1) {
         close(fd);
-        rb_raise(rb_eIOError, "Can't extend %s", i_mm->t->path);
+        return with_exception(rb_eIOError, "Can't extend %s", i_mm->t->path);
     }
 
-    return fd;
+    *fd_p = fd;
+    return SUCCESS;
 }
 
-static void expand(mm_ipc *i_mm, size_t len) {
-    if (len < i_mm->t->len) {
-        rb_raise(rb_eArgError, "Can't reduce the size of mmap");
+static int perform_munmap(mm_ipc *i_mm) {
+    if (i_mm->t->addr > 0 && munmap(i_mm->t->addr, i_mm->t->len)) {
+        i_mm->t->addr = 0;
+        return with_exception(rb_eArgError, "munmap failed");
     }
 
-    if (munmap(i_mm->t->addr, i_mm->t->len)) {
-        rb_raise(rb_eArgError, "munmap failed");
+    i_mm->t->addr = 0;
+
+    return SUCCESS;
+}
+
+static int perform_mmap(mm_ipc *i_mm, int fd, size_t len) {
+    MMAP_RETTYPE addr = mmap(0, len, i_mm->t->pmode, i_mm->t->vscope, fd, i_mm->t->offset);
+
+    if (addr == MAP_FAILED) {
+        return with_exception(rb_eArgError, "mmap failed");
     }
+    i_mm->t->addr = addr;
+    i_mm->t->len = len;
+    i_mm->t->real = len;
+
+    return SUCCESS;
+}
 
-    if (i_mm->t->fd > 0 && close(i_mm->t->fd)){
-        rb_raise(rb_eArgError, "Closing mmaped fd failed with %d", errno);
+static int expand(mm_ipc *i_mm, size_t len) {
+    if (len < i_mm->t->len) {
+        return with_exception(rb_eArgError, "Can't reduce the size of mmap");
     }
 
-    int fd = open_and_extend_file(i_mm, len);
+    if (!perform_munmap(i_mm)) {
+        return FAILURE;
+    }
 
-    i_mm->t->addr = mmap(0, len, i_mm->t->pmode, i_mm->t->vscope, fd, i_mm->t->offset);
+    int fd;
+    if (!open_and_extend_file(i_mm, len, &fd)) {
+        return FAILURE;
+    }
 
-    if (i_mm->t->addr == MAP_FAILED) {
+    if (!perform_mmap(i_mm, fd, len)) {
         close(fd);
-        rb_raise(rb_eArgError, "mmap failed");
+        return FAILURE;
+    }
+
+    if (close(fd) == -1) {
+        return with_exception(rb_eArgError, "Can't close %s", i_mm->t->path);
     }
 
     if ((i_mm->t->flag & MM_LOCK) && mlock(i_mm->t->addr, len) == -1) {
-        close(fd);
-        rb_raise(rb_eArgError, "mlock(%d)", errno);
+        return with_exception(rb_eArgError, "mlock(%d)", errno);
     }
 
-    i_mm->t->fd = fd;
-    i_mm->t->len = len;
-    i_mm->t->real = len;
+    return SUCCESS;
 }
 
 static void save_entry(mm_ipc *i_mm, size_t offset, VALUE key, VALUE value) {
@@ -120,9 +145,7 @@ uint32_t load_used(mm_ipc *i_mm) {
     return used;
 }
 
-void save_used(mm_ipc *i_mm, uint32_t used) { 
-    *((uint32_t *)i_mm->t->addr) = used; 
-}
+void save_used(mm_ipc *i_mm, uint32_t used) { *((uint32_t *)i_mm->t->addr) = used; }
 
 static VALUE initialize_entry(mm_ipc *i_mm, VALUE positions, VALUE key, VALUE value) {
     if (i_mm->t->flag & MM_FROZEN) {
@@ -139,7 +162,9 @@ static VALUE initialize_entry(mm_ipc *i_mm, VALUE positions, VALUE key, VALUE va
 
     uint32_t used = load_used(i_mm);
     while (i_mm->t->len < (used + entry_length)) {
-        expand(i_mm, i_mm->t->len * 2);
+        if (!expand(i_mm, i_mm->t->len * 2)) {
+            raise_last_exception();
+        }
     }
     save_entry(i_mm, used, key, value);
     save_used(i_mm, used + entry_length);
@@ -200,7 +225,9 @@ VALUE method_save_used(VALUE self, VALUE value) {
     }
 
     if (i_mm->t->len < INITIAL_SIZE) {
-        expand(i_mm, INITIAL_SIZE);
+        if (!expand(i_mm, INITIAL_SIZE)) {
+            raise_last_exception();
+        }
     }
 
     save_used(i_mm, NUM2UINT(value));

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta45.7'.freeze
+    VERSION = '0.7.0.beta45.8'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta45.7
+  version: 0.7.0.beta45.8
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzbert