cluster/afr: Fix memory leak of file-path in self-heal-daemon

        Backport of http://review.gluster.org/4790

Note: Only the part which fixes the memory leak is backported

shd event has path which needs to be freed as part of circular buffer cleanup.
This patch introduces the functionality so that self-heal-daemon can use it.

Change-Id: I3f3823d5587eda2fcb278f0fdb89123a31c9d786
BUG: 1119894
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/8541
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

1 files changed, 25 insertions, 5 deletions

diff --git a/libglusterfs/src/circ-buff.c b/libglusterfs/src/circ-buff.c
index 65bbd5d45c7..28b42d52973 100644
--- a/libglusterfs/src/circ-buff.c
+++ b/libglusterfs/src/circ-buff.c
@@ -10,6 +10,17 @@
 
 #include "circ-buff.h"
 
+void
+cb_destroy_data (circular_buffer_t *cb,
+                 void (*destroy_buffer_data) (void *data))
+{
+        if (destroy_buffer_data)
+                destroy_buffer_data (cb->data);
+        GF_FREE (cb->data);
+        return;
+}
+
+
 /* hold lock while calling this function */
 int
 __cb_add_entry_buffer (buffer_t *buffer, void *item)
@@ -29,7 +40,8 @@ __cb_add_entry_buffer (buffer_t *buffer, void *item)
                         if (buffer->cb[buffer->w_index]) {
                                 ptr = buffer->cb[buffer->w_index];
                                 if (ptr->data) {
-                                        GF_FREE (ptr->data);
+                                        cb_destroy_data (ptr,
+                                                   buffer->destroy_buffer_data);
                                         ptr->data = NULL;
                                         GF_FREE (ptr);
                                 }
@@ -118,7 +130,8 @@ cb_buffer_dump (buffer_t *buffer, void *data,
 }
 
 buffer_t *
-cb_buffer_new (size_t buffer_size, gf_boolean_t use_once)
+cb_buffer_new (size_t buffer_size, gf_boolean_t use_once,
+               void (*destroy_buffer_data) (void *data))
 {
         buffer_t    *buffer = NULL;
 
@@ -144,6 +157,7 @@ cb_buffer_new (size_t buffer_size, gf_boolean_t use_once)
         buffer->size_buffer = buffer_size;
         buffer->use_once = use_once;
         buffer->used_len = 0;
+        buffer->destroy_buffer_data = destroy_buffer_data;
         pthread_mutex_init (&buffer->lock, NULL);
 
 out:
@@ -153,12 +167,18 @@ out:
 void
 cb_buffer_destroy (buffer_t *buffer)
 {
-        int i = 0;
-
+        int                     i = 0;
+        circular_buffer_t       *ptr = NULL;
         if (buffer) {
                 if (buffer->cb) {
                         for (i = 0; i < buffer->used_len ; i++) {
-                                GF_FREE (buffer->cb[i]);
+                                ptr = buffer->cb[i];
+                                if (ptr->data) {
+                                        cb_destroy_data (ptr,
+                                                   buffer->destroy_buffer_data);
+                                        ptr->data = NULL;
+                                        GF_FREE (ptr);
+                                }
                         }
                         GF_FREE (buffer->cb);
                 }