dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28170 )
Change subject: filesystem: also return the encoded FCP from probe_file
......................................................................
filesystem: also return the encoded FCP from probe_file
The method probe_file returns the decoded FCP after it managed to
successfully probe the file. Lets also return the encoded FCP string, as
it is needed by the caller.
Change-Id: Ia5659e106fb0d6fb8b77506a10eba309e764723e
---
M pySim/filesystem.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/28170/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 5bbd57b..7c5d49a 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -1402,7 +1402,7 @@
self.selected_file.add_files([f])
self.selected_file = f
- return select_resp
+ return select_resp, data
def _select_pre(self, cmd_app):
# unregister commands of old file
@@ -1487,7 +1487,8 @@
raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1]))
select_resp = f.decode_select_response(data)
else:
- select_resp = self.probe_file(name, cmd_app)
+ (select_resp, data) = self.probe_file(name, cmd_app)
+
# store the raw + decoded FCP for later reference
self.selected_file_fcp_hex = data
self.selected_file_fcp = select_resp
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28170
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ia5659e106fb0d6fb8b77506a10eba309e764723e
Gerrit-Change-Number: 28170
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: iedemam, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 )
Change subject: stats: new trackers for lchan life duration (v2)
......................................................................
Patch Set 2:
(2 comments)
Patchset:
PS2:
> nsecs
ok so that's usually in the range of 256-512usecs, so <1ms. That's fine.
PS2:
Letting you find out the issue with huge jumps in time until providing +1.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0
Gerrit-Change-Number: 28165
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 May 2022 12:05:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: iedemam <michael(a)kapsulate.com>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: iedemam, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 )
Change subject: stats: new trackers for lchan life duration (v2)
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> Hi all, […]
Are these figures in usecs?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0
Gerrit-Change-Number: 28165
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 May 2022 11:56:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: iedemam <michael(a)kapsulate.com>
Gerrit-MessageType: comment
Attention is currently required from: neels, pespin.
iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 )
Change subject: stats: new trackers for lchan life duration (v2)
......................................................................
Patch Set 2:
(4 comments)
Patchset:
PS2:
Hi all,
I measured 20 minutes worth of performance data (in nsecs) from this and the other global BSC timers for comparison. This is on a BSC with 82 active BTS, 4500 SDCCH and 3200 TCH/H defined. During the measurement, 800-1000 SDCCH and 450-600 TCH/H were active at any given time.
@hist_update_t3122_chan_load_timer:
[4K, 8K) 13 | |
[8K, 16K) 21 |@ |
[16K, 32K) 16 | |
[32K, 64K) 2 | |
[64K, 128K) 3 | |
[128K, 256K) 331 |@@@@@@@@@@@@@@@@@@@@ |
[256K, 512K) 836 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[512K, 1M) 48 |@@ |
@hist_bsc_store_bts_uptime:
[16K, 32K) 88 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[32K, 64K) 35 |@@@@@@@@@@@@@@@@@@@@ |
[64K, 128K) 4 |@@ |
@hist_bsc_store_bts_lchan_durations:
[4K, 8K) 9 | |
[8K, 16K) 10 | |
[16K, 32K) 31 |@ |
[32K, 64K) 2 | |
[64K, 128K) 0 | |
[128K, 256K) 6 | |
[256K, 512K) 1208 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[512K, 1M) 2 | |
[1M, 2M) 0 | |
[2M, 4M) 2 | |
I still have an accuracy problem to work out as it seems uninitialized (active_stored) values are being used causing huge leaps in duration.
Let me know if this performance impact seems acceptable. To me, it looks a bit heavier than the t3122 management but not by much.
Thanks,
-Michael
File src/osmo-bsc/bts.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28165/comment/f2e0f557_3842c764
PS1, Line 768: if (!lchan->activate.concluded)
> Nevermind this one, I was confused. I think the comment is actually confusing. […]
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/28165/comment/8bb82c1e_ff1b6cdf
PS1, Line 772: timespecsub(&now, &lchan->active_stored, &elapsed);
> what if it's first time? active_stored is {0,0} ? […]
I believe more checks are needed. In testing on a fully loaded system, I see some massive durations being sent which makes me think we're reaching this point but active_stored hasn't yet been initialized.
File src/osmo-bsc/bts_trx_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28165/comment/ddd011c5_06603de7
PS1, Line 574: vty_out(vty, " Activated %s seconds ago%s",
> "Active for: %d seconds%s" would probably fit more in existing print format.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0
Gerrit-Change-Number: 28165
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 May 2022 11:05:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: iedemam, neels.
Hello Jenkins Builder, neels, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/28165
to look at the new patch set (#2).
Change subject: stats: new trackers for lchan life duration (v2)
......................................................................
stats: new trackers for lchan life duration (v2)
This patch adds two stats which track cummulative lchan lifetime by
type TCH and SDCCH. These new counters will accomplish two things:
1) Provide a glanceable way to see if lchan durations look healthy. When
examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans
are difficult to tell apart. If we only see short-lived TCH lchans,
there is most likely an RF or signaling problem to investigate. This
new counter will expose channel ages in the VTY output
2) Provide a more accurate count for Erlangs per site. Currently, we
are basing Erlangs on active TCH channel counts per stats period. This
method skews high very quickly. Each active TCH in that period
translates into the full 10s of activity. This counter should improve
accuracy by two orders of magnitude.
Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_init.c
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
8 files changed, 140 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/28165/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0
Gerrit-Change-Number: 28165
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/28163
to look at the new patch set (#2).
Change subject: pySim-shell: make APDU command available on the lowest level
......................................................................
pySim-shell: make APDU command available on the lowest level
The apdu command is used to communicate with the card on the lowest
possible level. Lets make it available even before a card profile (rs)
is avalable. This is especially useful when the card has no files on it,
in this situation pySim-shell will not be able to assign a profile to
the card at all. We can then use the apdu command to equip the card with
the most basic files and start over.
Change-Id: I601b8f17bd6af41dcbf7bbb53c75903dd46beee7
---
M pySim-shell.py
1 file changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/28163/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28163
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I601b8f17bd6af41dcbf7bbb53c75903dd46beee7
Gerrit-Change-Number: 28163
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin, daniel, Christian Amsüss, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28159 )
Change subject: pySim-shell: more generic export options
......................................................................
Patch Set 1:
(1 comment)
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/28159/comment/01699522_357c4ed3
PS1, Line 464: opts={}
Agreeing with Harald, '**kwargs' would be a more Pytonic way. See:
https://book.pythontips.com/en/latest/args_and_kwargs.html#usage-of-kwargs
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28159
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie860eec918e7cdb01651642f4bc2474c9fb1924f
Gerrit-Change-Number: 28159
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Christian Amsüss <chrysn(a)fsfe.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 May 2022 08:51:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28167 )
Change subject: ggsn: Fix seq_nr overflow
......................................................................
ggsn: Fix seq_nr overflow
As seen running a test:
GTP_Templates.ttcn:87 Dynamic test case error: The first argument of function int2oct(), which is 65536, does not fit in 2 octets.
Change-Id: Icbaf42879bade6f5b4e39144ec123bc1b3f893f8
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index ae2a9bf..3993ad6 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -369,14 +369,14 @@
/* send GTP-C for a given context and increment sequence number */
function f_send_gtpc(in template Gtp1cUnitdata data) runs on GT_CT {
GTPC.send(data);
- g_c_seq_nr := g_c_seq_nr + 1;
+ g_c_seq_nr := (g_c_seq_nr + 1) mod 65536;
}
/* send GTP-U for a given context and increment sequence number */
function f_send_gtpu(inout PdpContext ctx, in octetstring data) runs on GT_CT {
if (use_gtpu_txseq) {
GTPU.send(ts_GTP1U_GPDU(g_peer_u, g_d_seq_nr, ctx.teid_remote, data));
- g_d_seq_nr := g_d_seq_nr + 1;
+ g_d_seq_nr := (g_d_seq_nr + 1) mod 65536;
} else {
GTPU.send(ts_GTP1U_GPDU(g_peer_u, omit, ctx.teid_remote, data));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28167
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Icbaf42879bade6f5b4e39144ec123bc1b3f893f8
Gerrit-Change-Number: 28167
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged