November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ggsn[master]: Split gsn_t related APIs out of gtp.{c,h}

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29965 ) Change subject: Split gsn_t related APIs out of gtp.{c,h} ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I'm not really seeing it as an improvement, so maybe some more line[s] in the commitlog as to the mo […] The sepration doesn't look optimal at this point because the code is quite entangled, with some socket related functionality and gtp dec/enc in the same function. But at least it's a start. This is just a step towards having the code more organized, since I'm going to extend it during follow-up commits: I'm adding rate_ctr definitions, osmo_tdef definitions, etc. so the file size will grow by some quite lines. Hence having this split beforehand already makes the file sizes more manageable. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I47cebb51bf08b9fcf7f115fc8dbea5f3493d4388 Gerrit-Change-Number: 29965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 02 Nov 2022 16:53:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: tune sched_clck related logging levels

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29940 ) Change subject: trxcon: tune sched_clck related logging levels ...................................................................... trxcon: tune sched_clck related logging levels Change-Id: Iad57d2d7158c6ff037630acaa08ae3b9940448e2 --- M src/host/trxcon/src/sched_clck.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index a3d75fc..f08156c 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -51,7 +51,7 @@ /* Check if transceiver is still alive */ if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) { - LOGP_SCHEDC(sched, LOGL_DEBUG, "No more clock from transceiver\n"); + LOGP_SCHEDC(sched, LOGL_NOTICE, "No more clock from transceiver\n"); sched->clck_state = L1SCHED_CLCK_ST_WAIT; return; @@ -124,13 +124,13 @@ if (sched->clck_state == L1SCHED_CLCK_ST_WAIT) { l1sched_clck_correct(sched, &tv_now, fn); - LOGP_SCHEDC(sched, LOGL_DEBUG, "Initial clock received: fn=%u\n", fn); + LOGP_SCHEDC(sched, LOGL_NOTICE, "Initial clock received: fn=%u\n", fn); sched->clck_state = L1SCHED_CLCK_ST_OK; return 0; } - LOGP_SCHEDC(sched, LOGL_NOTICE, "Clock indication: fn=%u\n", fn); + LOGP_SCHEDC(sched, LOGL_DEBUG, "Clock indication: fn=%u\n", fn); osmo_timer_del(&sched->clock_timer); @@ -151,7 +151,7 @@ return 0; } - LOGP_SCHEDC(sched, LOGL_INFO, "GSM clock jitter: %" PRId64 "\n", + LOGP_SCHEDC(sched, LOGL_DEBUG, "GSM clock jitter: %" PRId64 "\n", elapsed_fn * GSM_TDMA_FN_DURATION_uS - elapsed_us); /* Too many frames have been processed already */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iad57d2d7158c6ff037630acaa08ae3b9940448e2 Gerrit-Change-Number: 29940 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: drop sched->clock_cb(), expose l1sched_trigger()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29954 ) Change subject: trxcon: drop sched->clock_cb(), expose l1sched_trigger() ...................................................................... trxcon: drop sched->clock_cb(), expose l1sched_trigger() It does not make sense to call function sched_frame_clck_cb() via a configurable pointer in the l1sched_state. Make this function public (thus rename) and call it directly. Remove the .clock_cb. Having l1sched_trigger() globally available makes it possible to call this function directly, bypassing the internal timer driven clock module. This is needed for the integration with osmo-trx-ms. Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_clck.c M src/host/trxcon/src/sched_trx.c 3 files changed, 9 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 9686562..3eadbbf 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -372,8 +372,6 @@ uint32_t fn_counter_lost; /*! Frame callback timer */ struct osmo_timer_list clock_timer; - /*! Frame callback */ - void (*clock_cb)(struct l1sched_state *sched); /*! List of timeslots maintained by this scheduler */ struct l1sched_ts *ts[TRX_TS_COUNT]; /*! SACCH cache (common for all lchans) */ @@ -490,8 +488,10 @@ void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_meas_set *meas); void l1sched_lchan_meas_avg(struct l1sched_lchan_state *lchan, unsigned int n); +/* Clock and Downlink scheduling trigger */ int l1sched_clck_handle(struct l1sched_state *sched, uint32_t fn); void l1sched_clck_reset(struct l1sched_state *sched); +void l1sched_trigger(struct l1sched_state *sched); /* External L1 API, must be implemented by the API user */ int l1sched_handle_config_req(struct l1sched_state *sched, diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index f08156c..ccafd7b 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -81,9 +81,8 @@ GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } osmo_timer_schedule(&sched->clock_timer, 0, @@ -95,9 +94,8 @@ { sched->fn_counter_proc = fn; - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); /* Schedule first FN clock */ sched->clock = *tv_now; @@ -177,9 +175,8 @@ while (fn != sched->fn_counter_proc) { GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } /* Schedule next FN to be transmitted */ diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index be1f820..c36b7de 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -85,7 +85,7 @@ static void l1sched_a5_burst_enc(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); -static void sched_frame_clck_cb(struct l1sched_state *sched) +void l1sched_trigger(struct l1sched_state *sched) { struct l1sched_burst_req br[TRX_TS_COUNT]; const struct l1sched_tdma_frame *frame; @@ -199,7 +199,6 @@ *sched = (struct l1sched_state) { /* .clock_timer is set up in l1sched_clck_correct() */ - .clock_cb = &sched_frame_clck_cb, .fn_counter_advance = cfg->fn_advance, .priv = priv, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Gerrit-Change-Number: 29954 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: drop sched->clock_cb(), expose l1sched_trigger()

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29954 ) Change subject: trxcon: drop sched->clock_cb(), expose l1sched_trigger() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Gerrit-Change-Number: 29954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 16:14:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: tune sched_clck related logging levels

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29940 ) Change subject: trxcon: tune sched_clck related logging levels ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iad57d2d7158c6ff037630acaa08ae3b9940448e2 Gerrit-Change-Number: 29940 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 16:14:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests TC_ul_tbf_{1,2}phase_while_dl_ass_pch

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29934 ) Change subject: pcu: Introduce tests TC_ul_tbf_{1,2}phase_while_dl_ass_pch ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29934 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: I6a72c36265bfdc757180cbb466492ad6bbbf16ad Gerrit-Change-Number: 29934 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 15:45:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Fix missing quotes for possibly unresolved variables in shell test-st...

