prometheus-client-mmap 0.7.0.beta18 → 0.7.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125465cb67bfcdcce578b05e2533264d5a6f16bf
-  data.tar.gz: 8251ad819a49074395451366c33ed4e2e28c7efd
+  metadata.gz: 010d69c130f93c8618f5bd9daafc5f3df0ccb8fa
+  data.tar.gz: ebea17e5c6d034dde9c0660237482ddae73415c7
 SHA512:
-  metadata.gz: e1e6d918da65e60683c55306e74869a5b166ed21a8ba0b0512b11d9f1c817d625541300d06668e294bb99cdf5b3a6feacb24e990e6bf97249c1eadcb7d65fdf0
-  data.tar.gz: 50f9b80b2f9d2861e18105c6037cac59e8b282aaed402f571d4a75cbc43b2a1221b7c9ac1f6e8eadadefa189b502e4bc3697bd3c1fee6abbfcc98e6ac2f3a698
+  metadata.gz: 641ca6e4fb6587f345a340ade98823dd339c2cfc5f2a057d53e8a9f9fdb0f64367c6c51a21b60837cea27bb5d5d8c8fb723c75fcafed9e67d2a22f622d10267a
+  data.tar.gz: 447c4af8a99826c37e4c33059cb4753108ee79afe924e01c882c8c08bbef465b9ecf6c7772eaff63dc4dd48adeea50570cd8d7b14c3203453b4317e06d576765

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

@@ -0,0 +1,32 @@
+module Prometheus
+  module Client
+    module Helper
+      module EntryParser
+        def used
+          slice(4..7).unpack('l')[0]
+        end
+
+        def entries
+          return Enumerator.new {} if used.zero?
+
+          Enumerator.new do |yielder|
+            used_ = used # cache used to avoid unnecessary unpack operations
+
+            pos = 12 # pid + used + padding offset
+            while pos < used_
+              data = slice(pos..-1)
+              encoded_len, = data.unpack('l')
+              padding_len = 8 - (encoded_len + 4) % 8
+              value_offset = 4 + encoded_len + padding_len
+              pos += value_offset
+
+              yielder.yield data, encoded_len, value_offset, pos
+
+              pos += 8
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Prometheus
+  module Client
+    module Helper
+      class FileLocker
+        class << self
+          LOCK_FILE_MUTEX = Mutex.new
+
+          def lock_to_process(filepath)
+            LOCK_FILE_MUTEX.synchronize do
+              @file_locks ||= {}
+              return false if @file_locks[filepath]
+
+              file = File.open(filepath, 'w+')
+              if file.flock(File::LOCK_NB | File::LOCK_EX)
+                @file_locks[filepath] = file
+                return true
+              else
+                return false
+              end
+            end
+          end
+
+          def unlock(filepath)
+            LOCK_FILE_MUTEX.synchronize do
+              @file_locks ||= {}
+              return false unless @file_locks[filepath]
+
+              @file_locks.delete(filepath).flock(File::LOCK_UN)
+            end
+          end
+
+          def unlock_all
+            LOCK_FILE_MUTEX.synchronize do
+              @file_locks ||= {}
+              @file_locks.values.each do |file|
+                file.flock(File::LOCK_UN)
+              end
+
+              @file_locks = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,42 +1,27 @@
-require 'prometheus/client'
+require 'prometheus/client/helper/entry_parser'
+require 'prometheus/client/helper/file_locker'
 require 'mmap'
 
 module Prometheus
   module Client
     module Helper
       class MmapedFile < Mmap
-        class << self
-          def open_readonly(filepath)
-            MmapedFile.new(filepath, 'r', Mmap::MAP_PRIVATE)
-          end
+        include EntryParser
 
+        class << self
           def open(filepath)
             MmapedFile.new(filepath, 'rw', Mmap::MAP_SHARED)
           end
 
-          def lock_to_process(filepath)
-            m = open(filepath)
-            if m.lock_to_process
-              Kernel.at_exit do
-                open(filepath).unlock
-              end
-              true
-            else
-              false
-            end
-          ensure
-            m.close
-          end
-
-          def ensure_process_exclusive_file(file_prefix = 'mmaped_file')
+          def ensure_exclusive_file(file_prefix = 'mmaped_file')
             (0..Float::INFINITY).lazy
               .map { |f_num| "#{file_prefix}_#{Prometheus::Client.pid}-#{f_num}.db" }
               .map { |filename| File.join(Prometheus::Client.configuration.multiprocess_files_dir, filename) }
-              .find { |path| Helper::MmapedFile.lock_to_process(path) }
+              .find { |path| Helper::FileLocker.lock_to_process(path) }
           end
 
-          def open_process_exclusive_file(file_prefix = 'mmaped_file')
-            filename = Helper::MmapedFile.ensure_process_exclusive_file(file_prefix)
+          def open_exclusive_file(file_prefix = 'mmaped_file')
+            filename = Helper::MmapedFile.ensure_exclusive_file(file_prefix)
             open(filename)
           end
         end
@@ -55,70 +40,10 @@ module Prometheus
           super(filepath, mode, protection, options)
         end
 
-        def pid
-          self[0..3].unpack('l')[0]
-        end
-
-        def pid=(value)
-          self[0..3] = [value].pack('l')
-        end
-
-        def used
-          self[4..7].unpack('l')[0]
-        end
-
         def used=(value)
           self[4..7] = [value].pack('l')
         end
 
-        def locked_to_process?
-          pid > 0 && pid_alive?(pid)
-        end
-
-        def lock_owner?
-          pid == Process.pid
-        end
-
-        def lock_to_process
-          return true if lock_owner?
-
-          if locked_to_process?
-            false
-          else
-            self.pid = Process.pid
-
-            # check if PID was correctly written
-            lock_owner?
-          end
-        end
-
-        def unlock
-          return unless lock_owner?
-
-          self.pid = 0
-        end
-
-        def entries
-          return Enumerator.new {} if used.zero?
-
-          Enumerator.new do |yielder|
-            used_ = used # cache used to avoid unnecessary unpack operations
-
-            pos = 12 # pid + used + padding offset
-            while pos < used_
-              data = slice(pos..-1)
-              encoded_len, = data.unpack('l')
-              padding_len = 8 - (encoded_len + 4) % 8
-              value_offset = 4 + encoded_len + padding_len
-              pos += value_offset
-
-              yielder.yield data, encoded_len, value_offset, pos
-
-              pos += 8
-            end
-          end
-        end
-
         def add_entry(data, value)
           self.used = 12 if used.zero?
 
@@ -146,15 +71,6 @@ module Prometheus
         def initial_mmap_file_size
           Prometheus::Client.configuration.initial_mmap_file_size
         end
-
-        def pid_alive?(pid)
-          begin
-            Process.getpgid(pid)
-            true
-          rescue Errno::ESRCH
-            false
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,19 @@
+require 'prometheus/client/helper/entry_parser'
+
+module Prometheus
+  module Client
+    module Helper
+      class PlainFile
+        include EntryParser
+
+        def initialize(filepath)
+          @data = File.read(filepath, mode: 'rb')
+        end
+
+        def slice(*args)
+          @data.slice(*args)
+        end
+      end
+    end
+  end
+end

data/lib/prometheus/client/mmaped_dict.rb

@@ -1,4 +1,5 @@
 require 'prometheus/client/helper/mmaped_file'
+require 'prometheus/client/helper/plain_file'
 require 'prometheus/client'
 
 module Prometheus
@@ -17,6 +18,13 @@ module Prometheus
       MINIMUM_SIZE = 8
       attr_reader :m, :used, :positions
 
+      def self.read_all_values(f)
+        Helper::PlainFile.new(f).entries.map do |data, encoded_len, value_offset, _|
+          encoded, value = data.unpack(format('@4A%d@%dd', encoded_len, value_offset))
+          [encoded, value]
+        end
+      end
+
       def initialize(m)
         @mutex = Mutex.new
 
@@ -33,18 +41,6 @@ module Prometheus
         raise ParsingError, "exception #{e} while processing metrics file #{path}"
       end
 
-      # Yield (key, value). No locking is performed.
-      def self.read_all_values(f)
-        m = Helper::MmapedFile.open(f)
-
-        m.entries.map do |data, encoded_len, value_offset, _|
-          encoded, value = data.unpack(format('@4A%d@%dd', encoded_len, value_offset))
-          [encoded, value]
-        end
-      ensure
-        m.munmap
-      end
-
       def read_value(key)
         @mutex.synchronize do
           init_value(key) unless @positions.key?(key)
@@ -68,6 +64,7 @@ module Prometheus
       end
 
       def close
+        @m.sync
         @m.close
       rescue TypeError => e
         Prometheus::Client.logger.warn("munmap raised error #{e}")

data/lib/prometheus/client/mmaped_value.rb

@@ -83,7 +83,7 @@ module Prometheus
             unless @file.nil?
               @file.close
             end
-            mmaped_file = Helper::MmapedFile.open_process_exclusive_file(@file_prefix)
+            mmaped_file = Helper::MmapedFile.open_exclusive_file(@file_prefix)
 
             @@files[@file_prefix] = MmapedDict.new(mmaped_file)
           end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta18'
+    VERSION = '0.7.0.beta19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta18
+  version: 0.7.0.beta19
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.7
+- !ruby/object:Gem::Dependency
+  name: gem_publisher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: 
 email:
 - ts@soundcloud.com
@@ -44,8 +58,11 @@ files:
 - lib/prometheus/client/counter.rb
 - lib/prometheus/client/formats/text.rb
 - lib/prometheus/client/gauge.rb
+- lib/prometheus/client/helper/entry_parser.rb
+- lib/prometheus/client/helper/file_locker.rb
 - lib/prometheus/client/helper/json_parser.rb
 - lib/prometheus/client/helper/mmaped_file.rb
+- lib/prometheus/client/helper/plain_file.rb
 - lib/prometheus/client/histogram.rb
 - lib/prometheus/client/label_set_validator.rb
 - lib/prometheus/client/metric.rb