From patchwork Sun May 22 11:11:53 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: 624946 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 3rCJsT050Cz9t3p for ; Sun, 22 May 2016 21:11:56 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 6128F691A; Sun, 22 May 2016 11:11:54 +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 264AA690A; Sun, 22 May 2016 11:11:53 +0000 (UTC) Date: Sun, 22 May 2016 11:11:53 +0000 From: Holger Freyther To: lynxis lazus X-Gerrit-MessageType: merged Subject: [MERGED] osmo-pcu[master]: introduce new counter rlc_sent_control X-Gerrit-Change-Id: Ib41031d430beddfb48d54470e632436f2c99c360 X-Gerrit-ChangeURL: X-Gerrit-Commit: f929e625252c8943339bf909553118f8b484c3c2 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: <20160522111154.6128F691A@lists.osmocom.org> Holger Freyther has submitted this change and it was merged. Change subject: introduce new counter rlc_sent_control ...................................................................... introduce new counter rlc_sent_control Counts control messages (UL/DL assignment, UL ACKs or page requests) Change-Id: Ib41031d430beddfb48d54470e632436f2c99c360 Reviewed-on: https://gerrit.osmocom.org/99 Reviewed-by: Holger Freyther Tested-by: Jenkins Builder --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index d1636b6..fdae1f0 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -72,6 +72,7 @@ { "rlc.rel.timedout", "RLC Release Timeout "}, { "rlc.late-block", "RLC Late Block "}, { "rlc.sent_dummy", "RLC Sent Dummy "}, + { "rlc.sent_control", "RLC Sent Control "}, { "decode.errors", "Decode Errors "}, { "sba.allocated", "SBA Allocated "}, { "sba.freed", "SBA Freed "}, diff --git a/src/bts.h b/src/bts.h index 829e3c2..35f24d1 100644 --- a/src/bts.h +++ b/src/bts.h @@ -234,6 +234,7 @@ CTR_RLC_REL_TIMEDOUT, CTR_RLC_LATE_BLOCK, CTR_RLC_SENT_DUMMY, + CTR_RLC_SENT_CONTROL, CTR_DECODE_ERRORS, CTR_SBA_ALLOCATED, CTR_SBA_FREED, @@ -311,6 +312,7 @@ void rlc_rel_timedout(); void rlc_late_block(); void rlc_sent_dummy(); + void rlc_sent_control(); void decode_error(); void sba_allocated(); void sba_freed(); @@ -452,6 +454,7 @@ CREATE_COUNT_INLINE(rlc_rel_timedout, CTR_RLC_REL_TIMEDOUT); CREATE_COUNT_INLINE(rlc_late_block, CTR_RLC_LATE_BLOCK); CREATE_COUNT_INLINE(rlc_sent_dummy, CTR_RLC_SENT_DUMMY); +CREATE_COUNT_INLINE(rlc_sent_control, CTR_RLC_SENT_CONTROL); CREATE_COUNT_INLINE(decode_error, CTR_DECODE_ERRORS) CREATE_COUNT_INLINE(sba_allocated, CTR_SBA_ALLOCATED) CREATE_COUNT_INLINE(sba_freed, CTR_SBA_FREED) diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index cd5f683..fce3aaf 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -339,6 +339,8 @@ /* Prio 1: select control message */ msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, ul_ass_tbf, dl_ass_tbf, ul_ack_tbf); + if (msg) + bts->bts->rlc_sent_control(); /* Prio 2: select data message for downlink */ if (!msg) {