From mboxrd@z Thu Jan 1 00:00:00 1970 From: teigland@sourceware.org Date: 20 Nov 2006 21:28:54 -0000 Subject: [Cluster-devel] cluster/group/gfs_controld plock.c Message-ID: <20061120212854.3298.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: teigland at sourceware.org 2006-11-20 21:28:54 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&r1=1.28&r2=1.29 --- cluster/group/gfs_controld/plock.c 2006/11/20 21:07:18 1.28 +++ cluster/group/gfs_controld/plock.c 2006/11/20 21:28:53 1.29 @@ -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)