cluster: STABLE3 - Revert "rgmanager: Remove references to malloc_dump_table"
Lon Hohberger
lon@fedoraproject.org
Tue May 5 17:08:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77876d0128b7c8d8d40ef4eb0b4c9f0ed306ba4f
Commit: 77876d0128b7c8d8d40ef4eb0b4c9f0ed306ba4f
Parent: daff9e400a9bbe73433c6761083d19c1c5e38d95
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue May 5 13:05:53 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue May 5 13:05:53 2009 -0400
Revert "rgmanager: Remove references to malloc_dump_table"
This reverts commit daff9e400a9bbe73433c6761083d19c1c5e38d95.
Missing patch.
---
rgmanager/src/daemons/dtest.c | 7 ++++++-
rgmanager/src/daemons/main.c | 6 ++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/daemons/dtest.c b/rgmanager/src/daemons/dtest.c
index ce484ca..4e8ad9a 100644
--- a/rgmanager/src/daemons/dtest.c
+++ b/rgmanager/src/daemons/dtest.c
@@ -26,6 +26,7 @@
#endif
void malloc_stats(void);
+void malloc_dump_table(void);
resource_rule_t *rules = NULL;
@@ -678,7 +679,11 @@ dep_check_operation(char *res, int operation, int target,
continue;
}
- printf("Unknown command '%s %s'\n", tmp , curr);
+ if (!strcmp(curr, "table")) {
+ malloc_dump_table();
+ } else {
+ printf("Unknown command '%s %s'\n", tmp , curr);
+ }
} else {
printf("Unknown command '%s'\n", curr);
}
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index f800ab0..fc1a6ec 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -53,6 +53,7 @@ static char *rgmanager_lsname = "rgmanager"; /* XXX default */
static int status_poll_interval = DEFAULT_CHECK_INTERVAL;
int next_node_id(cluster_member_list_t *membership, int me);
+void malloc_dump_table(FILE *, size_t, size_t);
void
segfault(int __attribute__ ((unused)) sig)
@@ -689,6 +690,7 @@ dump_internal_state(char *loc)
dump_thread_states(fp);
#endif
dump_cluster_ctx(fp);
+ //malloc_dump_table(fp, 1, 16384); /* Only works if alloc.c us used */
fclose(fp);
}
@@ -820,6 +822,9 @@ statedump(int __attribute__ ((unused)) sig)
}
+void malloc_dump_table(FILE *, size_t, size_t);
+
+
/*
* Configure logging based on data in cluster.conf
*/
@@ -1127,6 +1132,7 @@ out:
cman_finish(clu);
close_logging();
+ /*malloc_dump_table(); */ /* Only works if alloc.c us used */
/*malloc_stats();*/
daemon_cleanup();
More information about the Cluster-cvs
mailing list