[Cluster-devel] cluster/cman/daemon barrier.c commands.c

[pcaulfield at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-06-26 09:09:14

Modified files:
	cman/daemon    : barrier.c commands.c 

Log message:
	Fix timer durations

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/barrier.c.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.64&r2=1.65

--- cluster/cman/daemon/barrier.c	2007/06/13 09:13:36	1.10
+++ cluster/cman/daemon/barrier.c	2007/06/26 09:09:13	1.11
@@ -285,7 +285,7 @@
 
 		/* Start the timer if one was wanted */
 		if (barrier->timeout) {
-			openais_timer_add_duration(barrier->timeout*1000000, barrier,
+			openais_timer_add_duration((unsigned long long)barrier->timeout*1000000000ULL, barrier,
 						   barrier_timer_fn, &barrier->timer);
 		}
 
--- cluster/cman/daemon/commands.c	2007/06/13 09:13:36	1.64
+++ cluster/cman/daemon/commands.c	2007/06/26 09:09:13	1.65
@@ -944,7 +944,7 @@
 
 		/* Start the timer. If we don't get a full set of replies before this goes
 		   off we'll cancel the shutdown */
-		openais_timer_add_duration(shutdown_timeout*1000, NULL,
+		openais_timer_add_duration((unsigned long long)shutdown_timeout*1000000, NULL,
 					   shutdown_timer_fn, &shutdown_timer);
 
 		notify_listeners(NULL, EVENT_REASON_TRY_SHUTDOWN, flags);
@@ -1026,7 +1026,7 @@
 		log_msg(LOG_ERR, "Can't read CCS to get updated config version %d. Activity suspended on this node\n",
 			wanted_config_version);
 
-		openais_timer_add_duration(ccsd_poll_interval*1000, NULL,
+		openais_timer_add_duration((unsigned long long)ccsd_poll_interval*1000000, NULL,
 					   ccsd_timer_fn, &ccsd_timer);
 	}
 	else {
@@ -1050,7 +1050,7 @@
 		recalculate_quorum(0);
 	}
 	else {
-		openais_timer_add_duration(quorumdev_poll*1000, quorum_device,
+		openais_timer_add_duration((unsigned long long)quorumdev_poll*1000000, quorum_device,
 					   quorum_device_timer_fn, &quorum_device_timer);
 	}
 }
@@ -1070,7 +1070,7 @@
                         quorum_device->state = NODESTATE_MEMBER;
                         recalculate_quorum(0);
 
-			openais_timer_add_duration(quorumdev_poll*1000, quorum_device,
+			openais_timer_add_duration((unsigned long long)quorumdev_poll*1000000, quorum_device,
 						   quorum_device_timer_fn, &quorum_device_timer);
                 }
         }
@@ -1493,7 +1493,7 @@
 				msg->config_version);
 
 			wanted_config_version = msg->config_version;
-			openais_timer_add_duration(ccsd_poll_interval*1000, NULL,
+			openais_timer_add_duration((unsigned long long)ccsd_poll_interval*1000000, NULL,
 						   ccsd_timer_fn, &ccsd_timer);
 		}
 		if (config_version > msg->config_version) {
@@ -1653,7 +1653,7 @@
 			recalculate_quorum(0);
 
 			wanted_config_version = config_version;
-			openais_timer_add_duration(ccsd_poll_interval*1000, NULL,
+			openais_timer_add_duration((unsigned long long)ccsd_poll_interval*1000000, NULL,
 						   ccsd_timer_fn, &ccsd_timer);
 		}
 		break;