prometheus-client-mmap 0.7.0.beta32 → 0.7.0.beta33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668eeb5bd066bb7495b10016c900f346c5826ffb
-  data.tar.gz: 9598055345b26e3d67bcaa251353740b456ca061
+  metadata.gz: 6a7956684dd9781b3ca54566d1822574a9efaba7
+  data.tar.gz: b1673743af7ef8d4cbe1f1fa40d2da9560ed4f98
 SHA512:
-  metadata.gz: 9c925441a2a99af473762ba79e83cff1ef109b1e3445726b75b1fe72fc66ceb1072cae5efd89a3eca93b95a43cfba7db8147da53bd938d5a9b734addab2bdd13
-  data.tar.gz: 0adac7c568db0af448674d293dc95b3b44ac20c3ade3ebc5b477e82a0ef5522cff96696dab1f060c1a9122d3f67ab8c685ab40bbbfcf6fecbf02ab7724db19e9
+  metadata.gz: 20ca0cf0603f45196a403348f8db23f5fb2b1d64fa0855c966e3448908eec3254b492670d219faa4f1040ab3f5c674a00eb34621729a38c34378641257c02e1f
+  data.tar.gz: c35c741b2a573826d3ac3096c14cf8e92a475f894bab7097404340161f37010e8703866424253ab2cb06871658105a9a7ba53136350ef07ce23c8e54f849d1b4

data/ext/fast_mmaped_file/extconf.rb

@@ -3,7 +3,5 @@ $CFLAGS << ' -std=c11 -Wall -Wextra -Werror'
 
 CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
 
-extension_name = 'fast_mmaped_file'
-
-dir_config(extension_name)
-create_makefile(extension_name)
+dir_config('fast_mmaped_file')
+create_makefile('fast_mmaped_file')

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -7,15 +7,6 @@
 
 #include "mmap.h"
 
-#ifdef UNUSED
-#elif defined(__GNUC__)
-#define UNUSED(x) UNUSED_ ## x __attribute__((unused))
-#elif defined(__LCLINT__)
-#define UNUSED(x) /*@unused@*/ x
-#else
-#define UNUSED(x) x
-#endif
-
 VALUE MMAPED_FILE = Qnil;
 
 #define START_POSITION 8
@@ -146,106 +137,8 @@ VALUE method_get_double(VALUE self, VALUE index) {
     return DBL2NUM(tmp);
 }
 
-#include <jsmn.h>
-
-#define min(a,b) \
-    ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a < _b ? _a : _b; })
-
-VALUE token_to_s(char* json, jsmntok_t *t){
-    int len = t->end - t->start;
-    if (len == 0) {
-        return rb_str_new_literal("");
-    } else {
-        return rb_str_new(json + t->start, t->end - t->start);
-    }
-}
-
-VALUE fast_json_parse(char* json, size_t json_size){
-    jsmn_parser parser;
-    jsmn_init(&parser);
-
-    jsmntok_t t[128];
-    int r = jsmn_parse(&parser, json, json_size, t, sizeof(t)/sizeof(t[0]));
-
-    if (r < 3) {
-        return Qnil;
-    }
-
-    VALUE labels = rb_hash_new();
-    int label_cnt = (r-5)/2;
-    //TODO: (r - 4) % 2 == 0
-
-    for(int i = 0; i < label_cnt; i++){
-        int key = 4 + i;
-        int val = 5 + label_cnt + i;
-        //TODO: add type checks
-
-        if (strncmp("null", json + t[val].start, min(4, t[val].end - t[val].start)) == 0) {
-            rb_hash_aset(labels, token_to_s(json, &t[key]), Qnil);
-        } else {
-            rb_hash_aset(labels, token_to_s(json, &t[key]), token_to_s(json, &t[val]));
-        }
-    }
-
-    return rb_ary_new_from_args(3, token_to_s(json, &t[1]), token_to_s(json, &t[2]), labels);
-}
-
-
-VALUE method_fast_json_parse(VALUE UNUSED(self), VALUE source){
-    Check_Type(source, T_STRING);
-
-    return fast_json_parse(StringValuePtr(source), RSTRING_LEN(source));
-}
-
-VALUE method_fast_entries(VALUE UNUSED(self), VALUE _data){
-    Check_Type(_data, T_STRING);
-
-    char *data = StringValuePtr(_data);
-    uint64_t data_len = RSTRING_LEN(_data);
-
-    uint32_t used;
-    memcpy(&used, data, sizeof(uint32_t));
-
-    uint32_t pos = START_POSITION;
-
-    while (pos < used && (pos + 2*sizeof(uint32_t)) < data_len) {
-        uint32_t encoded_len, first_bytes;
-        memcpy(&encoded_len, data + pos, sizeof(uint32_t));
-        pos += sizeof(uint32_t);
-
-        memcpy(&first_bytes, data + pos, sizeof(uint32_t));
-        if (encoded_len == 0 || first_bytes == 0){
-            pos += 8;
-            continue; // do not parse empty data
-        }
-
-        uint32_t value_offset = encoded_len + padding_length(encoded_len);
-        VALUE metric_name_labels = fast_json_parse(data + pos, encoded_len);
-
-        double value;
-        pos += value_offset;
-        memcpy(&value, data + pos, sizeof(double));
-
-        rb_yield_values(4, rb_ary_entry(metric_name_labels, 0),
-         rb_ary_entry(metric_name_labels, 1),
-         rb_ary_entry(metric_name_labels, 2),
-         DBL2NUM(value)
-         );
-
-        pos += sizeof(double);
-    }
-
-    return Qnil;
-}
-
 void Init_fast_mmaped_file() {
-
     MMAPED_FILE = rb_define_module("FastMmapedFile");
-    rb_define_singleton_method(MMAPED_FILE, "fast_json_parse", method_fast_json_parse, 1);
-    rb_define_singleton_method(MMAPED_FILE, "fast_entries", method_fast_entries, 1);
-
     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/entry_parser.rb

@@ -1,5 +1,4 @@
 require 'prometheus/client/helper/json_parser'
-require 'fast_mmaped_file'
 
 module Prometheus
   module Client
@@ -78,20 +77,21 @@ module Prometheus
         end
 
         def to_metrics(metrics = {}, ignore_errors = false)
-          FastMmapedFile.fast_entries(data) do |metric_name, name, labels, value|
+          parsed_entries(ignore_errors).each do |key, value|
             begin
+              metric_name, name, labelnames, labelvalues = JsonParser.load(key)
               metric = metrics.fetch(metric_name,
                                      metric_name: metric_name,
                                      help: 'Multiprocess metric',
                                      type: type,
-                                     samples: {}
+                                     samples: []
               )
               if type == :gauge
                 metric[:multiprocess_mode] = multiprocess_mode
-                merge_samples(name, labels, value, metric[:samples])
+                metric[:samples] += [[name, labelnames.zip(labelvalues) + [['pid', pid]], value]]
               else
-                merge_samples(name, labels, value, metric[:samples])
                 # The duplicates and labels are fixed in the next for.
+                metric[:samples] += [[name, labelnames.zip(labelvalues), value]]
               end
               metrics[metric_name] = metric
             rescue JSON::ParserError => e
@@ -103,54 +103,6 @@ module Prometheus
           metrics
         end
 
-
-        def min(a, b)
-          if a < b
-            a
-          else
-            b
-          end
-        end
-
-        def max(a, b)
-          if a > b
-            a
-          else
-            b
-          end
-        end
-
-        def merge_samples(name, labels, value, samples)
-          samples ||= {}
-          case type
-            when :gauge
-              case multiprocess_mode
-                when 'min'
-                  key = labels.merge!(__key_name: name)
-                  s = samples.fetch(key, value)
-                  samples[key] = min(s, value)
-                when 'max'
-                  key = labels.merge!(__key_name: name)
-                  s = samples.fetch(key, value)
-                  samples[key] = max(s, value)
-                when 'livesum'
-                  key = labels.merge!(__key_name: name)
-                  s = samples.fetch(key, 0.0)
-                  samples[key] = s + value
-                else # all/liveall
-                  key = labels.merge!(pid: pid, __key_name: name)
-                  samples[key] = value
-              end
-            else
-              key = labels.merge!(__key_name: name)
-              # Counter, Histogram and Summary.
-              s = samples.fetch(key, 0.0)
-              samples[key] = s + value
-          end
-
-          samples
-        end
-
         private
 
         def bin_to_hex(s)

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

@@ -3,54 +3,37 @@ module Prometheus
     module Helper
       module MetricsProcessing
         def self.merge_metrics(metrics)
-          metrics
-        end
-
-        def self.min(a, b)
-          if a < b
-            a
-          else
-            b
-          end
-        end
-
-        def self.max(a, b)
-          if a > b
-            a
-          else
-            b
+          metrics.each_value do |metric|
+            metric[:samples] = merge_samples(metric[:samples], metric[:type], metric[:multiprocess_mode]).map do |(name, labels), value|
+              [name, labels.to_h, value]
+            end
           end
         end
 
         def self.merge_samples(raw_samples, metric_type, multiprocess_mode)
           samples = {}
           raw_samples.each do |name, labels, value|
-            key = { name: name, labels: labels }
-            # without_pid = labels.delete(:pid)
+            without_pid = labels.reject { |l| l[0] == 'pid' }
 
             case metric_type
               when :gauge
                 case multiprocess_mode
                   when 'min'
-                    labels.delete(:pid)
-                    s = samples.fetch(key, value)
-                    samples[key] = min(s, value)
+                    s = samples.fetch([name, without_pid], value)
+                    samples[[name, without_pid]] = [s, value].min
                   when 'max'
-                    labels.delete(:pid)
-                    s = samples.fetch(key, value)
-                    samples[key] = max(s, value)
+                    s = samples.fetch([name, without_pid], value)
+                    samples[[name, without_pid]] = [s, value].max
                   when 'livesum'
-                    labels.delete(:pid)
-                    s = samples.fetch(key, 0.0)
-                    samples[key] = s + value
+                    s = samples.fetch([name, without_pid], 0.0)
+                    samples[[name, without_pid]] = s + value
                   else # all/liveall
-                    samples[key] = value
+                    samples[[name, labels]] = value
                 end
               else
-                labels.delete(:pid)
                 # Counter, Histogram and Summary.
-                s = samples.fetch(key, 0.0)
-                samples[key] = s + value
+                s = samples.fetch([name, without_pid], 0.0)
+                samples[[name, without_pid]] = s + value
             end
           end
 

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

@@ -19,9 +19,8 @@ module Prometheus
           metrics.each do |name, metric|
             lines << format(HELP_LINE, name, escape(metric[:help]))
             lines << format(TYPE_LINE, name, metric[:type])
-            metric[:samples].each do |labels, value|
-              key = labels.delete(:__key_name)
-              lines << metric(key, format_labels(labels), value)
+            metric[:samples].each do |metric_name, labels, value|
+              lines << metric(metric_name, format_labels(labels), value)
             end
           end
 
@@ -33,7 +32,7 @@ module Prometheus
           format(METRIC_LINE, name, labels, value)
         end
 
-        def self.format_labels(set) #TODO: rename set
+        def self.format_labels(set)
           return if set.empty?
 
           strings = set.each_with_object([]) do |(key, value), memo|

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

@@ -1,7 +1,7 @@
 require 'prometheus/client/helper/entry_parser'
 require 'prometheus/client/helper/file_locker'
-require 'mmap'
 require 'fast_mmaped_file'
+require 'mmap'
 
 module Prometheus
   module Client

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

@@ -5,7 +5,7 @@ module Prometheus
     module Helper
       class PlainFile
         include EntryParser
-        attr_reader :filepath, :data
+        attr_reader :filepath
 
         def initialize(filepath)
           @filepath = filepath

data/lib/prometheus/client/mmaped_value.rb

@@ -19,8 +19,6 @@ module Prometheus
           @file_prefix += '_' + multiprocess_mode.to_s
         end
 
-        self.class.reset_on_pid_change
-        # initialize_file
         @pid = -1
 
         @mutex = Mutex.new
@@ -65,6 +63,7 @@ module Prometheus
       def initialize_file
         VALUE_LOCK.synchronize do
           return if @file && !pid_changed?
+          self.class.reset_on_pid_change
 
           @pid = Process.pid
           unless @@files.has_key?(@file_prefix)
@@ -90,16 +89,17 @@ module Prometheus
       end
 
       def self.reset_on_pid_change
-        VALUE_LOCK.synchronize do
-          if pid_changed?
-            @@pid = Process.pid
-            @@files = {}
-          end
+        if pid_changed?
+          @@pid = Process.pid
+          @@files = {}
         end
       end
 
       def self.reinitialize_on_pid_change
-        reset_on_pid_change
+        VALUE_LOCK.synchronize do
+          reset_on_pid_change
+        end
+
         ObjectSpace.each_object(MmapedValue, &:reinitialize)
       end
 

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta32'.freeze
+    VERSION = '0.7.0.beta33'.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.beta32
+  version: 0.7.0.beta33
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
 description: 
 email:
 - ts@soundcloud.com
@@ -71,8 +85,6 @@ files:
 - README.md
 - ext/fast_mmaped_file/extconf.rb
 - ext/fast_mmaped_file/fast_mmaped_file.c
-- ext/fast_mmaped_file/jsmn.c
-- ext/fast_mmaped_file/jsmn.h
 - ext/fast_mmaped_file/mmap.h
 - lib/fast_mmaped_file.bundle
 - lib/prometheus.rb

data/ext/fast_mmaped_file/jsmn.c

@@ -1,313 +0,0 @@
-#include "jsmn.h"
-
-/**
- * Allocates a fresh unused token from the token pull.
- */
-static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
-		jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *tok;
-	if (parser->toknext >= num_tokens) {
-		return NULL;
-	}
-	tok = &tokens[parser->toknext++];
-	tok->start = tok->end = -1;
-	tok->size = 0;
-#ifdef JSMN_PARENT_LINKS
-	tok->parent = -1;
-#endif
-	return tok;
-}
-
-/**
- * Fills token type and boundaries.
- */
-static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
-                            int start, int end) {
-	token->type = type;
-	token->start = start;
-	token->end = end;
-	token->size = 0;
-}
-
-/**
- * Fills next available token with JSON primitive.
- */
-static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
-		size_t len, jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *token;
-	int start;
-
-	start = parser->pos;
-
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		switch (js[parser->pos]) {
-#ifndef JSMN_STRICT
-			/* In strict mode primitive must be followed by "," or "}" or "]" */
-			case ':':
-#endif
-			case '\t' : case '\r' : case '\n' : case ' ' :
-			case ','  : case ']'  : case '}' :
-				goto found;
-		}
-		if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
-			parser->pos = start;
-			return JSMN_ERROR_INVAL;
-		}
-	}
-#ifdef JSMN_STRICT
-	/* In strict mode primitive must be followed by a comma/object/array */
-	parser->pos = start;
-	return JSMN_ERROR_PART;
-#endif
-
-found:
-	if (tokens == NULL) {
-		parser->pos--;
-		return 0;
-	}
-	token = jsmn_alloc_token(parser, tokens, num_tokens);
-	if (token == NULL) {
-		parser->pos = start;
-		return JSMN_ERROR_NOMEM;
-	}
-	jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-	token->parent = parser->toksuper;
-#endif
-	parser->pos--;
-	return 0;
-}
-
-/**
- * Fills next token with JSON string.
- */
-static int jsmn_parse_string(jsmn_parser *parser, const char *js,
-		size_t len, jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *token;
-
-	int start = parser->pos;
-
-	parser->pos++;
-
-	/* Skip starting quote */
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		char c = js[parser->pos];
-
-		/* Quote: end of string */
-		if (c == '\"') {
-			if (tokens == NULL) {
-				return 0;
-			}
-			token = jsmn_alloc_token(parser, tokens, num_tokens);
-			if (token == NULL) {
-				parser->pos = start;
-				return JSMN_ERROR_NOMEM;
-			}
-			jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-			token->parent = parser->toksuper;
-#endif
-			return 0;
-		}
-
-		/* Backslash: Quoted symbol expected */
-		if (c == '\\' && parser->pos + 1 < len) {
-			int i;
-			parser->pos++;
-			switch (js[parser->pos]) {
-				/* Allowed escaped symbols */
-				case '\"': case '/' : case '\\' : case 'b' :
-				case 'f' : case 'r' : case 'n'  : case 't' :
-					break;
-				/* Allows escaped symbol \uXXXX */
-				case 'u':
-					parser->pos++;
-					for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
-						/* If it isn't a hex character we have an error */
-						if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
-									(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
-									(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
-							parser->pos = start;
-							return JSMN_ERROR_INVAL;
-						}
-						parser->pos++;
-					}
-					parser->pos--;
-					break;
-				/* Unexpected symbol */
-				default:
-					parser->pos = start;
-					return JSMN_ERROR_INVAL;
-			}
-		}
-	}
-	parser->pos = start;
-	return JSMN_ERROR_PART;
-}
-
-/**
- * Parse JSON string and fill tokens.
- */
-int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-		jsmntok_t *tokens, unsigned int num_tokens) {
-	int r;
-	int i;
-	jsmntok_t *token;
-	int count = parser->toknext;
-
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		char c;
-		jsmntype_t type;
-
-		c = js[parser->pos];
-		switch (c) {
-			case '{': case '[':
-				count++;
-				if (tokens == NULL) {
-					break;
-				}
-				token = jsmn_alloc_token(parser, tokens, num_tokens);
-				if (token == NULL)
-					return JSMN_ERROR_NOMEM;
-				if (parser->toksuper != -1) {
-					tokens[parser->toksuper].size++;
-#ifdef JSMN_PARENT_LINKS
-					token->parent = parser->toksuper;
-#endif
-				}
-				token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
-				token->start = parser->pos;
-				parser->toksuper = parser->toknext - 1;
-				break;
-			case '}': case ']':
-				if (tokens == NULL)
-					break;
-				type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
-#ifdef JSMN_PARENT_LINKS
-				if (parser->toknext < 1) {
-					return JSMN_ERROR_INVAL;
-				}
-				token = &tokens[parser->toknext - 1];
-				for (;;) {
-					if (token->start != -1 && token->end == -1) {
-						if (token->type != type) {
-							return JSMN_ERROR_INVAL;
-						}
-						token->end = parser->pos + 1;
-						parser->toksuper = token->parent;
-						break;
-					}
-					if (token->parent == -1) {
-						if(token->type != type || parser->toksuper == -1) {
-							return JSMN_ERROR_INVAL;
-						}
-						break;
-					}
-					token = &tokens[token->parent];
-				}
-#else
-				for (i = parser->toknext - 1; i >= 0; i--) {
-					token = &tokens[i];
-					if (token->start != -1 && token->end == -1) {
-						if (token->type != type) {
-							return JSMN_ERROR_INVAL;
-						}
-						parser->toksuper = -1;
-						token->end = parser->pos + 1;
-						break;
-					}
-				}
-				/* Error if unmatched closing bracket */
-				if (i == -1) return JSMN_ERROR_INVAL;
-				for (; i >= 0; i--) {
-					token = &tokens[i];
-					if (token->start != -1 && token->end == -1) {
-						parser->toksuper = i;
-						break;
-					}
-				}
-#endif
-				break;
-			case '\"':
-				r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
-				if (r < 0) return r;
-				count++;
-				if (parser->toksuper != -1 && tokens != NULL)
-					tokens[parser->toksuper].size++;
-				break;
-			case '\t' : case '\r' : case '\n' : case ' ':
-				break;
-			case ':':
-				parser->toksuper = parser->toknext - 1;
-				break;
-			case ',':
-				if (tokens != NULL && parser->toksuper != -1 &&
-						tokens[parser->toksuper].type != JSMN_ARRAY &&
-						tokens[parser->toksuper].type != JSMN_OBJECT) {
-#ifdef JSMN_PARENT_LINKS
-					parser->toksuper = tokens[parser->toksuper].parent;
-#else
-					for (i = parser->toknext - 1; i >= 0; i--) {
-						if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
-							if (tokens[i].start != -1 && tokens[i].end == -1) {
-								parser->toksuper = i;
-								break;
-							}
-						}
-					}
-#endif
-				}
-				break;
-#ifdef JSMN_STRICT
-			/* In strict mode primitives are: numbers and booleans */
-			case '-': case '0': case '1' : case '2': case '3' : case '4':
-			case '5': case '6': case '7' : case '8': case '9':
-			case 't': case 'f': case 'n' :
-				/* And they must not be keys of the object */
-				if (tokens != NULL && parser->toksuper != -1) {
-					jsmntok_t *t = &tokens[parser->toksuper];
-					if (t->type == JSMN_OBJECT ||
-							(t->type == JSMN_STRING && t->size != 0)) {
-						return JSMN_ERROR_INVAL;
-					}
-				}
-#else
-			/* In non-strict mode every unquoted value is a primitive */
-			default:
-#endif
-				r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
-				if (r < 0) return r;
-				count++;
-				if (parser->toksuper != -1 && tokens != NULL)
-					tokens[parser->toksuper].size++;
-				break;
-
-#ifdef JSMN_STRICT
-			/* Unexpected char in strict mode */
-			default:
-				return JSMN_ERROR_INVAL;
-#endif
-		}
-	}
-
-	if (tokens != NULL) {
-		for (i = parser->toknext - 1; i >= 0; i--) {
-			/* Unmatched opened object or array */
-			if (tokens[i].start != -1 && tokens[i].end == -1) {
-				return JSMN_ERROR_PART;
-			}
-		}
-	}
-
-	return count;
-}
-
-/**
- * Creates a new parser based over a given  buffer with an array of tokens
- * available.
- */
-void jsmn_init(jsmn_parser *parser) {
-	parser->pos = 0;
-	parser->toknext = 0;
-	parser->toksuper = -1;
-}

data/ext/fast_mmaped_file/jsmn.h

@@ -1,76 +0,0 @@
-#ifndef __JSMN_H_
-#define __JSMN_H_
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * JSON type identifier. Basic types are:
- * 	o Object
- * 	o Array
- * 	o String
- * 	o Other primitive: number, boolean (true/false) or null
- */
-typedef enum {
-	JSMN_UNDEFINED = 0,
-	JSMN_OBJECT = 1,
-	JSMN_ARRAY = 2,
-	JSMN_STRING = 3,
-	JSMN_PRIMITIVE = 4
-} jsmntype_t;
-
-enum jsmnerr {
-	/* Not enough tokens were provided */
-	JSMN_ERROR_NOMEM = -1,
-	/* Invalid character inside JSON string */
-	JSMN_ERROR_INVAL = -2,
-	/* The string is not a full JSON packet, more bytes expected */
-	JSMN_ERROR_PART = -3
-};
-
-/**
- * JSON token description.
- * type		type (object, array, string etc.)
- * start	start position in JSON data string
- * end		end position in JSON data string
- */
-typedef struct {
-	jsmntype_t type;
-	int start;
-	int end;
-	int size;
-#ifdef JSMN_PARENT_LINKS
-	int parent;
-#endif
-} jsmntok_t;
-
-/**
- * JSON parser. Contains an array of token blocks available. Also stores
- * the string being parsed now and current position in that string
- */
-typedef struct {
-	unsigned int pos; /* offset in the JSON string */
-	unsigned int toknext; /* next token to allocate */
-	int toksuper; /* superior token node, e.g parent object or array */
-} jsmn_parser;
-
-/**
- * Create JSON parser over an array of tokens
- */
-void jsmn_init(jsmn_parser *parser);
-
-/**
- * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
- * a single JSON object.
- */
-int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-		jsmntok_t *tokens, unsigned int num_tokens);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __JSMN_H_ */