<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22947">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: add SIGN/SPEECH assignment subcategories<br><br>Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bts.c<br>3 files changed, 64 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 9a226f5..6b58c7e 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -76,14 +76,26 @@</span><br><span> BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK,</span><br><span> BTS_CTR_TS_BORKEN_EV_TEARDOWN,</span><br><span> BTS_CTR_ASSIGNMENT_ATTEMPTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_COMPLETED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_COMPLETED_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_STOPPED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_STOPPED_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_STOPPED_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_NO_CHANNEL,</span><br><span> BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN,</span><br><span> BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_TIMEOUT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_FAILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_FAILED_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_FAILED_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_ERROR_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_ERROR_SPEECH,</span><br><span> BTS_CTR_LOCATION_UPDATE_ACCEPT,</span><br><span> BTS_CTR_LOCATION_UPDATE_REJECT,</span><br><span> BTS_CTR_LOCATION_UPDATE_DETACH,</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 39219a4..2f241e3 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -82,8 +82,23 @@</span><br><span> bsc_ctr_description[BSC_##counter].name, \</span><br><span> bsc_ctr_description[BSC_##counter].description); \</span><br><span> rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_##counter]); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts) \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts) { \</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter]); \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (BTS_##counter != BTS_CTR_ASSIGNMENT_NO_CHANNEL) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (conn->lchan->ch_mode_rate.chan_mode) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SIGN: \</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SIGN]); \</span><br><span style="color: hsl(120, 100%, 40%);">+ break; \</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1: \</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR: \</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_AMR: \</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SPEECH]); \</span><br><span style="color: hsl(120, 100%, 40%);">+ break; \</span><br><span style="color: hsl(120, 100%, 40%);">+ default: \</span><br><span style="color: hsl(120, 100%, 40%);">+ break; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span> } while(0)</span><br><span> </span><br><span> #define assignment_count_result(counter) do { \</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 628d301..548d724 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -938,12 +938,30 @@</span><br><span> [BTS_CTR_ASSIGNMENT_ATTEMPTED] = \</span><br><span> { "assignment:attempted",</span><br><span> "Assignment attempts" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:attempted_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of signaling lchan attempts" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:attempted_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of speech lchan attempts" },</span><br><span> [BTS_CTR_ASSIGNMENT_COMPLETED] = \</span><br><span> { "assignment:completed",</span><br><span> "Assignment completed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_COMPLETED_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:completed_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of signaling lchan completed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:completed_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment if speech lchan completed" },</span><br><span> [BTS_CTR_ASSIGNMENT_STOPPED] = \</span><br><span> { "assignment:stopped",</span><br><span> "Connection ended during Assignment" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_STOPPED_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:stopped_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Connection ended during signaling lchan Assignment" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_STOPPED_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:stopped_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Connection ended during speech lchan Assignment" },</span><br><span> [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = \</span><br><span> { "assignment:no_channel",</span><br><span> "Failure to allocate lchan for Assignment" },</span><br><span>@@ -956,12 +974,30 @@</span><br><span> [BTS_CTR_ASSIGNMENT_TIMEOUT] = \</span><br><span> { "assignment:timeout",</span><br><span> "Assignment timed out" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:timeout_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of signaling lchan timed out" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:timeout_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of speech lchan timed out" },</span><br><span> [BTS_CTR_ASSIGNMENT_FAILED] = \</span><br><span> { "assignment:failed",</span><br><span> "Received Assignment Failure message" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_FAILED_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:failed_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received Assignment Failure message on signaling lchan" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_FAILED_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:failed_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received Assignment Failure message on speech lchan" },</span><br><span> [BTS_CTR_ASSIGNMENT_ERROR] = \</span><br><span> { "assignment:error",</span><br><span> "Assignment failed for other reason" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_ERROR_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:error_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of signaling lchan failed for other reason" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_ERROR_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:error_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment of speech lchan failed for other reason" },</span><br><span> [BTS_CTR_LOCATION_UPDATE_ACCEPT] = \</span><br><span> { "location_update:accept",</span><br><span> "Location Update Accept" },</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22947">change 22947</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/22947"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 </div>
<div style="display:none"> Gerrit-Change-Number: 22947 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: iedemam <michael@kapsulate.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>