prometheus-client-mmap 0.7.0.beta28 → 0.7.0.beta29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37b02cfd13e165809e2772ab5af3d8e53ad59fa0
-  data.tar.gz: 2b9778993828942aef818d0ba62e690c99a7c456
+  metadata.gz: 553a05d7d0b14439046cfbda874603af9b6ba6f6
+  data.tar.gz: a1a202b9bffe768e978aaf9eef85c526b78afd2b
 SHA512:
-  metadata.gz: 43fc00711b83898298d7d60e811636bca584289e39f81ee5a82c94041596bc214265b7fefb0b152adfa14ed5176db1fd0e009069eb2ca5c626e6fa84a5e3e95b
-  data.tar.gz: d2019871acee358cf7d6f23f6514dbae33578e55a7e58237f698e334a64c5d9c519b8a2a83ff037aec435b72854a92a435cac3e72fb8a61158ee96049a62d934
+  metadata.gz: 32f7f2f9fda00f570817ce0a0dbb47e713ef9f849a01f8c41b551e297e72a0872b94a816b346ee0635077cc33efe36504ad6be084be4f4d2ed6d3a4647f7f7eb
+  data.tar.gz: ab1a83e5e0be8a7d860d7dcac6b073ca21f37360e8577e0b4f9fc60789c51d22a2728e068fb2aa186884592f516c1a2932c5d8164a6032f5d3ff93e13fb1c303

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -1,5 +1,10 @@
 #include <ruby.h>
 #include <ruby/intern.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
 #include "mmap.h"
 
 VALUE MMAPED_FILE = Qnil;
@@ -25,6 +30,40 @@ VALUE method_get_double(VALUE self, VALUE index) {
     return DBL2NUM(tmp);
 }
 
+void expand(mm_ipc *i_mm, size_t len){
+    int fd;
+    if (munmap(i_mm->t->addr, i_mm->t->len)) {
+        rb_raise(rb_eArgError, "munmap failed");
+    }
+    if ((fd = open(i_mm->t->path, i_mm->t->smode)) == -1) {
+        rb_raise(rb_eArgError, "Can't open %s", i_mm->t->path);
+    }
+
+    if (len < i_mm->t->len) {
+        rb_raise(rb_eArgError, "Can't reduce the size of mmap");
+    }
+
+    if (lseek(fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
+        rb_raise(rb_eIOError, "Can't lseek %lu", len - i_mm->t->len - 1);
+    }
+    if (write(fd, "\000", 1) != 1) {
+        rb_raise(rb_eIOError, "Can't extend %s", i_mm->t->path);
+    }
+
+    i_mm->t->addr = mmap(0, len, i_mm->t->pmode, i_mm->t->vscope, fd, i_mm->t->offset);
+    close(fd);
+
+    if (i_mm->t->addr == MAP_FAILED) {
+        rb_raise(rb_eArgError, "mmap failed");
+    }
+
+    if ((i_mm->t->flag & MM_LOCK) && mlock(i_mm->t->addr, len) == -1) {
+        rb_raise(rb_eArgError, "mlock(%d)", errno);
+    }
+    i_mm->t->len = len;
+    i_mm->t->real = len;
+}
+
 VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
     Check_Type(positions, T_HASH);
     Check_Type(key, T_STRING);
@@ -33,14 +72,11 @@ VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
         return position;
     }
 
-
-//    Check_Type(value, T_FLOAT); //TODO: will float catch DOUBLE ?
-
     mm_ipc *i_mm;
     GetMmap(self, i_mm, MM_MODIFY);
 
-    if ((i_mm->t->real) < sizeof(int32_t)) {
-        rb_raise(rb_eRuntimeError, "mmaped file too small %ld", i_mm->t->real);
+    if ((i_mm->t->len) < sizeof(int32_t)) {
+        expand(i_mm, sizeof(int32_t)); // TODO: better size
     }
 
     uint32_t used = 0;
@@ -57,14 +93,13 @@ VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
     uint32_t entry_length = (uint32_t)slen;
     uint32_t new_used = used + sizeof(uint32_t) + entry_length + padding_length + sizeof(double);
 
-    if (i_mm->t->real < new_used) {
-        rb_raise(rb_eRuntimeError, "mmaped file too small %ld", i_mm->t->real);
+    if (i_mm->t->len < new_used) {
+        expand(i_mm, i_mm->t->len * 2);
     }
 
     //TODO: add checks if mmap can be written to
 
     char *pos = (char *)i_mm->t->addr + used;
-//    rb_raise(rb_eRuntimeError, "ugh %d %ld %u ", used, i_mm->t->real, entry_length);
 
     memcpy(pos, &entry_length, sizeof(uint32_t));
     pos += sizeof(uint32_t);

data/lib/prometheus/client/helper/mmaped_file.rb

@@ -2,7 +2,6 @@ require 'prometheus/client/helper/entry_parser'
 require 'prometheus/client/helper/file_locker'
 require 'mmap'
 require 'fast_mmaped_file'
-# require 'fast_mmaped_file.so'
 
 module Prometheus
   module Client

data/lib/prometheus/client/mmaped_dict.rb

@@ -39,15 +39,15 @@ module Prometheus
       end
 
       def read_value(key)
-        init_value(key) unless @positions.key?(key)
+        pos = @m.add_entry(@positions, key, 0.0)
 
-        @m.get_double(@positions[key])
+        @m.get_double(pos)
       end
 
       def write_value(key, value)
-        init_value(key) unless @positions.key?(key)
+        pos = @m.add_entry(@positions, key, 0.0)
 
-        pos = @positions[key]
+        # pos = @positions[key]
         @m[pos..pos + 7] = [value].pack('d')
       end
 
@@ -64,22 +64,8 @@ module Prometheus
 
       private
 
-      def ok(key)
-        @m.add_entry(@positions, key, 0.0)
-      rescue RuntimeError => e
-        raise e if e.message.match /.*ugh.*/
-        nil
-      end
-
       def init_value(key)
-        until ok(key)
-          filepath = @m.filepath
-          size = @m.size
-          @m.close
-
-          File.truncate(filepath, size * 2)
-          @m = Helper::MmapedFile.open(filepath)
-        end
+        @m.add_entry(@positions, key, 0.0)
       end
 
       # Yield (key, pos). No locking is performed.

data/lib/prometheus/client/version.rb

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