From patchwork Tue Aug 24 13:21:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 126471 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7ODLxJr023345 for ; Tue, 24 Aug 2010 13:21:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755147Ab0HXNVm (ORCPT ); Tue, 24 Aug 2010 09:21:42 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:50684 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755142Ab0HXNVi (ORCPT ); Tue, 24 Aug 2010 09:21:38 -0400 Received: by bwz11 with SMTP id 11so4765550bwz.19 for ; Tue, 24 Aug 2010 06:21:36 -0700 (PDT) Received: by 10.204.67.77 with SMTP id q13mr4524764bki.214.1282656096449; Tue, 24 Aug 2010 06:21:36 -0700 (PDT) Received: from [10.4.1.29] ([82.166.227.17]) by mx.google.com with ESMTPS id f10sm64669bkl.5.2010.08.24.06.21.34 (version=SSLv3 cipher=RC4-MD5); Tue, 24 Aug 2010 06:21:35 -0700 (PDT) Message-ID: <4C73C75D.30003@dev.mellanox.co.il> Date: Tue, 24 Aug 2010 16:21:33 +0300 From: Yevgeny Kliteynik User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA , Yevgeny Kliteynik , Tzachi Dar Subject: [PATCH v2] complib/cl_timer.c: fixing cl_timer calculation Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 24 Aug 2010 13:21:59 +0000 (UTC) diff --git a/opensm/complib/cl_timer.c b/opensm/complib/cl_timer.c index 2acdb51..3b3c7b0 100644 --- a/opensm/complib/cl_timer.c +++ b/opensm/complib/cl_timer.c @@ -294,12 +294,32 @@ static cl_status_t __cl_timer_find(IN const cl_list_item_t * const p_list_item, return (CL_NOT_FOUND); } +/* + * Calculate 'struct timespec' value that is the + * current time plus the 'time_ms' milliseconds. + */ +static __inline void __cl_timer_calculate(IN const uint32_t time_ms, + OUT struct timespec * const p_timer) +{ + struct timeval curtime, deltatime, endtime; + +#ifndef timerclear +#define timerclear(tvp) (tvp)->tv_sec = (time_t)0, (tvp)->tv_usec = 0L +#endif + timerclear(&curtime); + gettimeofday(&curtime, NULL); + + deltatime.tv_sec = time_ms / 1000; + deltatime.tv_usec = (time_ms % 1000) * 1000; + timeradd(&curtime, &deltatime, &endtime); + p_timer->tv_sec = endtime.tv_sec; + p_timer->tv_nsec = endtime.tv_usec * 1000; +} + cl_status_t cl_timer_start(IN cl_timer_t * const p_timer, IN const uint32_t time_ms) { - struct timeval curtime; cl_list_item_t *p_list_item; - uint32_t delta_time = time_ms; CL_ASSERT(p_timer); CL_ASSERT(p_timer->state == CL_INITIALIZED); @@ -313,20 +333,7 @@ cl_status_t cl_timer_start(IN cl_timer_t * const p_timer, cl_qlist_remove_item(&gp_timer_prov->queue, &p_timer->list_item); - /* Get the current time */ -#ifndef timerclear -#define timerclear(tvp) (tvp)->tv_sec = (time_t)0, (tvp)->tv_usec = 0L -#endif - timerclear(&curtime); - gettimeofday(&curtime, NULL); - - /* do not do 0 wait ! */ - /* if (delta_time < 1000.0) {delta_time = 1000;} */ - - /* Calculate the timeout. */ - p_timer->timeout.tv_sec = curtime.tv_sec + (delta_time / 1000); - p_timer->timeout.tv_nsec = - (curtime.tv_usec + ((delta_time % 1000) * 1000)) * 1000; + __cl_timer_calculate(time_ms, &p_timer->timeout); /* Add the timer to the queue. */ if (cl_is_qlist_empty(&gp_timer_prov->queue)) { @@ -385,7 +392,6 @@ void cl_timer_stop(IN cl_timer_t * const p_timer) cl_status_t cl_timer_trim(IN cl_timer_t * const p_timer, IN const uint32_t time_ms) { - struct timeval curtime; struct timespec newtime; cl_status_t status; @@ -394,13 +400,7 @@ cl_status_t cl_timer_trim(IN cl_timer_t * const p_timer, pthread_mutex_lock(&gp_timer_prov->mutex); - /* Get the current time */ - timerclear(&curtime); - gettimeofday(&curtime, NULL); - - /* Calculate the timeout. */ - newtime.tv_sec = curtime.tv_sec + (time_ms / 1000); - newtime.tv_nsec = (curtime.tv_usec + ((time_ms % 1000) * 1000)) * 1000; + __cl_timer_calculate(time_ms, &newtime); if (p_timer->timer_state == CL_TIMER_QUEUED) { /* If the old time is earlier, do not trim it. Just return. */