From patchwork Wed Dec 3 10:07:38 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 11913 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id EB533DDD0B for ; Wed, 3 Dec 2008 21:08:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264AbYLCKHs (ORCPT ); Wed, 3 Dec 2008 05:07:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751243AbYLCKHr (ORCPT ); Wed, 3 Dec 2008 05:07:47 -0500 Received: from ey-out-2122.google.com ([74.125.78.25]:55907 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751192AbYLCKHo (ORCPT ); Wed, 3 Dec 2008 05:07:44 -0500 Received: by ey-out-2122.google.com with SMTP id 6so1464940eyi.37 for ; Wed, 03 Dec 2008 02:07:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=bQZbydRduddOXfevXcHPNMeHFWPIcC9h8PA7/O+0aEk=; b=FnqrSFNlr9772UFLRA8Vy0cz6kjp5b7Kvh+LATfbHAIqCKHcypMoqShx2US+q0JwjQ Gb0YoxFIgcjJRLtVp35nNqlFT7Xl1AtPyo4GMDk9eB272GryJ3RhEAB6NVw/S5BFJmMH 3m/J1lfKfRauJzFgQvn1cIzO+OGPh3U4g69to= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=etR7OjNHEll3I50Kh34ylkbNiQ0T08sCHMMpOLTha0exk3jOYk708Fz7GufL4OH/qu nNDqBsYVJASgq0FCFJAnmWDas38KBbu3Sk4O5r81wBSkTAZC2HPmYqFEUOPrkOhQ3Tst /2LHfgA+vn0T4xjZyC2O5XNoDS/ijkH1sgMzU= Received: by 10.210.66.13 with SMTP id o13mr3072251eba.125.1228298863699; Wed, 03 Dec 2008 02:07:43 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id k5sm34280064nfh.0.2008.12.03.02.07.42 (version=SSLv3 cipher=RC4-MD5); Wed, 03 Dec 2008 02:07:43 -0800 (PST) Date: Wed, 3 Dec 2008 10:07:38 +0000 From: Jarek Poplawski To: David Miller Cc: Martin Devera , Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH 5/3] pkt_sched: sch_htb: Replace HTB_ACCNT() macro with inlines Message-ID: <20081203100738.GA16755@ff.dom.local> References: <20081202085648.GC10412@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20081202085648.GC10412@ff.dom.local> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace HTB_ACCNT() macro with inlines to make it more readable. Signed-off-by: Jarek Poplawski --- net/sched/sch_htb.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index fcd06e2..f89fd71 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -577,6 +577,32 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) return NET_XMIT_SUCCESS; } +static inline void htb_accnt_tokens(struct htb_class *cl, int bytes, long diff) +{ + long toks = diff + cl->tokens; + + if (toks > cl->buffer) + toks = cl->buffer; + toks -= (long) qdisc_l2t(cl->rate, bytes); + if (toks <= -cl->mbuffer) + toks = 1 - cl->mbuffer; + + cl->tokens = toks; +} + +static inline void htb_accnt_ctokens(struct htb_class *cl, int bytes, long diff) +{ + long toks = diff + cl->ctokens; + + if (toks > cl->cbuffer) + toks = cl->cbuffer; + toks -= (long) qdisc_l2t(cl->ceil, bytes); + if (toks <= -cl->mbuffer) + toks = 1 - cl->mbuffer; + + cl->ctokens = toks; +} + /** * htb_charge_class - charges amount "bytes" to leaf and ancestors * @@ -592,26 +618,20 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl, int level, struct sk_buff *skb) { int bytes = qdisc_pkt_len(skb); - long toks, diff; enum htb_cmode old_mode; - -#define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ - if (toks > cl->B) toks = cl->B; \ - toks -= (long) qdisc_l2t(cl->R, bytes); \ - if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \ - cl->T = toks + long diff; while (cl) { diff = psched_tdiff_bounded(q->now, cl->t_c, cl->mbuffer); if (cl->level >= level) { if (cl->level == level) cl->xstats.lends++; - HTB_ACCNT(tokens, buffer, rate); + htb_accnt_tokens(cl, bytes, diff); } else { cl->xstats.borrows++; cl->tokens += diff; /* we moved t_c; update tokens */ } - HTB_ACCNT(ctokens, cbuffer, ceil); + htb_accnt_ctokens(cl, bytes, diff); cl->t_c = q->now; old_mode = cl->cmode;