Send Linux-ha-cvs mailing list submissions to
[email protected]
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
([email protected])
2. Linux-HA CVS: include by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 01:33:14 -0700 (MST)
From: [email protected]
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:
primatives.c
Log Message:
Non "dev" builds don't need to call cl_is_allocated() and crm_validate_data().
They are very expensive and will have caught everything they're going to
catch in our testing.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/primatives.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- primatives.c 26 Jan 2006 12:05:14 -0000 1.30
+++ primatives.c 2 Feb 2006 08:33:14 -0000 1.31
@@ -1,4 +1,4 @@
-/* $Id: primatives.c,v 1.30 2006/01/26 12:05:14 andrew Exp $ */
+/* $Id: primatives.c,v 1.31 2006/02/02 08:33:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -471,11 +471,6 @@
copy_in_properties(target, update);
- CRM_DEV_ASSERT(cl_is_allocated(object_name));
- if(object_id != NULL) {
- CRM_DEV_ASSERT(cl_is_allocated(object_id));
- }
-
crm_debug_3("Processing children of <%s id=%s>",
crm_str(object_name), crm_str(object_id));
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 01:33:15 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
crm.h
Log Message:
Non "dev" builds don't need to call cl_is_allocated() and crm_validate_data().
They are very expensive and will have caught everything they're going to
catch in our testing.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- crm.h 10 Jan 2006 13:46:41 -0000 1.85
+++ crm.h 2 Feb 2006 08:33:14 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.85 2006/01/10 13:46:41 andrew Exp $ */
+/* $Id: crm.h,v 1.86 2006/02/02 08:33:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -276,7 +276,6 @@
} \
}
# define crm_free(x) if(x) { free(x); x=NULL; }
-# define crm_is_allocated(obj) obj?TRUE:FALSE
#else
# if CRM_DEV_BUILD
# define crm_malloc0(new_obj,length)
\
@@ -294,7 +293,12 @@
} \
memset(new_obj, 0, length); \
}
-#else
+# define crm_free(x) if(x) { \
+ CRM_ASSERT(cl_is_allocated(x) == 1); \
+ cl_free(x); \
+ x=NULL; \
+ }
+# else
# define crm_malloc0(new_obj,length)
\
{ \
new_obj = cl_malloc(length); \
@@ -304,13 +308,11 @@
} \
memset(new_obj, 0, length); \
}
-# endif
-# define crm_free(x) if(x) { \
- CRM_ASSERT(cl_is_allocated(x) == 1); \
+# define crm_free(x) if(x) { \
cl_free(x); \
x=NULL; \
}
-# define crm_is_allocated(obj) cl_is_allocated(obj)
+# endif
#endif
#define crm_msg_del(msg) if(msg != NULL) { ha_msg_del(msg); msg = NULL; }
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 01:33:15 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Non "dev" builds don't need to call cl_is_allocated() and crm_validate_data().
They are very expensive and will have caught everything they're going to
catch in our testing.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- xml.c 26 Jan 2006 12:05:14 -0000 1.53
+++ xml.c 2 Feb 2006 08:33:14 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.53 2006/01/26 12:05:14 andrew Exp $ */
+/* $Id: xml.c,v 1.54 2006/02/02 08:33:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -290,7 +290,6 @@
crm_validate_data(node);
ha_msg_mod(node, name, value);
new_value = crm_element_value(node, name);
- CRM_DEV_ASSERT(cl_is_allocated(new_value));
return new_value;
}
@@ -934,12 +933,12 @@
#else
int lpc = 0;
CRM_ASSERT(xml_root != NULL);
- CRM_ASSERT(crm_is_allocated(xml_root) == 1);
+ CRM_ASSERT(cl_is_allocated(xml_root) == 1);
CRM_ASSERT(xml_root->nfields < 500);
for (lpc = 0; lpc < xml_root->nfields; lpc++) {
void *child = xml_root->values[lpc];
- CRM_ASSERT(crm_is_allocated(xml_root->names[lpc]) == 1);
+ CRM_ASSERT(cl_is_allocated(xml_root->names[lpc]) == 1);
if(child == NULL) {
@@ -948,7 +947,7 @@
crm_validate_data(child);
} else if(xml_root->types[lpc] == FT_STRING) {
- CRM_ASSERT(crm_is_allocated(child) == 1);
+ CRM_ASSERT(cl_is_allocated(child) == 1);
/* } else { */
/* CRM_DEV_ASSERT(FALSE); */
}
@@ -975,9 +974,9 @@
const char *value = NULL;
crm_validate_data(data);
value = cl_get_string(data, name);
- if(value != NULL) {
- CRM_DEV_ASSERT(crm_is_allocated(value) == 1);
- }
+#if XML_PARANOIA_CHECKS
+ CRM_DEV_ASSERT(value == NULL || cl_is_allocated(value) == 1);
+#endif
return value;
}
@@ -988,10 +987,9 @@
char *value_copy = NULL;
crm_validate_data(data);
value = cl_get_string(data, name);
- if(value != NULL) {
- CRM_DEV_ASSERT(crm_is_allocated(value) == 1);
- }
- CRM_DEV_ASSERT(value != NULL);
+#if XML_PARANOIA_CHECKS
+ CRM_DEV_ASSERT(cl_is_allocated(value) == 1);
+#endif
if(value != NULL) {
value_copy = crm_strdup(value);
}
@@ -1358,7 +1356,6 @@
crm_debug_4("Processing tag %s", tag_name);
new_obj = ha_msg_new(1);
- CRM_DEV_ASSERT(crm_is_allocated(new_obj) == 1);
ha_msg_add(new_obj, F_XML_TAGNAME, tag_name);
lpc += len;
@@ -1392,7 +1389,6 @@
if(child == NULL) {
error = "error parsing
child";
} else {
-
CRM_DEV_ASSERT(crm_is_allocated(child) == 1);
ha_msg_addstruct_compress(
new_obj,
crm_element_name(child), child);
@@ -1489,9 +1485,6 @@
(*offset) += lpc;
}
- if(new_obj != NULL) {
- CRM_DEV_ASSERT(crm_is_allocated(new_obj) == 1);
- }
return new_obj;
}
@@ -1902,11 +1895,6 @@
}
);
- CRM_DEV_ASSERT(cl_is_allocated(object_name));
- if(object_id != NULL) {
- CRM_DEV_ASSERT(cl_is_allocated(object_id));
- }
-
crm_debug_3("Processing children of <%s id=%s>",
crm_str(object_name), crm_str(object_id));
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 01:55:31 -0700 (MST)
From: [email protected]
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:
fsa.c
Log Message:
A_READCONFIG often takes a while... it makes a syncronous call to the CIB.
But thats ok because we cant do anything until it starts anyway.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- fsa.c 17 Jan 2006 13:24:24 -0000 1.134
+++ fsa.c 2 Feb 2006 08:55:31 -0000 1.135
@@ -166,6 +166,9 @@
} else if(an_action & A_CIB_START) {
do_time_check = FALSE;
+
+ } else if(an_action & A_READCONFIG) {
+ do_time_check = FALSE;
}
fsa_actions = clear_bit(fsa_actions, an_action);
@@ -249,6 +252,8 @@
fsa_state2string(fsa_state),
fsa_cause2string(fsa_data->fsa_cause),
fsa_data->origin);
+/* } else if(fsa_actions == A_EXIT_0) { */
+/* crm_log_level = LOG_DEBUG_2; */
}
#ifdef FSA_TRACE
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 4
*******************************************
