prometheus-client-mmap 0.7.0.beta40 → 0.7.0.beta41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f51d0d3d39230181b8a35905cac312c52dde03b
-  data.tar.gz: 1ec3f78ad1276fb225d73e31f1f0e91369c8afa2
+  metadata.gz: 49ac78e6bb20f940989a545386f5a8340dd3a046
+  data.tar.gz: e11aeb1946d4c4afa0f09e5037bbb7b7e5c23a6e
 SHA512:
-  metadata.gz: bf88cde2f108d7b3ade4ae808e0be40256acfa39cc8df26a3ce6ed7e023113314907f777afee1e28ac252293f46815b5bc898b9ab35485ccc61cc387b1c49934
-  data.tar.gz: 2d47f29dba886af6f5d3d462754712074e3c7d3e11c1072f399fd9621055299ec16dd5baa5e18c765220e013171d8b21596c7f96593ceb94479773821cd1b3cc
+  metadata.gz: 961b21816d5e183e2ea030512481b9627671d66b632ed2be9644eda9ed512a933a4f96a6fef06163ea21998675c6a226e6571f3bda4a10b97c83189d066f489c
+  data.tar.gz: 2351c759ee985a918c5aecaa752cb4071fb0686f4185944ea13559b9bc3cb1fd7b8b8c2e1a166be689f0a960a02204d6a277243c331ddde97814f1a393f632c5

data/ext/fast_mmaped_file/extconf.rb

@@ -1,5 +1,5 @@
 require 'mkmf'
-$CFLAGS << ' -std=c11 -Wall -Wextra -Werror'
+$CFLAGS << ' -std=c99 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -Werror'
 
 CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
 

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -6,7 +6,6 @@
 #include <value_access.h>
 #include <globals.h>
 
-
 #include <jsmn.h>
 #include <hashmap.h>
 #include <file_reading.h>
@@ -21,7 +20,6 @@ ID sym_livesum;
 ID sym_gauge;
 ID sym_pid;
 ID sym_samples;
