1 files changed, 26 insertions, 9 deletions
diff --git a/database/engine/metric.h b/database/engine/metric.h
index 82aff903a..5cb5b045e 100644
--- a/database/engine/metric.h
+++ b/database/engine/metric.h
@@ -3,7 +3,7 @@
 
 #include "../rrd.h"
 
-#define MRG_PARTITIONS 10
+#define MRG_CACHE_LINE_PADDING(x) uint8_t padding##x[64]
 
 typedef struct metric METRIC;
 typedef struct mrg MRG;
@@ -17,13 +17,10 @@ typedef struct mrg_entry {
 } MRG_ENTRY;
 
 struct mrg_statistics {
-    size_t entries;
-    size_t entries_referenced;
-    size_t entries_with_retention;
-
-    size_t size;                // total memory used, with indexing
+    // --- non-atomic --- under a write lock
 
-    size_t current_references;
+    size_t entries;
+    size_t size;    // total memory used, with indexing
 
     size_t additions;
     size_t additions_duplicate;
@@ -32,14 +29,28 @@ struct mrg_statistics {
     size_t delete_having_retention_or_referenced;
     size_t delete_misses;
 
+    MRG_CACHE_LINE_PADDING(0);
+
+    // --- atomic --- multiple readers / writers
+
+    size_t entries_referenced;
+
+    MRG_CACHE_LINE_PADDING(1);
+    size_t entries_with_retention;
+
+    MRG_CACHE_LINE_PADDING(2);
+    size_t current_references;
+
+    MRG_CACHE_LINE_PADDING(3);
     size_t search_hits;
     size_t search_misses;
 
+    MRG_CACHE_LINE_PADDING(4);
     size_t writers;
     size_t writers_conflicts;
 };
 
-MRG *mrg_create(void);
+MRG *mrg_create(ssize_t partitions);
 void mrg_destroy(MRG *mrg);
 
 METRIC *mrg_metric_dup(MRG *mrg, METRIC *metric);
@@ -72,8 +83,14 @@ bool mrg_metric_zero_disk_retention(MRG *mrg __maybe_unused, METRIC *metric);
 bool mrg_metric_set_writer(MRG *mrg, METRIC *metric);
 bool mrg_metric_clear_writer(MRG *mrg, METRIC *metric);
 
-struct mrg_statistics mrg_get_statistics(MRG *mrg);
+void mrg_get_statistics(MRG *mrg, struct mrg_statistics *s);
 size_t mrg_aral_structures(void);
 size_t mrg_aral_overhead(void);
 
+
+void mrg_update_metric_retention_and_granularity_by_uuid(
+        MRG *mrg, Word_t section, uuid_t *uuid,
+        time_t first_time_s, time_t last_time_s,
+        time_t update_every_s, time_t now_s);
+
 #endif // DBENGINE_METRIC_H