- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: make/Makefile: generalize passing additional build arguments
by osmith 07 Feb '22

07 Feb '22

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27072 ) Change subject: make/Makefile: generalize passing additional build arguments ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f Gerrit-Change-Number: 27072 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 09:44:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
by fixeria 07 Feb '22

07 Feb '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27077 ) Change subject: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps' Change-Id: I8fe9ff0b7c27ae7c71bd9bac6048b3073adf6bda --- M debian-bullseye-titan/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 1c22456..b4b6532 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -60,7 +60,7 @@ # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ - make -C /osmo-ttcn3-hacks deps + make -j8 -C /osmo-ttcn3-hacks deps ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8fe9ff0b7c27ae7c71bd9bac6048b3073adf6bda Gerrit-Change-Number: 27077 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in docker-playground[master]: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
by fixeria 07 Feb '22

07 Feb '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27077 ) Change subject: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8fe9ff0b7c27ae7c71bd9bac6048b3073adf6bda Gerrit-Change-Number: 27077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 09:37:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
by osmith 07 Feb '22

07 Feb '22

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27077 ) Change subject: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8fe9ff0b7c27ae7c71bd9bac6048b3073adf6bda Gerrit-Change-Number: 27077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 09:37:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
by fixeria 07 Feb '22

07 Feb '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27077 ) Change subject: fixup: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8fe9ff0b7c27ae7c71bd9bac6048b3073adf6bda Gerrit-Change-Number: 27077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 09:35:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: open5gs-master: install dependencies using apt-get build-dep
by fixeria 07 Feb '22

07 Feb '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 ) Change subject: open5gs-master: install dependencies using apt-get build-dep ...................................................................... Patch Set 3: (1 comment) File open5gs-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/27070/comment/a9f1dee2_fdb… PS3, Line 32: ADD https://api.github.com/repos/$GITHUB_USER/$GITHUB_REPO/git/refs/heads/$OPEN… /root/open5gs-ver.json > This ADD line needs to be moved below the first "apt-get build-dep -y . […] Ah, indeed, thanks! Will do. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 09:29:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/master-builds-dahdi.yml: new file
by osmith 07 Feb '22

07 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27071 ) Change subject: jobs/master-builds-dahdi.yml: new file ...................................................................... jobs/master-builds-dahdi.yml: new file Related: OS#5407 Depends: dahdi-linux I904ab66a1ecd72492642ac2cc4cb102c7283c590 Change-Id: I8a479d0a214ff56c5b66f468a1c2b1b2f674e091 --- A jobs/master-builds-dahdi.yml 1 file changed, 80 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml new file mode 100644 index 0000000..58a6b57 --- /dev/null +++ b/jobs/master-builds-dahdi.yml @@ -0,0 +1,80 @@ +- project: + name: master-builds-dahdi-linux + node: osmocom-gerrit-debian9 + linux-ver: + - "v4.19" + - "v5.10" + - "master" + jobs: + - 'master-dahdi-linux-{linux-ver}' + +- job-template: + name: 'master-dahdi-linux-{linux-ver}' + project-type: freestyle + node: osmocom-master-debian9 + concurrent: true + retry-count: 0 # scm checkout + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 120 + artifact-days-to-keep: -1 + artifact-num-to-keep: -1 + description: | + Automatic jenkins test job of + <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a> + built against linux {linux-ver} + (<a href="https://osmocom.org/issues/5407">OS#5407</a>) + + Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY! + + scm: + - git: + basedir: 'dahdi-linux' + url: 'https://gerrit.osmocom.org/dahdi-linux' + credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d + branches: + - 'origin/master' + # When the gerrit git repository is configured to wipe-workspace, the + # linux.git clone gets removed as well. Cloning the linux repo takes a + # long time, so only clean both repos, don't remove them. + wipe-workspace: false + clean: + before: true + skip-tag: true + submodule: + recursive: true + - git: + basedir: 'linux' + url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' + branches: + - '{linux-ver}' + refspec: '{linux-ver}' + shallow-clone: true + wipe-workspace: false + clean: + before: true + + triggers: + - timed: "H H * * *" + + builders: + - shell: | + docker run \ + --rm=true \ + -e "KSRC=/linux" \ + -v "$PWD/dahdi-linux:/build" \ + -v "$PWD/linux:/linux" \ + "$USER/debian-stretch-jenkins" \ + timeout 10m su build -c /build/contrib/jenkins.sh + + publishers: + - warnings: + console-log-parsers: + - 'GNU C Compiler 4 (gcc)' + resolve-relative-paths: true + - email: + recipients: 'jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org' + send-to-individuals: true + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8a479d0a214ff56c5b66f468a1c2b1b2f674e091 Gerrit-Change-Number: 27071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: jobs/gerrit-verifications-dahdi.yml: new file
by osmith 07 Feb '22

07 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27066 ) Change subject: jobs/gerrit-verifications-dahdi.yml: new file ...................................................................... jobs/gerrit-verifications-dahdi.yml: new file Add gerrit verifications for the out-of-tree dahdi-linux kernel module. Put this in a separate file (not gerrit-verifications.yml), because: * not only gerrit git repo gets cloned, but also linux.git, and caching needs to be done properly for it * so we can have one separate job per linux version that gets tested Test v4.19 and v5.10 for now, as suggested in the issue. Related: OS#5407 Depends: docker-playground Id72d19ad08681cd7cb3194de2226292f19e96df5 Change-Id: I65c7663a6b8045796536a727e4adf5554f16b2a9 --- A jobs/gerrit-verifications-dahdi.yml 1 file changed, 98 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml new file mode 100644 index 0000000..30c223e --- /dev/null +++ b/jobs/gerrit-verifications-dahdi.yml @@ -0,0 +1,98 @@ +- project: + name: gerrit-dahdi-linux + node: osmocom-gerrit-debian9 + linux-ver: + - "v4.19" + - "v5.10" + jobs: + - 'gerrit-dahdi-linux-{linux-ver}' + +- job-template: + name: 'gerrit-dahdi-linux-{linux-ver}' + project-type: freestyle + node: osmocom-gerrit-debian9 + concurrent: true + retry-count: 0 # scm checkout + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 120 + artifact-days-to-keep: -1 + artifact-num-to-keep: -1 + description: | + Pending gerrit code reviews of + <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a> + built against linux {linux-ver} + (<a href="https://osmocom.org/issues/5407">OS#5407</a>) + + Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY! + + scm: + - git: + basedir: 'dahdi-linux' + url: 'https://gerrit.osmocom.org/dahdi-linux' + credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d + branches: + - $GERRIT_BRANCH + refspec: $GERRIT_REFSPEC + choosing-strategy: gerrit + # When the gerrit git repository is configured to wipe-workspace, the + # linux.git clone gets removed as well. Cloning the linux repo takes a + # long time, so only clean both repos, don't remove them. + wipe-workspace: false + clean: + before: true + skip-tag: true + submodule: + recursive: true + - git: + basedir: 'linux' + url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' + branches: + - '{linux-ver}' + refspec: '{linux-ver}' + shallow-clone: true + wipe-workspace: false + clean: + before: true + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: true + exclude-no-code-change: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: 'dahdi-linux' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + silent: false + escape-quotes: false + no-name-and-email: false + trigger-for-unreviewed-patches: true + server-name: gerrit.osmocom.org + + builders: + - shell: | + docker run \ + --rm=true \ + -e "KSRC=/linux" \ + -v "$PWD/dahdi-linux:/build" \ + -v "$PWD/linux:/linux" \ + "$USER/debian-stretch-jenkins" \ + timeout 10m su build -c /build/contrib/jenkins.sh + + publishers: + - warnings: + console-log-parsers: + - 'GNU C Compiler 4 (gcc)' + resolve-relative-paths: true + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I65c7663a6b8045796536a727e4adf5554f16b2a9 Gerrit-Change-Number: 27066 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.
by iedemam 07 Feb '22

07 Feb '22

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... WIP: New stats for lchan life duration. Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index c4ee39d..f4c96da 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -74,6 +74,8 @@ BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR, BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RR_CHAN_MODE_MODIFY_ACK, BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RSL_CHAN_MODE_MODIFY_ACK, + BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS, + BTS_CTR_LCHAN_SDCCH_TOTAL_ACTIVE_MILLISECONDS, BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, BTS_CTR_TS_BORKEN_FROM_UNUSED, BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 910c3d3..017aff9 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -748,6 +748,8 @@ * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors * occur later, e.g. during release, that we don't send a NACK out of context. */ bool concluded; + /* Interval timing to capture duration per activation and cummulative active time */ + struct timespec concluded_timestamp; enum gsm0808_cause gsm0808_error_cause; /* Actually used TSC Set. */ int tsc_set; @@ -1125,6 +1127,7 @@ char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); void lchan_update_name(struct gsm_lchan *lchan); +long long gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) { diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 1461585..85161e0 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1082,6 +1082,12 @@ [BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR] = \ { "lchan_borken:event:ts_error", "LCHAN_EV_TS_ERROR received in a BORKEN state" }, + [BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS] = \ + { "lchan_tch:total:active_milliseconds", + "Cummulative number of active milliseconds on TCH lchans" }, + [BTS_CTR_LCHAN_SDCCH_TOTAL_ACTIVE_MILLISECONDS] = \ + { "lchan_sdcch:total:active_milliseconds", + "Cummulative number of active milliseconds on SDCCH lchans" }, [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = \ { "ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state" }, diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index 39584a5..9ef57ad 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -569,6 +569,12 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); + + if (lchan->activate.concluded) { + long long duration_ms = gsm_lchan_active_duration_ms(lchan); + vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE); + } + vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 0c7259b..b06b9a8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3822,6 +3822,22 @@ rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_TOTAL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_NO_CHANNEL)->current, VTY_NEWLINE); + + uint64_t activations_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_TCH)->current; + uint64_t activations_sdcch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_SDCCH)->current; + uint64_t duration_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS)->current; + uint64_t duration_sdcch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_LCHAN_SDCCH_TOTAL_ACTIVE_MILLISECONDS)->current; + vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch); + if (activations_tch > 0) { + vty_out(vty, " (average lifespan %"PRIu64" ms)", duration_tch / activations_tch); + } + vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " %"PRIu64" SDCCH", activations_sdcch); + if (activations_sdcch > 0) { + vty_out(vty, " (average lifespan %"PRIu64" ms)", duration_sdcch / activations_sdcch); + } + vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " Channel Failures : %"PRIu64" rf_failures, %"PRIu64" rll failures%s", rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RF_FAIL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RLL_ERR)->current, diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 38d8a7c..1d165f5 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -345,6 +345,19 @@ lchan->nr - (lchan->vamos.is_secondary ? ts->max_primary_lchans : 0)); } +/* Get duration of active time for this lchan in milliseconds */ +long long gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan) { + long long duration = 0; + if (lchan->activate.concluded) { + struct timespec now; + struct timespec elapsed; + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + timespecsub(&now, &lchan->activate.concluded_timestamp, &elapsed); + duration = elapsed.tv_sec * 1000LL + elapsed.tv_nsec / 1000000; + } + return duration; +} + /* obtain the MO structure for a given object instance */ static inline struct gsm_abis_mo * gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 84f8dc5..e9dbc9f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -203,6 +203,7 @@ if (lchan->activate.concluded) return; lchan->activate.concluded = true; + osmo_clock_gettime(CLOCK_MONOTONIC, &lchan->activate.concluded_timestamp); switch (lchan->activate.info.activ_for) { case ACTIVATE_FOR_MS_CHANNEL_REQUEST: @@ -1806,6 +1807,20 @@ if (!lchan || !lchan->fi || lchan->fi->state == LCHAN_ST_UNUSED) return; + + /* Add active milliseconds to cummulative counts per channel type */ + long long duration_ms = gsm_lchan_active_duration_ms(lchan); + struct rate_ctr_group *bts_ctrs = lchan->ts->trx->bts->bts_ctrs; + if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) { + LOG_LCHAN(lchan, LOGL_INFO, "GSM_LCHAN_TCH was active for %llu milliseconds\n", duration_ms); + rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms); + } else if (lchan->type == GSM_LCHAN_SDCCH) { + LOG_LCHAN(lchan, LOGL_INFO, "GSM_LCHAN_SDCCH was active for %llu milliseconds\n", duration_ms); + rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_SDCCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms); + } else { + LOG_LCHAN(lchan, LOGL_NOTICE, "UNKNOWN CHANNEL TYPE was active for %llu milliseconds\n", duration_ms); + } + if (lchan->release.in_release_handler) return; lchan->release.in_release_handler = true; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

1 0

Change in dahdi-linux[master]: contrib/jenkins.sh: new file
by osmith 07 Feb '22

07 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27059 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Build the kernel module against a given linux tree. This script will be used in CI at jenkins.osmocom.org. Related: OS#5407 Depends: docker-playground Id72d19ad08681cd7cb3194de2226292f19e96df5 Change-Id: I904ab66a1ecd72492642ac2cc4cb102c7283c590 --- A contrib/jenkins.sh 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..eeb3fbc --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,32 @@ +#!/bin/sh -ex +# Build the kernel module against the linux tree in KSRC + +DEFCONFIG="${DEFCONFIG:-x86_64_defconfig}" +TOPDIR="$(realpath "$(dirname "$(realpath "$0")")/..")" +KSRC="${KSRC:-$TOPDIR/../linux}" +JOBS="${JOBS:-9}" + +if ! [ -d "$KSRC" ]; then + set +x + echo "ERROR: KSRC does not exist: $KSRC" + echo "Let the KSRC env var point at a linux source tree and try again." + exit 1 +fi + +cd "$KSRC" + +if ! [ -e ".config" ]; then + make "$DEFCONFIG" +fi + +if [ "arch/x86/configs/$DEFCONFIG" -nt ".config" ]; then + set +x + echo "ERROR: .config inside kernel source tree is older than $DEFCONFIG" + echo "Move/delete/touch .config and try again." + exit 1 +fi + +git log -1 --pretty="%t - %s" + +make -j "$JOBS" modules_prepare +make -j "$JOBS" -C "$TOPDIR" KSRC="$KSRC" -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I904ab66a1ecd72492642ac2cc4cb102c7283c590 Gerrit-Change-Number: 27059 Gerrit-PatchSet: 8 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log