From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by dpdk.org (Postfix) with ESMTP id 3FA53AFD9 for ; Wed, 21 May 2014 22:35:28 +0200 (CEST) Received: by mail-wi0-f173.google.com with SMTP id bs8so8265722wib.6 for ; Wed, 21 May 2014 13:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=ry1G3H99ZI8tKBpZxJzpkUcw9nMDuhnXfiMKAgGoTPs=; b=Ii4cM7FZ4fpWwbhwTHCJP2A+M3hmTawdTVIwk1/YmkbOHdgxM0XS+w61OzE/Adw4Iv 12+XPVaq1tCZn2li6ZHMuX/lHW30JvNw5oC7XldczQjlTMXF8mN3AKc/YXmyoNopaEfP TEqIIXCTxS9jAIesUpQGDZ6whkJXbDhK1HLBevYLCTeedKcI76wDC7ra9CTHM8wVpaab uhn8esdlhzuyqAMq/N+8ua8h8KIJyFJV1h6eKqELtZc9xf0p6IlCv1RhcgP7bwQV1IOa 2UdtjBqQylp/3cIPCvqE3ApNEJeMqeKpwD0zKSrYFhlD9FOFoTFSxfSqZ2lQmDDE283I Atew== X-Received: by 10.180.77.225 with SMTP id v1mr12352808wiw.5.1400704537717; Wed, 21 May 2014 13:35:37 -0700 (PDT) Received: from ubuntu.ubuntu-domain ([109.66.146.135]) by mx.google.com with ESMTPSA id dr6sm4088161wid.6.2014.05.21.13.35.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 May 2014 13:35:36 -0700 (PDT) From: Vadim Suraev To: dev@dpdk.org Date: Wed, 21 May 2014 23:35:55 +0300 Message-Id: <1400704555-18818-1-git-send-email-vadim.suraev@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [dpdk-dev] [PATCH] timer bug fix. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 20:35:28 -0000 Bug: When a timer is running - if rte_timer_stop is called, the pending decrement is skipped (decremented only if the timer is pending) and due to the update flag the future processing is skipped so the timer is counted as pending while it is stopped. - the same applies when rte_timer_reset is called but then the pending statistics is additionally incremented so the timer is counted pending twice. Solution: decrement the pending statistics after returning from the callback. If rte_timer_stop was called, it skipped decrementing the pending statistics. If rte_time_reset was called, the pending statistics was incremented. If neither was called and the timer is periodic, the pending statistics is incremented when it is reloaded Signed-off-by: Vadim Suraev --- lib/librte_timer/rte_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index 1ebd223..7035bed 100755 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -551,7 +551,7 @@ void rte_timer_manage(void) tim->f(tim, tim->arg); rte_spinlock_lock(&priv_timer[lcore_id].list_lock); - + __TIMER_STAT_ADD(pending, -1); /* the timer was stopped or reloaded by the callback * function, we have nothing to do here */ if (priv_timer[lcore_id].updated == 1) @@ -559,7 +559,6 @@ void rte_timer_manage(void) if (tim->period == 0) { /* remove from done list and mark timer as stopped */ - __TIMER_STAT_ADD(pending, -1); status.state = RTE_TIMER_STOP; status.owner = RTE_TIMER_NO_OWNER; rte_wmb(); @@ -568,6 +567,7 @@ void rte_timer_manage(void) else { /* keep it in list and mark timer as pending */ status.state = RTE_TIMER_PENDING; + __TIMER_STAT_ADD(pending, 1); status.owner = (int16_t)lcore_id; rte_wmb(); tim->status.u32 = status.u32; -- 1.7.9.5