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 alan from ([email protected])
3. Linux-HA CVS: lib by alan from ([email protected])
4. Linux-HA CVS: lrm by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 09:48:27 -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:
tengine.c unpack.c
Log Message:
Initialize to 0 not -1.
stop_te_timer checks for != 0 to know if it has a valid timer.
and since the timer id is a guint, -1 is actually a valid timer id
(once its cast to an unsigned value)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- tengine.c 20 Jan 2006 13:26:45 -0000 1.110
+++ tengine.c 2 Feb 2006 16:48:26 -0000 1.111
@@ -1,4 +1,4 @@
-/* $Id: tengine.c,v 1.110 2006/01/20 13:26:45 andrew Exp $ */
+/* $Id: tengine.c,v 1.111 2006/02/02 16:48:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -74,7 +74,7 @@
crm_malloc0(transition_timer, sizeof(te_timer_t));
transition_timer->timeout = 10;
- transition_timer->source_id = -1;
+ transition_timer->source_id = 0;
transition_timer->reason = timeout_timeout;
transition_timer->action = NULL;
} else {
@@ -85,7 +85,7 @@
crm_malloc0(abort_timer, sizeof(te_timer_t));
abort_timer->timeout = 10;
- abort_timer->source_id = -1;
+ abort_timer->source_id = 0;
abort_timer->reason = timeout_abort;
abort_timer->action = NULL;
} else {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/unpack.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- unpack.c 11 Jan 2006 13:06:11 -0000 1.53
+++ unpack.c 2 Feb 2006 16:48:26 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.53 2006/01/11 13:06:11 andrew Exp $ */
+/* $Id: unpack.c,v 1.54 2006/02/02 16:48:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -232,7 +232,7 @@
crm_malloc0(action->timer, sizeof(te_timer_t));
action->timer->timeout = 2 * action->timeout;
- action->timer->source_id = -1;
+ action->timer->source_id = 0;
action->timer->reason = timeout_action;
action->timer->action = action;
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 10:04:21 -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 minor printf format problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- GSource.c 2 Feb 2006 16:45:00 -0000 1.61
+++ GSource.c 2 Feb 2006 17:04:20 -0000 1.62
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.61 2006/02/02 16:45:00 alan Exp $ */
+/* $Id: GSource.c,v 1.62 2006/02/02 17:04:20 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -1404,7 +1404,7 @@
g_source_remove(tag);
if (source == NULL){
- cl_log(LOG_ERR, "Attempt to remove timeout (%ud)"
+ cl_log(LOG_ERR, "Attempt to remove timeout (%u)"
"with NULL source", tag);
}else{
g_assert(IS_TIMEOUTSRC(append));
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 10:05: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:
GSource.c
Log Message:
More minor format tweaks.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- GSource.c 2 Feb 2006 17:04:20 -0000 1.62
+++ GSource.c 2 Feb 2006 17:05:03 -0000 1.63
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.62 2006/02/02 17:04:20 alan Exp $ */
+/* $Id: GSource.c,v 1.63 2006/02/02 17:05:03 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -1405,7 +1405,7 @@
if (source == NULL){
cl_log(LOG_ERR, "Attempt to remove timeout (%u)"
- "with NULL source", tag);
+ " with NULL source", tag);
}else{
g_assert(IS_TIMEOUTSRC(append));
g_source_unref(source);
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 10:28:39 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Put in a check for a timeout actually being set before removing it...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -3 -r1.201 -r1.202
--- lrmd.c 16 Jan 2006 10:05:56 -0000 1.201
+++ lrmd.c 2 Feb 2006 17:28:38 -0000 1.202
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.201 2006/01/16 10:05:56 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.202 2006/02/02 17:28:38 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -1642,7 +1642,10 @@
return FALSE;
}
rsc->repeat_op_list = g_list_remove(rsc->repeat_op_list, op);
- Gmain_timeout_remove(op->repeat_timeout_tag);
+ if ((int)op->repeat_timeout_tag > 0) {
+ Gmain_timeout_remove(op->repeat_timeout_tag);
+ op->repeat_timeout_tag = -1;
+ }
op->repeat_timeout_tag = -1;
op->exec_pid = -1;
@@ -3467,6 +3470,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.202 2006/02/02 17:28:38 alan
+ * Put in a check for a timeout actually being set before removing it...
+ *
* Revision 1.201 2006/01/16 10:05:56 sunjd
* reset SIGPIPE to SIG_DFL. I think it should be. One related issue is found
by Peter Kruse <[EMAIL PROTECTED]>, while the solution is proposed by [EMAIL
PROTECTED]
*
------------------------------
_______________________________________________
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 11
********************************************
