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: lib by alan from ([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by alan from ([email protected])
4. Linux-HA CVS: lib by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 08:58:00 -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:
ipcsocket.c
Log Message:
Put in a tiny NetBSD patch.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipcsocket.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- ipcsocket.c 24 Jan 2006 14:58:41 -0000 1.172
+++ ipcsocket.c 2 Feb 2006 15:58:00 -0000 1.173
@@ -1,4 +1,4 @@
-/* $Id: ipcsocket.c,v 1.172 2006/01/24 14:58:41 davidlee Exp $ */
+/* $Id: ipcsocket.c,v 1.173 2006/02/02 15:58:00 alan Exp $ */
/*
* ipcsocket unix domain socket implementation of IPC abstraction.
*
@@ -2454,6 +2454,7 @@
# define crEgid sc_egid
# define crngrp sc_ngroups
# define crgrps sc_groups
+# undef EXTRASPACE
# define EXTRASPACE SOCKCREDSIZE(ngroups)
#elif HAVE_STRUCT_CRED
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 09:04:03 -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:
ipc.c
Log Message:
Drive the error level from channel->conntype instead of manually setting it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ipc.c 17 Jan 2006 21:47:28 -0000 1.16
+++ ipc.c 2 Feb 2006 16:04:02 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.16 2006/01/17 21:47:28 andrew Exp $ */
+/* $Id: ipc.c,v 1.17 2006/02/02 16:04:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -103,13 +103,15 @@
return all_is_good;
}
-#define ipc_log(fmt...) do_crm_log(server?LOG_WARNING:LOG_ERR, __FILE__,
__FUNCTION__, fmt)
-
/* frees msg */
gboolean
crm_send_ipc_message(IPC_Channel *ipc_client, HA_Message *msg, gboolean server)
{
gboolean all_is_good = TRUE;
+ int fail_level = LOG_WARNING;
+ if(ipc_client->conntype == IPC_CLIENT) {
+ fail_level = LOG_ERR;
+ }
if (msg == NULL) {
crm_err("cant send NULL message");
@@ -120,8 +122,8 @@
all_is_good = FALSE;
} else if(ipc_client->ops->get_chan_status(ipc_client) != IPC_CONNECT) {
- ipc_log("IPC Channel to %d is not connected",
- (int)ipc_client->farside_pid);
+ crm_log_maybe(fail_level, "IPC Channel to %d is not connected",
+ (int)ipc_client->farside_pid);
all_is_good = FALSE;
} else if(get_stringlen(msg) >= MAXMSG) {
@@ -131,13 +133,14 @@
}
if(all_is_good && msg2ipcchan(msg, ipc_client) != HA_OK) {
- ipc_log("Could not send IPC message to %d",
+ crm_log_maybe(fail_level, "Could not send IPC message to %d",
(int)ipc_client->farside_pid);
all_is_good = FALSE;
if(ipc_client->ops->get_chan_status(ipc_client) != IPC_CONNECT)
{
- ipc_log("IPC Channel to %d is no longer connected",
- (int)ipc_client->farside_pid);
+ crm_log_maybe(fail_level,
+ "IPC Channel to %d is no longer
connected",
+ (int)ipc_client->farside_pid);
} else if(server == FALSE) {
CRM_DEV_ASSERT(ipc_client->send_queue->current_qlen <
ipc_client->send_queue->max_qlen);
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 09:43:42 -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:
GSource.c
Log Message:
Fixed a bug where it tried to check if a source was valid without seeing if
it was NULL first.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- GSource.c 2 Feb 2006 14:58:23 -0000 1.59
+++ GSource.c 2 Feb 2006 16:43:40 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.59 2006/02/02 14:58:23 alan Exp $ */
+/* $Id: GSource.c,v 1.60 2006/02/02 16:43:40 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -1401,10 +1401,13 @@
GSource* source = g_main_context_find_source_by_id(NULL,tag);
struct GTimeoutAppend* append = GTIMEOUT(source);
- g_assert(IS_TIMEOUTSRC(append));
g_source_remove(tag);
- if (source != NULL){
+ if (source == NULL){
+ cl_log(LOG_ERR, "Attempt to remove timeout (%ud)"
+ "with NULL source", tag);
+ }else{
+ g_assert(IS_TIMEOUTSRC(append));
g_source_unref(source);
}
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 09:45:01 -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:
GSource.c
Log Message:
Changed some macros to always check for a NULL pointer before validating its
contents...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- GSource.c 2 Feb 2006 16:43:40 -0000 1.60
+++ GSource.c 2 Feb 2006 16:45:00 -0000 1.61
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.60 2006/02/02 16:43:40 alan Exp $ */
+/* $Id: GSource.c,v 1.61 2006/02/02 16:45:00 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -40,12 +40,12 @@
#define MAG_GTRIGSOURCE 0xfeed0005U
#define MAG_GTIMEOUTSRC 0xfeed0006U
-#define IS_FDSOURCE(p) ((p)->magno == MAG_GFDSOURCE)
-#define IS_CHSOURCE(p) ((p)->magno == MAG_GCHSOURCE)
-#define IS_WCSOURCE(p) ((p)->magno == MAG_GWCSOURCE)
-#define IS_SIGSOURCE(p) ((p)->magno == MAG_GSIGSOURCE)
-#define IS_TRIGSOURCE(p) ((p)->magno == MAG_GTRIGSOURCE)
-#define IS_TIMEOUTSRC(p) ((p)->magno == MAG_GTIMEOUTSRC)
+#define IS_FDSOURCE(p) (p && (p)->magno == MAG_GFDSOURCE)
+#define IS_CHSOURCE(p) (p && (p)->magno == MAG_GCHSOURCE)
+#define IS_WCSOURCE(p) (p && (p)->magno == MAG_GWCSOURCE)
+#define IS_SIGSOURCE(p) (p && (p)->magno == MAG_GSIGSOURCE)
+#define IS_TRIGSOURCE(p) (p && (p)->magno == MAG_GTRIGSOURCE)
+#define IS_TIMEOUTSRC(p) (p && (p)->magno == MAG_GTIMEOUTSRC)
#define IS_ONEOFOURS(p) (IS_CHSOURCE(p)|IS_FDSOURCE(p)|IS_WCSOURCE(p)||
\
IS_SIGSOURCE(p)|IS_TRIGSOURCE(p)||IS_TIMEOUTSRC(p))
------------------------------
_______________________________________________
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 10
********************************************
