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 blaschke from
([EMAIL PROTECTED])
2. Linux-HA CVS: include by gshi from
([EMAIL PROTECTED])
3. Linux-HA CVS: heartbeat by gshi from
([EMAIL PROTECTED])
4. Linux-HA CVS: lib by gshi from ([EMAIL PROTECTED])
5. Linux-HA CVS: include by gshi from
([EMAIL PROTECTED])
----------------------------------------------------------------------
Message: 1
Date: Wed, 9 Nov 2005 13:15:36 -0700 (MST)
From: [EMAIL PROTECTED]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith
Modified Files:
apcsmart.c
Log Message:
Fix BEAM complaint about passing unused third argument to fcntl
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/apcsmart.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- apcsmart.c 22 Apr 2005 14:22:16 -0000 1.29
+++ apcsmart.c 9 Nov 2005 20:15:35 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: apcsmart.c,v 1.29 2005/04/22 14:22:16 blaschke Exp $ */
+/* $Id: apcsmart.c,v 1.30 2005/11/09 20:15:35 blaschke Exp $ */
/*
* Stonith module for APCSmart Stonith device
* Copyright (c) 2000 Andreas Piesk <[EMAIL PROTECTED]>
@@ -245,7 +245,7 @@
return -1;
}
- if ((fflags = fcntl(fd, F_GETFL, 0)) < 0
+ if ((fflags = fcntl(fd, F_GETFL)) < 0
|| fcntl(fd, F_SETFL, (fflags & ~O_NONBLOCK)) < 0) {
LOG(PIL_CRIT, "%s: Setting flags on %s failed [%s]."
, __FUNCTION__
------------------------------
Message: 2
Date: Wed, 9 Nov 2005 15:22:57 -0700 (MST)
From: [EMAIL PROTECTED]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/ocf
Modified Files:
oc_event.h
Log Message:
make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/ocf/oc_event.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- oc_event.h 10 May 2005 18:47:42 -0000 1.4
+++ oc_event.h 9 Nov 2005 22:22:56 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: oc_event.h,v 1.4 2005/05/10 18:47:42 gshi Exp $ */
+/* $Id: oc_event.h,v 1.5 2005/11/09 22:22:56 gshi Exp $ */
/*
* oc_event.h
*
@@ -50,7 +50,7 @@
#define OC_EV_CLASS_SHIFT 22
#define OC_EV_EVENT_SHIFT 10
-#define OC_EV_EVENT_MASK (~ ((uint)~0 << OC_EV_CLASS_SHIFT))
+#define OC_EV_EVENT_MASK (~ (~((uint)0) << OC_EV_CLASS_SHIFT))
#define OC_EV_GET_CLASS(ed) ((uint)(ed) >> OC_EV_CLASS_SHIFT)
#define OC_EV_GET_EVENT(ed) ((uint)(ed) & OC_EV_EVENT_MASK)
------------------------------
Message: 3
Date: Wed, 9 Nov 2005 15:27:46 -0700 (MST)
From: [EMAIL PROTECTED]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
hb_api.c
Log Message:
make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_api.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- hb_api.c 12 Oct 2005 19:32:45 -0000 1.145
+++ hb_api.c 9 Nov 2005 22:27:46 -0000 1.146
@@ -1,4 +1,4 @@
-/* $Id: hb_api.c,v 1.145 2005/10/12 19:32:45 gshi Exp $ */
+/* $Id: hb_api.c,v 1.146 2005/11/09 22:27:46 gshi Exp $ */
/*
* hb_api: Server-side heartbeat API code
*
@@ -1675,8 +1675,8 @@
const char * cuid = NULL;
long luid = -1;
long lgid = -1;
- uid_t uid = (uid_t)-1;
- gid_t gid = (gid_t)-1;
+ int uid = -1;
+ int gid = -1;
if ((cpid = ha_msg_value(msg, F_PID)) != NULL) {
------------------------------
Message: 4
Date: Wed, 9 Nov 2005 18:08:55 -0700 (MST)
From: [EMAIL PROTECTED]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
Gmain_timeout.c
Log Message:
fix a bug:
in G_main_timeout_remove(), we should remove the source from the main loop
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/Gmain_timeout.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Gmain_timeout.c 12 Aug 2005 05:09:09 -0000 1.13
+++ Gmain_timeout.c 10 Nov 2005 01:08:55 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: Gmain_timeout.c,v 1.13 2005/08/12 05:09:09 zhenh Exp $ */
+/* $Id: Gmain_timeout.c,v 1.14 2005/11/10 01:08:55 gshi Exp $ */
/*
* Glib mainloop timeout handling code.
*
@@ -101,12 +101,13 @@
{
GSource* source = g_main_context_find_source_by_id(NULL,tag);
+ g_source_remove(tag);
+
if (source != NULL){
g_source_unref(source);
- g_source_destroy(source);
}
-
+ return;
}
/* g_main_loop-style prepare function */
------------------------------
Message: 5
Date: Wed, 9 Nov 2005 18:16:42 -0700 (MST)
From: [EMAIL PROTECTED]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
heartbeat.h
Log Message:
bug 693: Spread out load for packet retransmission requests
Each time a missing packet is detected, a timeout event is scheduled
with a random delay between 0~MAX_REXMIT_DELAY(250ms). If the missing message
is received before the timeout event happens, the timeout event is cancelled.
Otherwise, in the timeout event function call, a rexmit request is sent to
the source node and a new timeout event is scheduled (with delay
MAX_REXMIT_DELAY).
The current timeout will be removed from mainloop by returning FALSE.
The previous periodic check for missing packets is disabled.
------------------------------
_______________________________________________
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 43
********************************************
