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: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: lib by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 21 Nov 2005 19:46:30 -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/tengine
Modified Files:
actions.c tengine.c
Log Message:
Make sure we never send the same command more than once
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- actions.c 2 Nov 2005 13:27:06 -0000 1.3
+++ actions.c 22 Nov 2005 02:46:30 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.3 2005/11/02 13:27:06 andrew Exp $ */
+/* $Id: actions.c,v 1.4 2005/11/22 02:46:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -253,7 +253,12 @@
const char *id = NULL;
id = crm_element_value(action->xml, XML_ATTR_ID);
-
+ CRM_DEV_ASSERT(action->invoked == FALSE);
+ if(crm_assert_failed) {
+ return FALSE;
+ }
+
+ action->invoked = TRUE;
if(id == NULL) {
/* error */
te_log_action(LOG_ERR, "Corrupted command %s: no ID",
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- tengine.c 31 Oct 2005 09:37:17 -0000 1.106
+++ tengine.c 22 Nov 2005 02:46:30 -0000 1.107
@@ -1,4 +1,4 @@
-/* $Id: tengine.c,v 1.106 2005/10/31 09:37:17 andrew Exp $ */
+/* $Id: tengine.c,v 1.107 2005/11/22 02:46:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -226,7 +226,6 @@
/* allow some leeway */
int tmp_time = 2 * action->timeout;
gboolean passed = FALSE;
- action->invoked = TRUE;
/* Invoke the action and start the timer */
passed = initiate_action(action);
------------------------------
Message: 2
Date: Mon, 21 Nov 2005 19:48:57 -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/clplumbing
Modified Files:
realtime.c
Log Message:
Darwin advertises _POSIX_MEMLOCK and defines mlockall()
but doesn't implement it :(
This seems the sanest approach and will take advantage of mlockall() if
and when Apple gets around to implementing it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/realtime.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- realtime.c 9 Aug 2005 20:42:13 -0000 1.29
+++ realtime.c 22 Nov 2005 02:48:57 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: realtime.c,v 1.29 2005/08/09 20:42:13 gshi Exp $ */
+/* $Id: realtime.c,v 1.30 2005/11/22 02:48:57 andrew Exp $ */
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -40,6 +40,7 @@
#include <clplumbing/realtime.h>
#include <clplumbing/uids.h>
#include <time.h>
+#include <errno.h>
static gboolean cl_realtimepermitted = TRUE;
static void cl_rtmalloc_setup(void);
@@ -179,7 +180,7 @@
}
#endif
-#if defined _POSIX_MEMLOCK /* && !defined(ON_DARWIN) Wrong way to do this --
add an autoconf test ...*/
+#if defined _POSIX_MEMLOCK
# ifdef RLIMIT_MEMLOCK
# define THRESHOLD(lim) (((lim))/2)
{
@@ -209,10 +210,16 @@
}
}
# endif /*RLIMIT_MEMLOCK*/
- if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
- cl_perror("Unable to lock pid %d in memory", (int) getpid());
- }else{
+ if (mlockall(MCL_CURRENT|MCL_FUTURE) >= 0) {
cl_log(LOG_INFO, "pid %d locked in memory.", (int) getpid());
+
+ } else if(errno == ENOSYS) {
+ const char *err = strerror(errno);
+ cl_log(LOG_WARNING, "Unable to lock pid %d in memory: %s",
+ (int) getpid(), err);
+
+ } else {
+ cl_perror("Unable to lock pid %d in memory", (int) getpid());
}
#endif
}
------------------------------
Message: 3
Date: Mon, 21 Nov 2005 19:53:25 -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:
Due to the way action parameters are stored in the status section
(name=value), valid "value"s are being used as "name"s thus the
character resttrictions need to be relaxed.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- xml.c 8 Nov 2005 06:27:38 -0000 1.46
+++ xml.c 22 Nov 2005 02:53:24 -0000 1.47
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.46 2005/11/08 06:27:38 gshi Exp $ */
+/* $Id: xml.c,v 1.47 2005/11/22 02:53:24 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
+#include <ctype.h>
#include <clplumbing/ipc.h>
#include <clplumbing/cl_log.h>
@@ -1099,10 +1100,11 @@
default:
if('a' <= ch && ch <= 'z') {
} else if('A' <= ch && ch <= 'Z') {
+ } else if(isdigit(ch)) {
} else if(ch == '_') {
} else if(ch == '-') {
} else {
- error = "bad character, not in
[a-zA-Z_-]";
+ error = "bad character, not in
[a-zA-Z0-9_-]";
}
break;
}
------------------------------
Message: 4
Date: Tue, 22 Nov 2005 10:27:03 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
Tag: STABLE_1_2
ipctest.c
Log Message:
Updated some header includes to match the R2 header includes - to hopefully
make a 'getws'
build error go away.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipctest.c,v
retrieving revision 1.22.2.6
retrieving revision 1.22.2.7
diff -u -3 -r1.22.2.6 -r1.22.2.7
--- ipctest.c 17 Aug 2005 08:27:58 -0000 1.22.2.6
+++ ipctest.c 22 Nov 2005 17:27:02 -0000 1.22.2.7
@@ -1,9 +1,13 @@
-/* $Id: ipctest.c,v 1.22.2.6 2005/08/17 08:27:58 sunjd Exp $ */
+/* $Id: ipctest.c,v 1.22.2.7 2005/11/22 17:27:02 alan Exp $ */
+#undef _GNU_SOURCE /* in case it was defined on the command line */
+#define _GNU_SOURCE
+#include <portability.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
#include <string.h>
#include <errno.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <stdio.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <glib.h>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 64
********************************************
