prometheus-client-mmap 0.7.0.beta45.9 → 0.7.0.beta45.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26cd3edd6cdca37f12302661dcc43f4ef1fa2426
-  data.tar.gz: 572236f8217e968c1f2f229a8b4303e570ad838f
+  metadata.gz: 5be03b2cf017dc8f05006a950baed4584f438ea2
+  data.tar.gz: 8710f5d2514afc53a5bf38f0d5169c1b20f9b1cd
 SHA512:
-  metadata.gz: a5b3f0d352da5227e3611bb246105f5a5f1e4f28addaa1ab99ed942e56a502b135b205e83e8fb55972337c851665ba396904821310ac1b3d1722d29ab4753110
-  data.tar.gz: e0e9af3be98632d44649882878aa5d20349187010746b7dffa84586910a469ae46a2197f73d915d351c1112905c8152c93dfe9bb42fe94d222fdad24587ef3bb
+  metadata.gz: 43aff1c44ec220cec46f22fee1c0566dcfd9e147edeb6eae86b0671f26e7f0bb2fb4da003545df6a15d9a0361d7298168e1080f4169dc6ecbba39aa14cd49b3a
+  data.tar.gz: 43d52f9e8614382c930b856c538f4dfbd7e95b7753ecd9c5dd368cdb8512b60fd9e364994bdfbc8f7f404a73d377e2795f6f089c6ff6433584ab108402aef96f

data/ext/fast_mmaped_file/mmap.c

@@ -226,12 +226,12 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     }
 
     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) {

data/ext/fast_mmaped_file/mmap.h

@@ -28,6 +28,7 @@ typedef struct {
     int semid, shmid;
     size_t len, real;
     off_t offset;
+    int fd;
     char *path, *template;
 } mm_mmap;
 
@@ -36,13 +37,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->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");                                               \
+#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/value_access.c

@@ -12,24 +12,32 @@
 
 #include "utils.h"
 
-static int open_and_extend_file(mm_ipc *i_mm, size_t len, int *fd_p) {
-    int fd;
+static int close_file(mm_ipc *i_mm) {
+    int rv = close(i_mm->t->fd);
+    i_mm->t->fd = 0;
+    return rv;
+}
+
+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 ((fd = open(i_mm->t->path, i_mm->t->smode)) == -1) {
-        return with_exception(rb_eArgError, "Can't open %s", i_mm->t->path);
+        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);
+        }
+        i_mm->t->fd = fd;
     }
 
-    if (lseek(fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
-        close(fd);
+    if (lseek(i_mm->t->fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
+        close_file(i_mm);
         return with_exception(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
     }
 
-    if (write(fd, "\000", 1) != 1) {
-        close(fd);
+    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);
     }
 
-    *fd_p = fd;
     return SUCCESS;
 }
 
@@ -46,8 +54,8 @@ static int perform_munmap(mm_ipc *i_mm) {
     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);
+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");
@@ -69,21 +77,15 @@ static int expand(mm_ipc *i_mm, size_t len) {
         return FAILURE;
     }
 
-    int fd = 0;
-
-    if (!open_and_extend_file(i_mm, len, &fd)) {
+    if (!open_and_extend_file(i_mm, len)) {
         return FAILURE;
     }
 
-    if (!perform_mmap(i_mm, fd, len)) {
-        close(fd);
+    if (!perform_mmap(i_mm, len)) {
+        close_file(i_mm);
         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) {
         return with_exception(rb_eArgError, "mlock(%d)", errno);
     }

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta45.9'.freeze
+    VERSION = '0.7.0.beta45.10'.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.9
+  version: 0.7.0.beta45.10
 platform: ruby
 authors:
 - Tobias Schmidt