[Cluster-devel] cluster/group/gfs_controld plock.c

[teigland@sourceware.org <teigland@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2006-11-20 21:29:41

Modified files:
	group/gfs_controld: plock.c 

Log message:
	use timersub() macro to subtract timevals instead of coding it

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.25.2.3&r2=1.25.2.4

--- cluster/group/gfs_controld/plock.c	2006/11/20 21:10:28	1.25.2.3
+++ cluster/group/gfs_controld/plock.c	2006/11/20 21:29:40	1.25.2.4
@@ -313,17 +313,9 @@
 
 static unsigned long time_diff_ms(struct timeval *begin, struct timeval *end)
 {
-	unsigned long a_us, b_us, c_us, s, us, ms;
-
-	a_us = begin->tv_sec * 1000000 + begin->tv_usec;
-	b_us = end->tv_sec * 1000000 + end->tv_usec;
-	c_us = b_us - a_us;
-
-	s = c_us / 1000000;
-	us = c_us % 1000000;
-	ms = us / 1000;
-
-	return (s * 1000 + ms);
+	struct timeval result;
+	timersub(end, begin, &result);
+	return (result.tv_sec * 1000) + (result.tv_usec / 1000);
 }
 
 int process_plocks(void)