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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160da09544b8a969ae7ac75b07989ddc8a24cfd6
-  data.tar.gz: 6a081732b114b02fd4f07cab0c07bc68dfc1b368
+  metadata.gz: 7f9ed8e64e915588572b1eec01daf8cc1fe0b12f
+  data.tar.gz: 3ff520858018c2b87c5530b169b8c06d4ac3644e
 SHA512:
-  metadata.gz: 3d2f202559dd3b8ca8e3b9a66778e78842c69d627dce23e3fe94ab3600d5bd44365539697b5c063ba86a52cf26279e90d455538a3e6825ec6c19523b153e3ccc
-  data.tar.gz: 6d5664c82e8b6027553ffef56524f4505d6fb8ae5d60f817d9a0e4153b1501d19b88e1373d950c3aca707f06160c5bbd58cad35a7ca8491a18ba966432a7b4dc
+  metadata.gz: 51c868831e62e61ecd98f78f60f84e4e8e5e1c1662c0275fe54d49d632615431e39f76e9073baca0c78d4597e17d73a3c6f0efd9554bfcd93e3f0aada43b83da
+  data.tar.gz: dd9c23e607e733ba2eb60043e8b5a411cb8b5e0342b2349983fb51c9f65ff3cb4205b086bdbc8121aa618d77c7f52feb058ec5c965c224bac8d769aaf053b3a9

data/ext/fast_mmaped_file/mmap.c

@@ -119,6 +119,7 @@ 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);
@@ -133,6 +134,7 @@ 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);
         }
     }
@@ -225,16 +227,19 @@ VALUE mm_init(VALUE obj, VALUE fname) {
         size = i_mm->t->incr;
     }
 
-    addr = mmap(0, size, pmode, vscope, fd, offset);
-    close(fd);
+    addr = mmap(0, size, pmode, vscope, fd, offset);    
 
     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) i_mm->t->real = size;
+    if (!init) {
+        i_mm->t->real = size;
+    }
     i_mm->t->pmode = pmode;
     i_mm->t->vscope = vscope;
     i_mm->t->smode = smode & ~O_TRUNC;
@@ -312,7 +317,9 @@ 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;
             }
 
@@ -324,8 +331,10 @@ 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

@@ -31,6 +31,7 @@ typedef struct {
     size_t len, real, incr;
     off_t offset;
     char *path, *template;
+    int fd;
 } mm_mmap;
 
 typedef struct {

data/ext/fast_mmaped_file/value_access.c

@@ -39,6 +39,10 @@ static void expand(mm_ipc *i_mm, size_t len) {
         rb_raise(rb_eArgError, "munmap failed");
     }
 
+    if (i_mm->t->fd > 0 && close(i_mm->t->fd)){
+        rb_raise(rb_eArgError, "Closing mmaped fd failed with %d", errno);
+    }
+
     int fd = open_and_extend_file(i_mm, len);
 
     i_mm->t->addr = mmap(0, len, i_mm->t->pmode, i_mm->t->vscope, fd, i_mm->t->offset);
@@ -48,13 +52,12 @@ static void expand(mm_ipc *i_mm, size_t len) {
         rb_raise(rb_eArgError, "mmap failed");
     }
 
-    if (close(fd) == -1) {
-        rb_raise(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);
     }
+
+    i_mm->t->fd = fd;
     i_mm->t->len = len;
     i_mm->t->real = len;
 }

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta45.6'.freeze
+    VERSION = '0.7.0.beta45.7'.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.6
+  version: 0.7.0.beta45.7
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzbert