prometheus-client-mmap 0.7.0.beta42 → 0.7.0.beta43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e546160d5f4baf942cd59595ba9f4738f5bb112a
-  data.tar.gz: d2369f52a14a938fec91c09d372396c031992234
+  metadata.gz: 4521825ca75920135fbbaf6fb8e5c96bd0d191ee
+  data.tar.gz: '06686cb19e896c65356e2ed44c6398adb69d4a01'
 SHA512:
-  metadata.gz: c02fd8414f65779692b0aac43e89f53a87492843bae04891924838320533f495de9977ba2c99c72d34553d937268fa0ee6b5859861f1f13a86a5969c74b4320f
-  data.tar.gz: e9bf20cc0e44dd7307b429dd088d82702a25073bbd72ff0cc9315d4e2580e7438042b98032c21f7ddb0f668afd6bf42c0018e3f4bd81dfb40c30b79d0ecab9b4
+  metadata.gz: 262ea3d30cce8cc62b56c098cb983c0c43a55bad40b6374c7ea72df8c45404e0fc978bd9e0b0498ae512ee9818cd2742f823bf583dbcff02ae1be01e1591063d
+  data.tar.gz: 7cd7db57d62f2f9bbf5da3940ce12d6ca849d17e09530a52ca351475a5eea7fbfadeacf65af2793613be20363ebff46696c8248af0019e10bc3b768d3bdd978c

data/ext/fast_mmaped_file/file_parsing.c

@@ -30,6 +30,10 @@ static void entry_free(entry_t *entry) {
     free(entry);
 }
 
+static inline double min(double a, double b) { return a < b ? a : b; }
+
+static inline double max(double a, double b) { return a > b ? a : b; }
+
 static void merge_entry(entry_t *found, const entry_t *entry) {
     if (entry->type == sym_gauge) {
         if (entry->multiprocess_mode == sym_min) {
@@ -101,7 +105,10 @@ static int add_parsed_name(entry_t *entry) {
 }
 
 static int entry_lexical_comparator(const entry_t **a, const entry_t **b) {
-    size_t min_length = min((*a)->json_size, (*b)->json_size);
+    size_t size_a = (*a)->json_size;
+    size_t size_b = (*b)->json_size;
+    size_t min_length = size_a < size_b ? size_a : size_b;
+
     return strncmp((*a)->json, (*b)->json, min_length);
 }
 

data/ext/fast_mmaped_file/rendering.c

@@ -10,8 +10,6 @@
 #define DBL_DECIMAL_DIG 17
 #endif
 
-// inline min_t()
-
 static inline int is_valid(const jsmntok_t *token) { return token->start < token->end && token->start >= 0; }
 static inline int valid_not_null(const entry_t *entry, const jsmntok_t *token) {
     static const char null_s[] = "null";

data/ext/fast_mmaped_file/utils.h

@@ -10,16 +10,6 @@
 #define UNUSED(x) x
 #endif
 
-#define min(a,b) \
-    ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a < _b ? _a : _b; })
-
-#define max(a,b) \
-    ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a > _b ? _a : _b; })
-
 NORETURN(void raise_last_exception());
 void save_exception(VALUE exception, const char *fmt, ...);
 

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta42'.freeze
+    VERSION = '0.7.0.beta43'.freeze
   end
 end

data/vendor/c/hashmap/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 David Leeds
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/vendor/c/hashmap/README.md

