Adding upstream version 1.38.0.upstream/1.38.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 29 insertions, 10 deletions

diff --git a/libnetdata/circular_buffer/README.md b/libnetdata/circular_buffer/README.md
index 4482173d7..23980dff3 100644
--- a/libnetdata/circular_buffer/README.md
+++ b/libnetdata/circular_buffer/README.md
@@ -1,6 +1,10 @@
 <!--
-title: "circular_buffer"
+title: "Circular Buffer"
 custom_edit_url: https://github.com/netdata/netdata/edit/master/libnetdata/circular_buffer/README.md
+sidebar_label: "Circular Buffer"
+learn_status: "Published"
+learn_topic_type: "Tasks"
+learn_rel_path: "Developers/libnetdata libraries"
 -->
 
 # Circular Buffer
diff --git a/libnetdata/circular_buffer/circular_buffer.c b/libnetdata/circular_buffer/circular_buffer.c
index c791b420b..b2bded179 100644
--- a/libnetdata/circular_buffer/circular_buffer.c
+++ b/libnetdata/circular_buffer/circular_buffer.c
@@ -1,16 +1,24 @@
 #include "../libnetdata.h"
 
-struct circular_buffer *cbuffer_new(size_t initial, size_t max) {
-    struct circular_buffer *result = mallocz(sizeof(*result));
-    result->size = initial;
-    result->data = mallocz(initial);
-    result->write = 0;
-    result->read = 0;
-    result->max_size = max;
-    return result;
+struct circular_buffer *cbuffer_new(size_t initial, size_t max, size_t *statistics) {
+    struct circular_buffer *buf = mallocz(sizeof(struct circular_buffer));
+    buf->size = initial;
+    buf->data = mallocz(initial);
+    buf->write = 0;
+    buf->read = 0;
+    buf->max_size = max;
+    buf->statistics = statistics;
+
+    if(buf->statistics)
+        __atomic_add_fetch(buf->statistics, sizeof(struct circular_buffer) + buf->size, __ATOMIC_RELAXED);
+
+    return buf;
 }
 
 void cbuffer_free(struct circular_buffer *buf) {
+    if(buf && buf->statistics)
+        __atomic_sub_fetch(buf->statistics, sizeof(struct circular_buffer) + buf->size, __ATOMIC_RELAXED);
+
     freez(buf->data);
     freez(buf);
 }
@@ -19,6 +27,8 @@ static int cbuffer_realloc_unsafe(struct circular_buffer *buf) {
     // Check that we can grow
     if (buf->size >= buf->max_size)
         return 1;
+
+    size_t old_size = buf->size;
     size_t new_size = buf->size * 2;
     if (new_size > buf->max_size)
         new_size = buf->max_size;
@@ -43,6 +53,10 @@ static int cbuffer_realloc_unsafe(struct circular_buffer *buf) {
     freez(buf->data);
     buf->data = new_data;
     buf->size = new_size;
+
+    if(buf->statistics)
+        __atomic_add_fetch(buf->statistics, new_size - old_size, __ATOMIC_RELAXED);
+
     return 0;
 }
 
diff --git a/libnetdata/circular_buffer/circular_buffer.h b/libnetdata/circular_buffer/circular_buffer.h
index 8c42aa807..9d29a84d7 100644
--- a/libnetdata/circular_buffer/circular_buffer.h
+++ b/libnetdata/circular_buffer/circular_buffer.h
@@ -5,10 +5,11 @@
 
 struct circular_buffer {
     size_t size, write, read, max_size;
+    size_t *statistics;
     char *data;
 };
 
-struct circular_buffer *cbuffer_new(size_t initial, size_t max);
+struct circular_buffer *cbuffer_new(size_t initial, size_t max, size_t *statistics);
 void cbuffer_free(struct circular_buffer *buf);
 int cbuffer_add_unsafe(struct circular_buffer *buf, const char *d, size_t d_len);
 void cbuffer_remove_unsafe(struct circular_buffer *buf, size_t num);