prometheus-client-mmap 0.9.1.pre.rc.1 → 0.9.1.pre.rc.2

data/ext/fast_mmaped_file/mmap.c

@@ -166,6 +166,7 @@ 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->fd = -1;
     return res;
 }
 

data/ext/fast_mmaped_file/mmap.h

@@ -25,11 +25,10 @@ typedef struct {
     int smode, pmode, vscope;
     int advice, flag;
     VALUE key;
-    int semid, shmid;
     size_t len, real;
     off_t offset;
     int fd;
-    char *path, *template;
+    char *path;
 } mm_mmap;
 
 typedef struct {
@@ -37,13 +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 || i_mm->t->fd == 0 || i_mm->t->addr == NULL || 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");                                                                      \
+#define GET_MMAP(obj, i_mm, t_modify)                                                                \
+    Data_Get_Struct(obj, mm_ipc, i_mm);                                                              \
+    if (!i_mm->t->path || i_mm->t->fd < 0 || i_mm->t->addr == NULL || 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

@@ -1,20 +1,22 @@
+#include <errno.h>
 #include <ruby.h>
 
 #include "utils.h"
 
-static void va_save_exception(VALUE exception, const char *fmt, va_list args) {
-    VALUE message = rb_vsprintf(fmt, args);
-
+static void rb_save_exception(VALUE exception, VALUE message) {
     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);
 }
-
+/* @deprecated - use with_exception ignoring return value */
 void save_exception(VALUE exception, const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
-    va_save_exception(exception, fmt, args);
+    VALUE message = rb_vsprintf(fmt, args);
+
+    rb_save_exception(exception, message);
     va_end(args);
 }
 
@@ -22,7 +24,22 @@ int with_exception(VALUE exception, const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
-    va_save_exception(exception, fmt, args);
+    VALUE message = rb_vsprintf(fmt, args);
+
+    rb_save_exception(exception, message);
+    va_end(args);
+
+    return FAILURE;
+}
+
+int with_exception_errno(VALUE exception, const char *fmt, ...) {
+    va_list args;
+
+    va_start(args, fmt);
+    VALUE message = rb_vsprintf(fmt, args);
+    rb_str_catf(message, " (%s)", strerror(errno));
+
+    rb_save_exception(exception, message);
     va_end(args);
 
     return FAILURE;

data/ext/fast_mmaped_file/utils.h

@@ -16,5 +16,6 @@
 NORETURN(void raise_last_exception());
 void save_exception(VALUE exception, const char *fmt, ...);
 int with_exception(VALUE exception, const char *fmt, ...);
+int with_exception_errno(VALUE exception, const char *fmt, ...);
 
 #endif

data/ext/fast_mmaped_file/value_access.c

@@ -14,28 +14,29 @@
 
 static void close_file(mm_ipc *i_mm) {
     close(i_mm->t->fd);
-    i_mm->t->fd = 0;
+    i_mm->t->fd = -1;
 }
 
 static int open_and_extend_file(mm_ipc *i_mm, size_t len) {
-    if (i_mm->t->fd == 0) {
-        int fd = i_mm->t->fd;
+    if (i_mm->t->fd < 0) {
+        int fd;
 
         if ((fd = open(i_mm->t->path, i_mm->t->smode)) == -1) {
-            return with_exception(rb_eArgError, "%s: Can't open %s", __FILE__, i_mm->t->path);
+            return with_exception_errno(rb_eArgError, "%s: Can't open %s", __FILE__, i_mm->t->path);
         }
         i_mm->t->fd = fd;
     }
 
-    if (lseek(i_mm->t->fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
+    if (lseek(i_mm->t->fd, len - 1, SEEK_SET) == -1) {
         close_file(i_mm);
-        return with_exception(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
+        return with_exception_errno(rb_eIOError, "Can't lseek %zu", len - 1);
     }
 
     if (write(i_mm->t->fd, "\000", 1) != 1) {
         close_file(i_mm);
-        return with_exception(rb_eIOError, "Can't extend %s", i_mm->t->path);
+        return with_exception_errno(rb_eIOError, "Can't extend %s", i_mm->t->path);
     }
+    i_mm->t->len = len;
 
     return SUCCESS;
 }
@@ -43,7 +44,7 @@ static int open_and_extend_file(mm_ipc *i_mm, size_t len) {
 static int perform_munmap(mm_ipc *i_mm) {
     if (i_mm->t->addr != NULL && munmap(i_mm->t->addr, i_mm->t->len)) {
         i_mm->t->addr = NULL;
-        return with_exception(rb_eArgError, "munmap failed");
+        return with_exception_errno(rb_eArgError, "munmap failed");
     }
 
     i_mm->t->addr = NULL;
@@ -57,7 +58,7 @@ static int perform_mmap(mm_ipc *i_mm, size_t len) {
     MMAP_RETTYPE addr = mmap(0, len, i_mm->t->pmode, i_mm->t->vscope, i_mm->t->fd, i_mm->t->offset);
 
     if (addr == MAP_FAILED) {
-        return with_exception(rb_eArgError, "mmap failed");
+        return with_exception_errno(rb_eArgError, "mmap failed");
     }
 
     i_mm->t->addr = addr;
@@ -86,7 +87,7 @@ static int expand(mm_ipc *i_mm, size_t len) {
     }
 
     if ((i_mm->t->flag & MM_LOCK) && mlock(i_mm->t->addr, len) == -1) {
-        return with_exception(rb_eArgError, "mlock(%d)", errno);
+        return with_exception_errno(rb_eArgError, "mlock(%d)", errno);
     }
 
     return SUCCESS;

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.9.1.pre.rc.1'.freeze
+    VERSION = '0.9.1.pre.rc.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre.rc.1
+  version: 0.9.1.pre.rc.2
 platform: ruby
 authors:
 - Tobias Schmidt