summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-04-28 04:40:00 -0400
committerNiels de Vos <ndevos@redhat.com>2015-05-09 14:27:36 -0700
commita3af10a801a40fe990ee5db63c6dd6cb97713e4c (patch)
tree937a8588aeea9465fa56da53950664efb2b34bf1 /api
parentec055e1e6908ac829efc103deb548cc0a774cf23 (diff)
core: use reference counting for mem_acct structures
When freeing memory, our memory-accounting code expects to be able to dereference from the (previously) allocated block to its owning translator. However, as we have already found once in option validation and twice in logging, that translator might itself have been freed and the dereference attempt causes on of our daemons to crash with SIGSEGV. This patch attempts to fix that as follows: * We no longer embed a struct mem_acct directly in a struct xlator, but instead allocate it separately. * Allocated memory blocks now contain a pointer to the mem_acct instead of the xlator. * The mem_acct structure contains a reference count, manipulated in both the normal and translator allocate/free code using atomic increments and decrements. * Because it's now a separate structure, we can defer freeing the mem_acct until its reference count reaches zero (either way). * Some unit tests were disabled, because they embedded their own copies of the implementation for what they were supposedly testing. Life's too short to spend time fixing tests that seem designed to impede progress by requiring a certain implementation as well as behavior. Change-Id: Id929b11387927136f78626901729296b6c0d0fd7 BUG: 1219026 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/10417 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/10723 Tested-by: NetBSD Build System
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c
index d6a6fe9..897d3ea 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -965,7 +965,7 @@ glusterfs_ctx_destroy (glusterfs_ctx_t *ctx)
return 0;
/* For all the graphs, crawl through the xlator_t structs and free
- * all its members except for the mem_acct.rec member,
+ * all its members except for the mem_acct member,
* as GF_FREE will be referencing it.
*/
list_for_each_entry_safe (trav_graph, tmp, &ctx->graphs, list) {