This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - rgmanager: Remove references to malloc_dump_table
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 5 May 2009 17:08:26 +0000 (UTC)
- Subject: cluster: STABLE3 - rgmanager: Remove references to malloc_dump_table
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7c62f530559cf7b7c091baefc0a77d5e7a13cc43
Commit: 7c62f530559cf7b7c091baefc0a77d5e7a13cc43
Parent: 77876d0128b7c8d8d40ef4eb0b4c9f0ed306ba4f
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue May 5 12:46:32 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue May 5 13:08:09 2009 -0400
rgmanager: Remove references to malloc_dump_table
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/daemons/dtest.c | 9 +--------
rgmanager/src/daemons/main.c | 6 ------
rgmanager/src/daemons/restree.c | 7 -------
3 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/rgmanager/src/daemons/dtest.c b/rgmanager/src/daemons/dtest.c
index 4e8ad9a..d554939 100644
--- a/rgmanager/src/daemons/dtest.c
+++ b/rgmanager/src/daemons/dtest.c
@@ -26,7 +26,6 @@
#endif
void malloc_stats(void);
-void malloc_dump_table(void);
resource_rule_t *rules = NULL;
@@ -679,11 +678,7 @@ dep_check_operation(char *res, int operation, int target,
continue;
}
- if (!strcmp(curr, "table")) {
- malloc_dump_table();
- } else {
- printf("Unknown command '%s %s'\n", tmp , curr);
- }
+ printf("Unknown command '%s %s'\n", tmp , curr);
} else {
printf("Unknown command '%s'\n", curr);
}
@@ -808,8 +803,6 @@ out:
destroy_resources(&resources);
deconstruct_domains(&domains);
destroy_resource_rules(&rules);
-
- malloc_dump_table();
return ret;
}
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index fc1a6ec..f800ab0 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -53,7 +53,6 @@ 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)
@@ -690,7 +689,6 @@ 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);
}
@@ -822,9 +820,6 @@ statedump(int __attribute__ ((unused)) sig)
}
-void malloc_dump_table(FILE *, size_t, size_t);
-
-
/*
* Configure logging based on data in cluster.conf
*/
@@ -1132,7 +1127,6 @@ out:
cman_finish(clu);
close_logging();
- /*malloc_dump_table(); */ /* Only works if alloc.c us used */
/*malloc_stats();*/
daemon_cleanup();
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index c80128a..5ab4b3d 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -15,10 +15,6 @@
#include <logging.h>
#include <assert.h>
-#ifdef INTERNAL_MALLOC
-void malloc_zap_mutex(void);
-#endif
-
/* XXX from resrules.c */
int store_childtype(resource_child_t **childp, char *name, int start,
int stop, int forbid, int flags);
@@ -388,9 +384,6 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth)
if (!childpid) {
/* Child */
-#ifdef INTERNAL_MALLOC
- malloc_zap_mutex();
-#endif
#if 0
printf("Exec of script %s, action %s type %s\n",
res->r_rule->rr_agent, agent_op_str(op),