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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 553a05d7d0b14439046cfbda874603af9b6ba6f6
-  data.tar.gz: a1a202b9bffe768e978aaf9eef85c526b78afd2b
+  metadata.gz: baae77f6d273813515be523af6a16e159006f636
+  data.tar.gz: 60a044917b7edb908639a22df60727d85136297f
 SHA512:
-  metadata.gz: 32f7f2f9fda00f570817ce0a0dbb47e713ef9f849a01f8c41b551e297e72a0872b94a816b346ee0635077cc33efe36504ad6be084be4f4d2ed6d3a4647f7f7eb
-  data.tar.gz: ab1a83e5e0be8a7d860d7dcac6b073ca21f37360e8577e0b4f9fc60789c51d22a2728e068fb2aa186884592f516c1a2932c5d8164a6032f5d3ff93e13fb1c303
+  metadata.gz: 305cf2a73f788de59de593483847ecb105c8a79b6a98a9f308d1d02a3ac6263b141ae17a546756642cb8ab1e7f9dcaa94b6ae3a9edeeaffcd86628a9ffaf3106
+  data.tar.gz: d3df54b93d82293d7d4a66ca59811296e11b6543128fe7eb354248dd56fe977bfe071d11feb192dcc1247fc20e9dbbfbf2aa255602ff8afbf54233b6c4082684

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

@@ -26,22 +26,6 @@ module Prometheus
           self[0..3] = [value].pack('l')
         end
 
-        def try_add_entry(data, value)
-          self.used = START_POSITION if used.zero?
-
-          # Pad to be 8-byte aligned.
-          padded = data + (' ' * (8 - (data.length + 4) % 8))
-          entry = [data.length, padded, value].pack("lA#{padded.length}d")
-          used_ = used
-
-          return false if (used_ + entry.length) > @size
-
-          self[used_..used_ + entry.length] = entry
-          self.used = used_ + entry.length
-
-          true
-        end
-
         def close
           munmap
         end

data/lib/prometheus/client/mmaped_value.rb

@@ -7,11 +7,10 @@ module Prometheus
     # A float protected by a mutex backed by a per-process mmaped file.
     class MmapedValue
       @@files = {}
-      @@files_lock = Mutex.new
+      VALUE_LOCK = Mutex.new
       @@pid = -1
 
       def initialize(type, metric_name, name, labels, multiprocess_mode = '')
-        @pid = Prometheus::Client.pid
         @file_prefix = type.to_s
         @metric_name = metric_name
         @name = name
@@ -20,7 +19,9 @@ module Prometheus
           @file_prefix += '_' + multiprocess_mode.to_s
         end
 
-        self.class.reset_on_pid_change if self.class.pid_changed?
+        self.class.reset_on_pid_change
+        # initialize_file
+        @pid = -1
 
         @mutex = Mutex.new
         initialize_file
@@ -28,6 +29,8 @@ module Prometheus
 
       def increment(amount=1)
         @mutex.synchronize do
+          initialize_file if pid_changed?
+
           @value += amount
           write_value(@key, @value)
           @value
@@ -36,6 +39,8 @@ module Prometheus
 
       def set(value)
         @mutex.synchronize do
+          initialize_file if pid_changed?
+
           @value = value
           write_value(@key, @value)
           @value
@@ -44,41 +49,24 @@ module Prometheus
 
       def get
         @mutex.synchronize do
+          initialize_file if pid_changed?
           return @value
         end
       end
 
-      def self.reset_on_pid_change
-        @@files_lock.synchronize do
-          if pid_changed?
-            @@pid = Prometheus::Client.pid
-            @@files = {}
-          end
-        end
-      end
-
-      def self.reinitialize_on_pid_change
-        reset_on_pid_change
-        ObjectSpace.each_object(MmapedValue, &:reinitialize)
-      end
-
-      def self.pid_changed?
-        @@pid != Prometheus::Client.pid
-      end
-
-      def self.multiprocess
-        true
+      def pid_changed?
+        @pid != Process.pid
       end
 
       def reinitialize
-        if @pid != Prometheus::Client.pid
-          @pid = Prometheus::Client.pid
-          initialize_file
-        end
+        initialize_file if pid_changed?
       end
 
       def initialize_file
-        @@files_lock.synchronize do
+        VALUE_LOCK.synchronize do
+          return if @file && !pid_changed?
+
+          @pid = Process.pid
           unless @@files.has_key?(@file_prefix)
             unless @file.nil?
               @file.close
@@ -87,9 +75,7 @@ module Prometheus
 
             @@files[@file_prefix] = MmapedDict.new(mmaped_file)
           end
-        end
 
-        @mutex.synchronize do
           @file = @@files[@file_prefix]
           labelnames = []
           labelvalues = []
@@ -103,10 +89,33 @@ module Prometheus
         end
       end
 
+      def self.reset_on_pid_change
+        VALUE_LOCK.synchronize do
+          if pid_changed?
+            @@pid = Process.pid
+            @@files = {}
+          end
+        end
+      end
+
+      def self.reinitialize_on_pid_change
+        reset_on_pid_change
+        ObjectSpace.each_object(MmapedValue, &:reinitialize)
+      end
+
+      def self.pid_changed?
+        @@pid != Process.pid
+      end
+
+      def self.multiprocess
+        true
+      end
+
       private
 
       def write_value(key, val)
         @file.write_value(key, val)
+
       rescue StandardError => e
         Prometheus::Client.logger.warn("writing value to #{@file.path} failed with #{e}")
         Prometheus::Client.logger.debug(e.backtrace.join("\n"))

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta29'.freeze
+    VERSION = '0.7.0.beta30'.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.beta29
+  version: 0.7.0.beta30
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2