prometheus-client-mmap 0.9.10 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7b6fe48f2d5019181dcc236a5a8d187ea5aeb7e7d8e2acc8d31bfb6bc62207
-  data.tar.gz: 6231f6c5e44fc07b7084d4f9e816c9eb97916bb00235829349b9903af4c9621b
+  metadata.gz: 7f1ee3b09ba34253c97cbc24ea1423e5a9974e679fd4a0d63c596aae583440bd
+  data.tar.gz: 2e2712829e334fb9d4a52658247f0e3a33b553ef40c7b9d67e008ff66d035661
 SHA512:
-  metadata.gz: 48cc3fa10e0879d90340349ccc118dbd4b3eca40ee8e513f5600f58354f089c4ac7e8598ede6a696b24aafca51f75baeb8e2f4b1967a42b32dcacb2d408c83bb
-  data.tar.gz: 2a01473c292535c2931efdbb1b5e958389d71521cb55f25edddef6f097eddec7d5cac08e0e4bab3b85ee5757626f67930312fefce99f24d7184541a1ab07b559
+  metadata.gz: aa63176edd44f14614d1546fc9d3c467177e061182dc36594c3c23bcb074a6470e7b441bd36a72538ad41866d00741c7afd580a2131500eb72954e3c3458f084
+  data.tar.gz: 8962a9d8d7df151b4645234291fb1a2f75f1caf9a99a9d5d755c7078cbb5705850864084cd0af5330dd2b346a5d2451000035a5e88798d5391bc06f37e26bab2

data/ext/fast_mmaped_file/mmap.c

@@ -170,6 +170,35 @@ VALUE mm_s_alloc(VALUE obj) {
     return res;
 }
 
+size_t next_page_boundary(size_t value) {
+    size_t page_size = sysconf(_SC_PAGESIZE);
+
+    while (page_size < value) {
+        page_size *= 2;
+    }
+
+    return page_size;
+}
+
+/* Reference implementations:
+ * mozilla: https://hg.mozilla.org/mozilla-central/file/3d846420a907/xpcom/glue/FileUtils.cpp#l71
+ * glibc: https://github.com/lattera/glibc/blob/master/sysdeps/posix/posix_fallocate.c
+ */
+int reserve_mmap_file_bytes(int fd, size_t size) {
+#if __linux__
+    /* From https://stackoverflow.com/a/22820221: The difference with
+     * ftruncate(2) is that (on file systems supporting it, e.g. Ext4)
+     * disk space is indeed reserved by posix_fallocate but ftruncate
+     * extends the file by adding holes (and without reserving disk
+     * space). */
+    return posix_fallocate(fd, 0, size);
+#else
+    /* We simplify the reference implemnetations since we generally
+     * don't need to reserve more than a page size. */
+    return ftruncate(fd, size);
+#endif
+}
+
 VALUE mm_init(VALUE obj, VALUE fname) {
     struct stat st;
     int fd, smode = 0, pmode = 0, vscope, perm, init;
@@ -206,6 +235,7 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     }
 
     if (fstat(fd, &st) == -1) {
+        close(fd);
         rb_raise(rb_eArgError, "Can't stat %s", path);
     }
     size = st.st_size;
@@ -215,17 +245,21 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     offset = 0;
     init = 0;
 
-    if (size == 0 && (smode & O_RDWR)) {
-        if (lseek(fd, INITIAL_SIZE - 1, SEEK_END) == -1) {
-            rb_raise(rb_eIOError, "Can't lseek %zu", INITIAL_SIZE - 1);
-        }
-        if (write(fd, "\000", 1) != 1) {
-            rb_raise(rb_eIOError, "Can't extend %s", path);
-        }
+    if (size == 0) {
         init = 1;
         size = INITIAL_SIZE;
     }
 
+    /* We need to ensure the underlying file descriptor is at least a page size.
+     * Otherwise, we could get a SIGBUS error if mmap() attempts to read or write
+     * past the file. */
+    size_t reserve_size = next_page_boundary(size);
+
+    if (reserve_mmap_file_bytes(fd, reserve_size) != 0) {
+        close(fd);
+        rb_raise(rb_eIOError, "Can't reserve %zu bytes for memory-mapped file", reserve_size);
+    }
+
     addr = mmap(0, size, pmode, vscope, fd, offset);
 
     if (addr == MAP_FAILED || !addr) {

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.9.10'.freeze
+    VERSION = '0.10.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.10.0
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzbert