[PATCH] osmo-pcu[master]: introduce new counter rlc_sent_dummy
Review at https://gerrit.osmocom.org/85 introduce new counter rlc_sent_dummy rlc_sent_dummy count the amount of dummy package which are sent in case no data packet is in the queue. Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/85/1 diff --git a/src/bts.cpp b/src/bts.cpp index ccc433b..a8b27bd 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -71,6 +71,7 @@ { "rlc.ack.failed", "RLC Ack Failed" }, { "rlc.rel.timedout", "RLC Release Timeout" }, { "rlc.late-block", "RLC Late Block" }, + { "rlc.sent_dummy", "RLC Send Dummy" }, { "decode.errors", "Decode Errors" }, { "sba.allocated", "SBA Allocated" }, { "sba.freed", "SBA Freed" }, diff --git a/src/bts.h b/src/bts.h index c975304..829e3c2 100644 --- a/src/bts.h +++ b/src/bts.h @@ -233,6 +233,7 @@ CTR_RLC_ACK_FAILED, CTR_RLC_REL_TIMEDOUT, CTR_RLC_LATE_BLOCK, + CTR_RLC_SENT_DUMMY, CTR_DECODE_ERRORS, CTR_SBA_ALLOCATED, CTR_SBA_FREED, @@ -309,6 +310,7 @@ void rlc_ack_failed(); void rlc_rel_timedout(); void rlc_late_block(); + void rlc_sent_dummy(); void decode_error(); void sba_allocated(); void sba_freed(); @@ -449,6 +451,7 @@ CREATE_COUNT_INLINE(rlc_ack_failed, CTR_RLC_ACK_FAILED); 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(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 8e05623..087c03c 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -348,8 +348,12 @@ } /* Prio 3: send dummy contol message */ - if (!msg) + if (!msg) { + /* increase counter */ msg = sched_dummy(); + if (msg) + bts->bts->rlc_sent_dummy(); + } if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>
Patch Set 1: Please rebase and have the dummy spaces to match the layout. -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/85 to look at the new patch set (#2). introduce new counter rlc_sent_dummy rlc_sent_dummy count the amount of dummy package which are sent in case no data packet is in the queue. Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/85/2 diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..dcedcd0 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -71,6 +71,7 @@ { "rlc.ack.failed", "RLC Ack Failed "}, { "rlc.rel.timedout", "RLC Release Timeout "}, { "rlc.late-block", "RLC Late Block "}, + { "rlc.sent_dummy", "RLC Send Dummy "}, { "decode.errors", "Decode Errors "}, { "sba.allocated", "SBA Allocated "}, { "sba.freed", "SBA Freed "}, diff --git a/src/bts.h b/src/bts.h index c975304..829e3c2 100644 --- a/src/bts.h +++ b/src/bts.h @@ -233,6 +233,7 @@ CTR_RLC_ACK_FAILED, CTR_RLC_REL_TIMEDOUT, CTR_RLC_LATE_BLOCK, + CTR_RLC_SENT_DUMMY, CTR_DECODE_ERRORS, CTR_SBA_ALLOCATED, CTR_SBA_FREED, @@ -309,6 +310,7 @@ void rlc_ack_failed(); void rlc_rel_timedout(); void rlc_late_block(); + void rlc_sent_dummy(); void decode_error(); void sba_allocated(); void sba_freed(); @@ -449,6 +451,7 @@ CREATE_COUNT_INLINE(rlc_ack_failed, CTR_RLC_ACK_FAILED); 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(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 8e05623..087c03c 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -348,8 +348,12 @@ } /* Prio 3: send dummy contol message */ - if (!msg) + if (!msg) { + /* increase counter */ msg = sched_dummy(); + if (msg) + bts->bts->rlc_sent_dummy(); + } if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/85/2/src/bts.cpp File src/bts.cpp: PS2, Line 74: Send past vs. present tense here. As this is user facing we might want to be picky here? -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/85 to look at the new patch set (#3). introduce new counter rlc_sent_dummy rlc_sent_dummy count the amount of dummy package which are sent in case no data packet is in the queue. Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/85/3 diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..a182317 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -71,6 +71,7 @@ { "rlc.ack.failed", "RLC Ack Failed "}, { "rlc.rel.timedout", "RLC Release Timeout "}, { "rlc.late-block", "RLC Late Block "}, + { "rlc.sent_dummy", "RLC Sent Dummy "}, { "decode.errors", "Decode Errors "}, { "sba.allocated", "SBA Allocated "}, { "sba.freed", "SBA Freed "}, diff --git a/src/bts.h b/src/bts.h index c975304..829e3c2 100644 --- a/src/bts.h +++ b/src/bts.h @@ -233,6 +233,7 @@ CTR_RLC_ACK_FAILED, CTR_RLC_REL_TIMEDOUT, CTR_RLC_LATE_BLOCK, + CTR_RLC_SENT_DUMMY, CTR_DECODE_ERRORS, CTR_SBA_ALLOCATED, CTR_SBA_FREED, @@ -309,6 +310,7 @@ void rlc_ack_failed(); void rlc_rel_timedout(); void rlc_late_block(); + void rlc_sent_dummy(); void decode_error(); void sba_allocated(); void sba_freed(); @@ -449,6 +451,7 @@ CREATE_COUNT_INLINE(rlc_ack_failed, CTR_RLC_ACK_FAILED); 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(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 8e05623..087c03c 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -348,8 +348,12 @@ } /* Prio 3: send dummy contol message */ - if (!msg) + if (!msg) { + /* increase counter */ msg = sched_dummy(); + if (msg) + bts->bts->rlc_sent_dummy(); + } if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 3 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 3 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
Holger Freyther has submitted this change and it was merged. Change subject: introduce new counter rlc_sent_dummy ...................................................................... introduce new counter rlc_sent_dummy rlc_sent_dummy count the amount of dummy package which are sent in case no data packet is in the queue. Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Reviewed-on: https://gerrit.osmocom.org/85 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther <holger@freyther.de> --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..a182317 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -71,6 +71,7 @@ { "rlc.ack.failed", "RLC Ack Failed "}, { "rlc.rel.timedout", "RLC Release Timeout "}, { "rlc.late-block", "RLC Late Block "}, + { "rlc.sent_dummy", "RLC Sent Dummy "}, { "decode.errors", "Decode Errors "}, { "sba.allocated", "SBA Allocated "}, { "sba.freed", "SBA Freed "}, diff --git a/src/bts.h b/src/bts.h index c975304..829e3c2 100644 --- a/src/bts.h +++ b/src/bts.h @@ -233,6 +233,7 @@ CTR_RLC_ACK_FAILED, CTR_RLC_REL_TIMEDOUT, CTR_RLC_LATE_BLOCK, + CTR_RLC_SENT_DUMMY, CTR_DECODE_ERRORS, CTR_SBA_ALLOCATED, CTR_SBA_FREED, @@ -309,6 +310,7 @@ void rlc_ack_failed(); void rlc_rel_timedout(); void rlc_late_block(); + void rlc_sent_dummy(); void decode_error(); void sba_allocated(); void sba_freed(); @@ -449,6 +451,7 @@ CREATE_COUNT_INLINE(rlc_ack_failed, CTR_RLC_ACK_FAILED); 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(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 8e05623..087c03c 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -348,8 +348,12 @@ } /* Prio 3: send dummy contol message */ - if (!msg) + if (!msg) { + /* increase counter */ msg = sched_dummy(); + if (msg) + bts->bts->rlc_sent_dummy(); + } if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/85 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia60eab853d9145980f30d63e4ce4b520b8c51381 Gerrit-PatchSet: 4 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> Gerrit-Reviewer: Jenkins Builder
participants (2)
-
Holger Freyther -
lynxis lazus