Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 6 Jul 2006 07:30:25 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
cib.c
Log Message:
More memory usage changes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- cib.c 20 Apr 2006 11:03:34 -0000 1.51
+++ cib.c 6 Jul 2006 13:30:24 -0000 1.52
@@ -119,14 +119,7 @@
do_cib_replaced(const char *event, HA_Message *msg)
{
crm_debug("Updating the CIB after a replace");
-#ifdef BUG
- /* enabling this seems to cause delays (in the order of 3 minutes)
- * in messages being received by the node that runs this
- *
- * no idea why :(
- */
populate_cib_nodes(fsa_cluster_conn, FALSE);
-#endif
do_update_cib_nodes(AM_I_DC, __FUNCTION__);
if(AM_I_DC) {
/* start the join process again so we get everyone's LRM status
*/
------------------------------
Message: 2
Date: Thu, 6 Jul 2006 10:48:39 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
xml_diff.c
Log Message:
memory checking for xml diffs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/xml_diff.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- xml_diff.c 7 Jun 2006 12:46:57 -0000 1.9
+++ xml_diff.c 6 Jul 2006 16:48:38 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: xml_diff.c,v 1.9 2006/06/07 12:46:57 andrew Exp $ */
+/* $Id: xml_diff.c,v 1.10 2006/07/06 16:48:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -71,6 +71,9 @@
crm_data_t *output = NULL;
const char *xml_file_1 = NULL;
const char *xml_file_2 = NULL;
+
+ long new_bytes = 0, new_allocs = 0, new_frees = 0;
+ long old_bytes = 0, old_allocs = 0, old_frees = 0;
#ifdef HAVE_GETOPT_H
int option_index = 0;
@@ -203,15 +206,18 @@
CRM_ASSERT(object_1 != NULL);
CRM_ASSERT(object_2 != NULL);
- if(as_cib == FALSE) {
- if(apply) {
+ crm_zero_mem_stats(NULL);
+
+ if(apply) {
+ if(as_cib == FALSE) {
apply_xml_diff(object_1, object_2, &output);
} else {
- output = diff_xml_object(object_1, object_2, filter);
+ apply_cib_diff(object_1, object_2, &output);
}
+
} else {
- if(apply) {
- apply_cib_diff(object_1, object_2, &output);
+ if(as_cib == FALSE) {
+ output = diff_xml_object(object_1, object_2, filter);
} else {
output = diff_cib_object(object_1, object_2, filter);
}
@@ -223,11 +229,15 @@
crm_free(buffer);
}
+ crm_xml_nbytes(output, &new_bytes, &new_allocs, &new_frees);
+ crm_adjust_mem_stats(crm_running_stats, new_bytes - old_bytes,
+ new_allocs - old_allocs, new_frees - old_frees);
+
+ crm_mem_stats(NULL);
+
free_xml(object_1);
free_xml(object_2);
free_xml(output);
-
- crm_mem_stats(NULL);
if(apply == FALSE && output != NULL) {
return 1;
------------------------------
Message: 3
Date: Thu, 6 Jul 2006 10:52:16 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/cib
Modified Files:
callbacks.c main.c messages.c
Log Message:
memory allocation tweaks
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- callbacks.c 6 Jul 2006 13:30:24 -0000 1.131
+++ callbacks.c 6 Jul 2006 16:52:15 -0000 1.132
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.131 2006/07/06 13:30:24 andrew Exp $ */
+/* $Id: callbacks.c,v 1.132 2006/07/06 16:52:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1583,7 +1583,7 @@
hb_cluster->llc_ops->rcvmsg(hb_cluster, 0);
}
- crm_diff_mem_stats(LOG_WARNING, LOG_WARNING, __PRETTY_FUNCTION__, NULL,
&saved_stats);
+ crm_diff_mem_stats(LOG_DEBUG, LOG_DEBUG, __PRETTY_FUNCTION__, NULL,
&saved_stats);
return (channel->ch_status == IPC_CONNECT);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- main.c 6 Jul 2006 13:30:24 -0000 1.48
+++ main.c 6 Jul 2006 16:52:16 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.48 2006/07/06 13:30:24 andrew Exp $ */
+/* $Id: main.c,v 1.49 2006/07/06 16:52:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -170,11 +170,10 @@
crm_zero_mem_stats(crm_running_stats);
}
crm_save_mem_stats(__PRETTY_FUNCTION__, &saved_stats);
- if(crm_diff_mem_stats(LOG_ERR, LOG_ERR, __PRETTY_FUNCTION__, NULL,
crm_running_stats)) {
- crm_err("Total alloc's %ld for %ld bytes",
- crm_running_stats->numalloc,
crm_running_stats->nbytes_alloc);
- }
+ crm_diff_mem_stats(LOG_ERR, LOG_ERR, __PRETTY_FUNCTION__, NULL,
crm_running_stats);
*crm_running_stats = saved_stats;
+ crm_info("Total alloc's %ld for %ld bytes",
+ crm_running_stats->numalloc, crm_running_stats->nbytes_alloc);
if(cib_stat_interval_ms == 0) {
cib_stat_interval_ms = crm_get_msec(cib_stat_interval);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- messages.c 6 Jul 2006 10:55:09 -0000 1.85
+++ messages.c 6 Jul 2006 16:52:16 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.85 2006/07/06 10:55:09 andrew Exp $ */
+/* $Id: messages.c,v 1.86 2006/07/06 16:52:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -430,10 +430,13 @@
reason = "Failed application of an update diff";
if(options & cib_force_diff && cib_is_master == FALSE) {
log_level = LOG_INFO;
- reason = "Failed application of a global
update. Requesting full refresh.";
+ reason = "Failed application of a global
update."
+ " Requesting full refresh.";
do_resync = TRUE;
+
} else if(options & cib_force_diff) {
- reason = "Failed application of a global
update. Not requesting full refresh.";
+ reason = "Failed application of a global
update."
+ " Not requesting full refresh.";
}
}
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 28
********************************************