by laforge

Attention is currently required from: osmith, arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 ) Change subject: Fix missing quotes for possibly unresolved variables in shell test-statements ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 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: I7e7f4f95d1a7cc886360c733908c63a2843b0906 Gerrit-Change-Number: 29961 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 15:44:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ggsn[master]: Split gsn_t related APIs out of gtp.{c,h}

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29965 ) Change subject: Split gsn_t related APIs out of gtp.{c,h} ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'm not really seeing it as an improvement, so maybe some more line[s] in the commitlog as to the motivation/goal might be useful. Not saying I'm against it either, don't get me wrong. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I47cebb51bf08b9fcf7f115fc8dbea5f3493d4388 Gerrit-Change-Number: 29965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 15:43:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ggsn[master]: cosmetic: gtp: Fix typo in comment

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29964 ) Change subject: cosmetic: gtp: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54b80bba3126cb3ae534938e253721961d4e08c4 Gerrit-Change-Number: 29964 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 15:41:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1d[master]: Differentiate between icE1usb and e1-tracer in log/vty output

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29962 ) Change subject: Differentiate between icE1usb and e1-tracer in log/vty output ...................................................................... Differentiate between icE1usb and e1-tracer in log/vty output Now that we support the e1-tracer in addition to icE1usb, let's differentiate in the log output. Change-Id: Iea647b12d86c97cfacbc3df43010b9b94f0a97c7 --- M src/usb.c M src/vty.c 2 files changed, 9 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index 35e1894..fc461c4 100644 --- a/src/usb.c +++ b/src/usb.c @@ -825,6 +825,10 @@ libusb_device_handle *devh; int line_nr = 0; int i, j, ret; + const char *hwname = "icE1usb"; + + if (is_tracer) + hwname = "e1-tracer"; ret = libusb_open(dev, &devh); if (ret) { @@ -853,7 +857,7 @@ /* try to find the matching interface config created by the vty */ intf = e1d_find_intf_by_usb_serial(e1d, serial_str); if (intf) { - LOGP(DE1D, LOGL_INFO, "Configuration for icE1usb serial '%s' found\n", serial_str); + LOGP(DE1D, LOGL_INFO, "Configuration for %s serial '%s' found\n", hwname, serial_str); auto_create_lines = false; if (intf->drv_data) { LOGP(DE1D, LOGL_ERROR, "New device with serial '%s', but E1 interface %u busy\n", @@ -865,8 +869,8 @@ intf_data->devh = devh; intf->drv_data = intf_data; } else { - LOGP(DE1D, LOGL_NOTICE, "No configuration for icE1usb serial '%s' found, " - "auto-generating it\n", serial_str); + LOGP(DE1D, LOGL_NOTICE, "No configuration for %s serial '%s' found, " + "auto-generating it\n", hwname, serial_str); auto_create_lines = true; intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); intf_data->devh = devh; @@ -888,7 +892,7 @@ ret = libusb_get_active_config_descriptor(dev, &cd); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device: %s\n", libusb_strerror(ret)); + LOGP(DE1D, LOGL_ERROR, "Failed to talk to %s usb device: %s\n", hwname, libusb_strerror(ret)); intf_data->devh = NULL; talloc_free(intf_data); if (auto_create_lines) diff --git a/src/vty.c b/src/vty.c index d3433da..6507937 100644 --- a/src/vty.c +++ b/src/vty.c @@ -242,7 +242,7 @@ } DEFUN(cfg_e1d_if_icE1usb, cfg_e1d_if_icE1usb_cmd, "interface <0-255> icE1usb", - "Configure an icE1usb E1 interface\n" + "Configure an icE1usb/e1-tracer E1 interface\n" "E1 Interface Number\n") { struct e1_intf *intf; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea647b12d86c97cfacbc3df43010b9b94f0a97c7 Gerrit-Change-Number: 29962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022