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 zhenh 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: lib by alan from ([email protected])
5. Linux-HA CVS: lib by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 6 Feb 2006 03:01:28 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
initial the timeout tag with -1 in the copy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- lrmd.c 6 Feb 2006 07:14:45 -0000 1.205
+++ lrmd.c 6 Feb 2006 10:01:27 -0000 1.206
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.205 2006/02/06 07:14:45 zhenh Exp $ */
+/* $Id: lrmd.c,v 1.206 2006/02/06 10:01:27 zhenh Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -2820,6 +2820,8 @@
lrmd_op_destroy(rsc->last_op_done);
}
rsc->last_op_done = lrmd_op_copy(op);
+ rsc->last_op_done->timeout_tag = (guint)-1;
+ rsc->last_op_done->repeat_timeout_tag = (guint)-1;
/*copy the repeat op to repeat list to wait next perform */
if ( 0 != op->interval && NULL != lookup_client(op->client_id)
@@ -3525,6 +3527,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.206 2006/02/06 10:01:27 zhenh
+ * initial the timeout tag with -1 in the copy
+ *
* Revision 1.205 2006/02/06 07:14:45 zhenh
* log the active resoruces when lrmd exit
*
------------------------------
Message: 2
Date: Mon, 6 Feb 2006 06:10: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:
GSource.c
Log Message:
Don't call user's dispatch function if there are no packets to read.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- GSource.c 6 Feb 2006 04:13:20 -0000 1.68
+++ GSource.c 6 Feb 2006 13:10:00 -0000 1.69
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.68 2006/02/06 04:13:20 alan Exp $ */
+/* $Id: GSource.c,v 1.69 2006/02/06 13:10:00 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -649,6 +649,10 @@
#endif
+ if (!chp->ch->ops->is_message_pending(chp->ch)) {
+ CHECK_DISPATCH_TIME(chp);
+ return TRUE;
+ }
if(chp->dispatch) {
if(!(chp->dispatch(chp->ch, chp->udata))){
------------------------------
Message: 3
Date: Mon, 6 Feb 2006 06:15:18 -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:
Minor aesthetic improvement to last GSource delta.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- GSource.c 6 Feb 2006 13:10:00 -0000 1.69
+++ GSource.c 6 Feb 2006 13:15:17 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.69 2006/02/06 13:10:00 alan Exp $ */
+/* $Id: GSource.c,v 1.70 2006/02/06 13:15:17 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -649,12 +649,8 @@
#endif
- if (!chp->ch->ops->is_message_pending(chp->ch)) {
- CHECK_DISPATCH_TIME(chp);
- return TRUE;
- }
- if(chp->dispatch) {
+ if(chp->dispatch && chp->ch->ops->is_message_pending(chp->ch)) {
if(!(chp->dispatch(chp->ch, chp->udata))){
g_source_remove_poll(source, &chp->infd);
if (!chp->fd_fdx) {
------------------------------
Message: 4
Date: Mon, 6 Feb 2006 06:53:29 -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:
Initialized the trigger source detection time to zero.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- GSource.c 6 Feb 2006 13:15:17 -0000 1.70
+++ GSource.c 6 Feb 2006 13:53:28 -0000 1.71
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.70 2006/02/06 13:15:17 alan Exp $ */
+/* $Id: GSource.c,v 1.71 2006/02/06 13:53:28 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -1262,6 +1262,7 @@
trig_src->dispatch = dispatch;
trig_src->udata = userdata;
trig_src->dnotify = notify;
+ trig_src->detecttime = zero_longclock;
trig_src->manual_trigger = FALSE;
@@ -1362,6 +1363,7 @@
CHECK_DISPATCH_DELAY(trig_src);
trig_src->manual_trigger = FALSE;
+ trig_src->detecttime = zero_longclock;
if(trig_src->dispatch) {
if(!(trig_src->dispatch(trig_src->udata))){
------------------------------
Message: 5
Date: Mon, 6 Feb 2006 06:53:53 -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:
longclock.c
Log Message:
Put out a message when we see the clock wrap around "normally"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/longclock.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- longclock.c 4 Feb 2006 16:39:58 -0000 1.19
+++ longclock.c 6 Feb 2006 13:53:53 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id: longclock.c,v 1.19 2006/02/04 16:39:58 alan Exp $ */
+/* $Id: longclock.c,v 1.20 2006/02/06 13:53:53 alan Exp $ */
/*
* Longclock operations
*
@@ -121,6 +121,9 @@
timesval = lasttimes;
}else{
/* Normal looking wraparound */
+ cl_log(LOG_INFO
+ , "%s: clock_t wrapped around (uptime)."
+ , __FUNCTION__);
++wrapcount;
lc_wrapcount = ((longclock_t)wrapcount) << WRAPSHIFT;
}
------------------------------
_______________________________________________
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 29
********************************************
