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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fece44b3580dfbf1c00b4339578607b3fdadb28
-  data.tar.gz: 80f8a7ddd666a5e2bf999e212e941da44d081c04
+  metadata.gz: 37b02cfd13e165809e2772ab5af3d8e53ad59fa0
+  data.tar.gz: 2b9778993828942aef818d0ba62e690c99a7c456
 SHA512:
-  metadata.gz: b693e1a24ff8b3b38f4013eb7b0264d9e290ac7daca9129849f32ed862969660f70e1055ae133918fa4611ab4de41d4c76884e33cb692f5caa9faff74b75695a
-  data.tar.gz: 2faf1e8cee2301a393649551914bb46be411f0ed0b9a03e59a861500dc8be08505b25937fc5f41d5b5c17fcb597243a37bd325537626ef0572605b427d3760ab
+  metadata.gz: 43fc00711b83898298d7d60e811636bca584289e39f81ee5a82c94041596bc214265b7fefb0b152adfa14ed5176db1fd0e009069eb2ca5c626e6fa84a5e3e95b
+  data.tar.gz: d2019871acee358cf7d6f23f6514dbae33578e55a7e58237f698e334a64c5d9c519b8a2a83ff037aec435b72854a92a435cac3e72fb8a61158ee96049a62d934

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -1,8 +1,12 @@
 #include <ruby.h>
+#include <ruby/intern.h>
 #include "mmap.h"
 
 VALUE MMAPED_FILE = Qnil;
 
+#define START_POSITION 8
+
+VALUE rb_hash_has_key(VALUE hash, VALUE key);
 
 VALUE method_get_double(VALUE self, VALUE index) {
     mm_ipc *i_mm;
@@ -21,7 +25,71 @@ VALUE method_get_double(VALUE self, VALUE index) {
     return DBL2NUM(tmp);
 }
 
+VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
+    Check_Type(positions, T_HASH);
+    Check_Type(key, T_STRING);
+    VALUE position = rb_hash_lookup(positions, key);
+    if (position != Qnil){
+        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);
+    }
+
+    uint32_t used = 0;
+
+    memcpy(&used, (char *)i_mm->t->addr, sizeof(uint32_t));
+
+    if (used == 0){
+        used = START_POSITION;
+    }
+
+    long slen = RSTRING_LEN(key);
+    uint32_t padding_length = 8 - (slen + 4) % 8; // padding | 8 byte aligned
+    //TODO: check slen if its less than uint32 throw exception otherwise
+    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);
+    }
+
+    //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);
+
+    memmove(pos, StringValuePtr(key), slen);
+    pos += slen;
+
+    memset(pos, ' ', padding_length);
+    pos += padding_length;
+
+    double val = NUM2DBL(value);
+    memcpy(pos, &val, sizeof(double));
+
+
+    position = INT2NUM(new_used - 8);
+    rb_hash_aset(positions, key, position);
+
+    memcpy((char *)i_mm->t->addr, &new_used, sizeof(uint32_t));
+
+    return position;
+}
+
+
 void Init_fast_mmaped_file() {
     MMAPED_FILE = rb_define_module("FastMmapedFile");
     rb_define_method(MMAPED_FILE, "get_double", method_get_double, 1);
+    rb_define_method(MMAPED_FILE, "add_entry", method_add_entry, 3);
 }

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

@@ -2,6 +2,7 @@ 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

@@ -30,8 +30,6 @@ module Prometheus
         @m = m
         # @m.mlock # TODO: Ensure memory is locked to RAM
 
-        @used = @m.used
-
         @positions = {}
         read_all_positions.each do |key, pos|
           @positions[key] = pos
@@ -66,23 +64,21 @@ module Prometheus
 
       private
 
-      def init_value(key)
-        @mutex.synchronize do
-          return if @positions.key?(key)
-
-          until @m.try_add_entry(key, 0.0) do
-            filepath = @m.filepath
-            size = @m.size
-            @m.close
-
-            File.truncate(filepath, size * 2)
-            @m = Helper::MmapedFile.open(filepath)
-          end
+      def ok(key)
+        @m.add_entry(@positions, key, 0.0)
+      rescue RuntimeError => e
+        raise e if e.message.match /.*ugh.*/
+        nil
+      end
 
-          # Update how much space we've used.
-          @used = @m.used
+      def init_value(key)
+        until ok(key)
+          filepath = @m.filepath
+          size = @m.size
+          @m.close
 
-          @positions[key] = @used - 8
+          File.truncate(filepath, size * 2)
+          @m = Helper::MmapedFile.open(filepath)
         end
       end
 

data/lib/prometheus/client/version.rb

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