From patchwork Fri May 20 16:32:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org X-Patchwork-Id: 624559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by ozlabs.org (Postfix) with ESMTP id 3rBD3t0zHDz9t7G for ; Sat, 21 May 2016 02:32:10 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 551676D97; Fri, 20 May 2016 16:32:08 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from 127.0.1.12 (unknown [127.0.1.12]) by lists.osmocom.org (Postfix) with ESMTPA id EE9936D91; Fri, 20 May 2016 16:32:06 +0000 (UTC) Date: Fri, 20 May 2016 16:32:06 +0000 From: Holger Freyther To: lynxis lazus X-Gerrit-MessageType: merged Subject: [MERGED] osmo-pcu[master]: move statistics counter rlc_sent() to gprs_rlcmac_sched X-Gerrit-Change-Id: I5d2b910ea7cc250f17530406eda3be9b29b051fd X-Gerrit-ChangeURL: X-Gerrit-Commit: 9736d00b12fea82fb4c9b8dc47b7ce452660554c In-Reply-To: References: MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: holger@freyther.de Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" Message-Id: <20160520163208.551676D97@lists.osmocom.org> Holger Freyther has submitted this change and it was merged. Change subject: move statistics counter rlc_sent() to gprs_rlcmac_sched ...................................................................... move statistics counter rlc_sent() to gprs_rlcmac_sched The counter rlc_sent has nothing to do with the TBF. The RLC packet got sent in the gprs_rlcmac_sched(). Change-Id: I5d2b910ea7cc250f17530406eda3be9b29b051fd Reviewed-on: https://gerrit.osmocom.org/84 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther --- M src/gprs_rlcmac_sched.cpp M src/tbf_dl.cpp 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 313e23f..8e05623 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -341,8 +341,11 @@ dl_ass_tbf, ul_ack_tbf); /* Prio 2: select data message for downlink */ - if (!msg) + if (!msg) { msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch); + if (msg) + bts->bts->rlc_sent(); + } /* Prio 3: send dummy contol message */ if (!msg) diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 9e4d078..62d378f 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -762,8 +762,6 @@ /* Increment TX-counter */ m_tx_counter++; - bts->rlc_sent(); - return dl_msg; }