@@ -0,0 +1,90 @@
+# hashmap
+Flexible hashmap implementation in C using open addressing and linear probing for collision resolution.
+
+### Summary
+This project came into existence because there are a notable lack of flexible and easy to use data structures available in C.  Sure, higher level languages have built-in libraries, but plenty of embedded projects or higher level libraries start with core C code.  It was undesirable to add a bulky library like Glib as a dependency to my projects, or grapple with a restrictive license agreement.  Searching for "C hashmap" yielded results with questionable algorithms and code quality, projects with difficult or inflexible interfaces, or projects with less desirable licenses.  I decided it was time to create my own.
+
+
+### Goals
+* **To scale gracefully to the full capacity of the numeric primitives in use.**  E.g. on a 32-bit machine, you should be able to load a billion+ entries without hitting any bugs relating to integer overflows.  Lookups on a hashtable with a billion entries should be performed in close to constant time, no different than lookups in a hashtable with 20 entries.  Automatic rehashing occurs and maintains a load factor of 0.75 or less.
+* **To provide a clean and easy-to-use interface.**  C data structures often struggle to strike a balance between flexibility and ease of use.  To this end, I provided a generic interface using void pointers for keys and data, and macros to generate type-specific wrapper functions, if desired.
+* **To enable easy iteration and safe entry removal during iteration.**  Applications often need these features, and the data structure should not hold them back.  Both an iterator interface and a foreach function was provided to satisfy various use-cases.  This hashmap also uses an open addressing scheme, which has superior iteration performance to a similar hashmap implemented using separate chaining (buckets with linked lists).  This is because fewer instructions are needed per iteration, and array traversal has superior cache performance than linked list traversal.
+* **To use a very unrestrictive software license.**  Using no license was an option, but I wanted to allow the code to be tracked, simply for my own edification.  I chose the MIT license because it is the most common open source license in use, and it grants full rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell the code.  Basically, take this code and do what you want with it.  Just be nice and leave the license comment and my name at top of the file.  Feel free to add your name if you are modifying and redistributing.
+
+### Code Example
+```C
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <hashmap.h>
+
+/* Some sample data structure with a string key */
+struct blob {
+  char key[32];
+  size_t data_len;
+  unsigned char data[1024];
+};
+
+/* Declare type-specific blob_hashmap_* functions with this handy macro */
+HASHMAP_FUNCS_CREATE(blob, const char, struct blob)
+
+struct blob *blob_load(void)
+{
+  struct blob *b;
+  /*
+   * Hypothetical function that allocates and loads blob structures
+   * from somewhere.  Returns NULL when there are no more blobs to load.
+   */
+  return b;
+}
+
+/* Hashmap structure */
+struct hashmap map;
+
+int main(int argc, char **argv)
+{
+  struct blob *b;
+  struct hashmap_iter *iter;
+
+  /* Initialize with default string key functions and init size */
+  hashmap_init(&map, hashmap_hash_string, hashmap_compare_string, 0);
+
+  /* Load some sample data into the map and discard duplicates */
+  while ((b = blob_load()) != NULL) {
+    if (blob_hashmap_put(&map, b->key, b) != b) {
+      printf("discarding blob with duplicate key: %s\n", b->key);
+      free(b);
+    }
+  }
+
+  /* Lookup a blob with key "AbCdEf" */
+  b = blob_hashmap_get(&map, "AbCdEf");
+  if (b) {
+    printf("Found blob[%s]\n", b->key);
+  }
+
+  /* Iterate through all blobs and print each one */
+  for (iter = hashmap_iter(&map); iter; iter = hashmap_iter_next(&map, iter)) {
+    printf("blob[%s]: data_len %zu bytes\n", blob_hashmap_iter_get_key(iter),
+      blob_hashmap_iter_get_data(iter)->data_len);
+  }
+
+  /* Remove all blobs with no data */
+  iter = hashmap_iter(&map);
+  while (iter) {
+    b = blob_hashmap_iter_get_data(iter);
+    if (b->data_len == 0) {
+      iter = hashmap_iter_remove(&map, iter);
+      free(b);
+    } else {
+      iter = hashmap_iter_next(&map, iter);
+    }
+  }
+
+  /* Free all allocated resources associated with map and reset its state */
+  hashmap_destroy(&map);
+
+  return 0;
+}
+
+```

data/vendor/c/hashmap/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-slate