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: lrm by alan from ([email protected])
2. Linux-HA CVS: heartbeat by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 10:47:07 -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:
Fixed some cast errors in reference timer tags.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- lrmd.c 2 Feb 2006 17:28:38 -0000 1.202
+++ lrmd.c 2 Feb 2006 17:47:07 -0000 1.203
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.202 2006/02/02 17:28:38 alan Exp $ */
+/* $Id: lrmd.c,v 1.203 2006/02/02 17:47:07 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -420,12 +420,12 @@
if ((int)op->repeat_timeout_tag > 0) {
Gmain_timeout_remove(op->repeat_timeout_tag);
- op->repeat_timeout_tag = -1;
+ op->repeat_timeout_tag =(guint)-1;
}
if ((int)op->timeout_tag > 0) {
Gmain_timeout_remove(op->timeout_tag);
- op->timeout_tag = -1;
+ op->timeout_tag = (guint)-1;
}
ha_msg_del(op->msg);
@@ -1644,7 +1644,7 @@
rsc->repeat_op_list = g_list_remove(rsc->repeat_op_list, op);
if ((int)op->repeat_timeout_tag > 0) {
Gmain_timeout_remove(op->repeat_timeout_tag);
- op->repeat_timeout_tag = -1;
+ op->repeat_timeout_tag = (guint)-1;
}
op->repeat_timeout_tag = -1;
@@ -2598,8 +2598,9 @@
/* we should check if the resource exists. */
rsc = lookup_rsc(op->rsc_id);
if (rsc == NULL) {
- if( op->timeout_tag > 0 ) {
+ if((int)op->timeout_tag > 0 ) {
Gmain_timeout_remove(op->timeout_tag);
+ op->timeout_tag = (guint)-1;
}
lrmd_log(LOG_ERR
, "%s: the resource for the operation %s does not exist."
@@ -2746,9 +2747,9 @@
, "on_op_done:%s is removed from op list"
, op_info(op));
- if( op->timeout_tag > 0 ) {
+ if( (int)op->timeout_tag > 0 ) {
Gmain_timeout_remove(op->timeout_tag);
- op->timeout_tag = -1;
+ op->timeout_tag = (guint)-1;
}
@@ -3470,6 +3471,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.203 2006/02/02 17:47:07 alan
+ * Fixed some cast errors in reference timer tags.
+ *
* Revision 1.202 2006/02/02 17:28:38 alan
* Put in a check for a timeout actually being set before removing it...
*
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 11:27:50 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
Fixed up a mistake in adding code to check timeouts.
An IPC channel in heartbeat wound up not getting a description,
and another one got the wrong description. Both from a single bug -
two missing characters.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -3 -r1.487 -r1.488
--- heartbeat.c 2 Feb 2006 14:58:23 -0000 1.487
+++ heartbeat.c 2 Feb 2006 18:27:49 -0000 1.488
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.487 2006/02/02 14:58:23 alan Exp $ */
+/* $Id: heartbeat.c,v 1.488 2006/02/02 18:27:49 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -1407,7 +1407,7 @@
/* Connect up the read child IPC channel... */
- G_main_add_IPC_Channel(PRI_CLUSTERMSG
+ s = G_main_add_IPC_Channel(PRI_CLUSTERMSG
, sysmedia[j]->rchan[P_WRITEFD], FALSE
, read_child_dispatch, sysmedia+j, NULL);
G_main_setmaxdispatchdelay((GSource*)s, 50);
@@ -6068,6 +6068,12 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.488 2006/02/02 18:27:49 alan
+ * Fixed up a mistake in adding code to check timeouts.
+ * An IPC channel in heartbeat wound up not getting a description,
+ * and another one got the wrong description. Both from a single bug -
+ * two missing characters.
+ *
* Revision 1.487 2006/02/02 14:58:23 alan
* Moved our timeout functions to GSource.c.
* Fixed a bug in the timing code in GSource.c (it almost never worked)
------------------------------
_______________________________________________
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 12
********************************************