-ID sym_key_name;
 
 int aggregate_files(struct hashmap *map, VALUE list_of_files){
     buffer_t reading_buffer = (buffer_t) { .buffer = NULL };
@@ -91,7 +89,6 @@ void Init_fast_mmaped_file() {
     sym_livesum = rb_intern("livesum");
     sym_pid = rb_intern("pid");
     sym_samples = rb_intern("samples");
-    sym_key_name = rb_intern("__key_name");
 
     MMAPED_FILE = rb_define_module("FastMmapedFile");
     rb_define_singleton_method(MMAPED_FILE, "to_metrics", method_to_metrics, 1);

data/ext/fast_mmaped_file/file_parsing.c

@@ -5,20 +5,10 @@
 #include <jsmn.h>
 #include "file_parsing.h"
 
-//ID sym_gauge;
-//ID sym_min;
-//ID sym_max;
-//ID sym_livesum;
-
 HASHMAP_FUNCS_CREATE(entry, const entry_struct, entry_struct)
 
 typedef int (*compare_fn) (const void *a, const void *b);
 
-inline int is_pid_significant(const entry_struct *a){
-    ID mp = a->multiprocess_mode;
-    return a->type == sym_gauge && !(mp == sym_min || mp == sym_max || mp == sym_livesum);
-}
-
 size_t hashmap_hash_entry(const entry_struct *entry){
 	size_t hash = 0;
 
@@ -78,7 +68,7 @@ void merge_entry(entry_struct *found, const entry_struct *entry){
         } else if (entry->multiprocess_mode == sym_livesum) {
             found->value += entry->value;
         } else {
-            found->value += entry->value; //TODO: this shouldn't happen
+            found->value = entry->value;
         }
     } else {
         found->value += entry->value;
@@ -174,17 +164,14 @@ int process_buffer(file_t *file_info, buffer_t *source, struct hashmap *map){
         entry.pid = file_info->pid;
         entry.type = file_info->type;
 
-        *(entry.json + encoded_len) = '\0'; // TODO: NONO
-
-        pos += value_offset;
-        memcpy(&entry.value, source->buffer + pos, sizeof(double)); //too
+        memcpy(&entry.value, entry.json + value_offset, sizeof(double));
 
         if (!process_entry(map, &entry)) {
             entries_destroy(map);
             return 0;
         }
 
-        pos += sizeof(double);
+        pos += value_offset + sizeof(double);
     }
     return 1;
 }
@@ -220,3 +207,7 @@ int sort_map_entries(const struct hashmap *map, entry_struct ***sorted_entries){
     return 1;
 }
 
+int is_pid_significant(const entry_struct *e){
+    ID mp = e->multiprocess_mode;
+    return e->type == sym_gauge && !(mp == sym_min || mp == sym_max || mp == sym_livesum);
+}

data/ext/fast_mmaped_file/file_parsing.h

@@ -20,4 +20,6 @@ void entries_destroy(struct hashmap *map);
 int process_buffer(file_t *file_info, buffer_t *source, struct hashmap *map);
 int sort_map_entries(const struct hashmap *map, entry_struct ***sorted_entries);
 
+int is_pid_significant(const entry_struct *e);
+
 #endif

data/ext/fast_mmaped_file/file_reading.c

@@ -9,7 +9,7 @@ int file_open(file_t *file, const char *filepath){
     file->path = malloc(filepath_len);
     memcpy(file->path, filepath, filepath_len + 1);
 
-    if (file->fd < 0){
+    if (file->fd == NULL){
         save_exception(rb_eArgError, "Can't open %s, errno: %d", filepath, errno);
 
         return 0;

data/ext/fast_mmaped_file/globals.h

@@ -8,6 +8,5 @@ extern ID sym_livesum;
 extern ID sym_gauge;
 extern ID sym_pid;
 extern ID sym_samples;
-extern ID sym_key_name;
 
 #endif

data/ext/fast_mmaped_file/mmap.h

@@ -1,6 +1,7 @@
 #ifndef MMAP_H
 #define MMAP_H
 
+#include <unistd.h>
 #include <ruby.h>
 
 #define MM_MODIFY 1
@@ -16,18 +17,7 @@
 #define MM_TMP (1 << 5)
 
 #ifndef MMAP_RETTYPE
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 199309
-#endif /* !_POSIX_C_SOURCE */
-#ifdef _POSIX_VERSION
-#if _POSIX_VERSION >= 199309
-#define MMAP_RETTYPE void *
-#endif /* _POSIX_VERSION >= 199309 */
-#endif /* _POSIX_VERSION */
-#endif /* !MMAP_RETTYPE */
-
-#ifndef MMAP_RETTYPE
-#define MMAP_RETTYPE caddr_t
+#define MMAP_RETTYPE void * 
 #endif
 
 typedef struct {

data/ext/fast_mmaped_file/rendering.c

@@ -46,6 +46,13 @@ void append_entry(VALUE string, const entry_struct *entry){
                 rb_str_cat(string, ",", 1);
             }
         }
+
+        if (is_pid_significant(entry)){
+            rb_str_cat(string, ",pid=\"", 6);
+            rb_str_append(string, entry->pid);
+            rb_str_cat(string, "\"", 1);
+        }
+
         rb_str_cat(string, "}", 1);
     }
 

data/ext/fast_mmaped_file/value_access.c

@@ -1,3 +1,6 @@
+#include <ruby.h>
+#include <ruby/intern.h>
+
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -16,7 +19,7 @@ int open_and_extend_file(mm_ipc *i_mm, size_t len) {
 
     if (lseek(fd, len - i_mm->t->len - 1, SEEK_END) == -1) {
         close(fd);
-        rb_raise(rb_eIOError, "Can't lseek %lu", len - i_mm->t->len - 1);
+        rb_raise(rb_eIOError, "Can't lseek %zu", len - i_mm->t->len - 1);
     }
 
     if (write(fd, "\000", 1) != 1) {
@@ -124,8 +127,8 @@ VALUE method_add_entry(VALUE self, VALUE positions, VALUE key, VALUE value) {
         rb_error_frozen("mmap");
     }
 
-    if (RSTRING_LEN(key) > UINT32_MAX) {
-        rb_raise(rb_eArgError, "string length gt %u", UINT32_MAX);
+    if (RSTRING_LEN(key) > INT32_MAX) {
+        rb_raise(rb_eArgError, "string length gt %d", INT32_MAX);
     }
 
     uint32_t key_length = (uint32_t)RSTRING_LEN(key);
@@ -150,11 +153,11 @@ VALUE method_get_double(VALUE self, VALUE index) {
     size_t idx = NUM2UINT(index);
 
     if ((i_mm->t->real + sizeof(double)) <= idx) {
-        rb_raise(rb_eIndexError, "index %ld out of string", idx);
+        rb_raise(rb_eIndexError, "index %zu out of string", idx);
     }
 
     double tmp;
 
     memcpy(&tmp, (char *)i_mm->t->addr + idx, sizeof(double));
     return DBL2NUM(tmp);
-}
+}

data/ext/fast_mmaped_file/value_access.h

@@ -1,8 +1,6 @@
 #ifndef VALUE_ACCESS_H
 #define VALUE_ACCESS_H
 
-#include <ruby.h>
-
 VALUE method_load_used(VALUE self);
 
 VALUE method_save_used(VALUE self, VALUE value);

data/lib/prometheus/client/version.rb

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

data/lib/prometheus/client/version.rb.orig

@@ -1,9 +1,9 @@
 module Prometheus
   module Client
 <<<<<<< HEAD
-    VERSION = '0.7.0.beta36'.freeze
+    VERSION = '0.7.0.beta40'.freeze
 =======
-    VERSION = '0.7.0.beta32'.freeze
->>>>>>> Fix compilation on GCC 4.9
+    VERSION = '0.7.0.beta38'.freeze
+>>>>>>> upstream/master
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta40
+  version: 0.7.0.beta41
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -105,7 +105,6 @@ files:
 - README.md
 - ext/fast_mmaped_file/extconf.rb
 - ext/fast_mmaped_file/fast_mmaped_file.c
-- ext/fast_mmaped_file/file_aggregation.c
 - ext/fast_mmaped_file/file_format.h
 - ext/fast_mmaped_file/file_parsing.c
 - ext/fast_mmaped_file/file_parsing.h