This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15427 ) Change subject: Use osmo_tdef for BSSGP T1 and T2 ...................................................................... Use osmo_tdef for BSSGP T1 and T2 Change-Id: I477e5b702c8b956136d93fc1cee01991233e381f --- M src/bts.cpp M src/gprs_bssgp_pcu.cpp 2 files changed, 9 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index 1b2ab2f..2600d72 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -77,6 +77,8 @@ { .T=0, .default_val=0, .unit=OSMO_TDEF_S, .desc=NULL, .val=0 } /* empty item at the end */ }; static struct osmo_tdef T_defs_pcu[] = { + { .T=1, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 }, + { .T=2, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 }, { .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)", .val=0 }, { .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 }, { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 }, diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index ce56154..abcb106 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -33,9 +33,6 @@ #include "coding_scheme.h" } -#define BSSGP_TIMER_T1 30 /* Guards the (un)blocking procedures */ -#define BSSGP_TIMER_T2 30 /* Guards the reset procedure */ - /* Tuning parameters for BSSGP flow control */ #define FC_DEFAULT_LIFE_TIME_SECS 10 /* experimental value, 10s */ #define FC_MS_BUCKET_SIZE_BY_BMAX(bmax) ((bmax) / 2 + 500) /* experimental */ @@ -830,10 +827,12 @@ static void bvc_timeout(void *_priv) { + unsigned long secs; if (!the_pcu.bvc_sig_reset) { LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI 0\n"); bssgp_tx_bvc_reset(the_pcu.bctx, 0, BSSGP_CAUSE_OML_INTERV); - osmo_timer_schedule(&the_pcu.bvc_timer, BSSGP_TIMER_T2, 0); + secs = osmo_tdef_get(the_pcu.bts->T_defs_pcu, 2, OSMO_TDEF_S, -1); + osmo_timer_schedule(&the_pcu.bvc_timer, secs, 0); return; } @@ -841,7 +840,8 @@ LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI %d\n", the_pcu.bctx->bvci); bssgp_tx_bvc_reset(the_pcu.bctx, the_pcu.bctx->bvci, BSSGP_CAUSE_OML_INTERV); - osmo_timer_schedule(&the_pcu.bvc_timer, BSSGP_TIMER_T2, 0); + secs = osmo_tdef_get(the_pcu.bts->T_defs_pcu, 2, OSMO_TDEF_S, -1); + osmo_timer_schedule(&the_pcu.bvc_timer, secs, 0); return; } @@ -849,7 +849,8 @@ LOGP(DBSSGP, LOGL_INFO, "Sending unblock on BVCI %d\n", the_pcu.bctx->bvci); bssgp_tx_bvc_unblock(the_pcu.bctx); - osmo_timer_schedule(&the_pcu.bvc_timer, BSSGP_TIMER_T1, 0); + secs = osmo_tdef_get(the_pcu.bts->T_defs_pcu, 1, OSMO_TDEF_S, -1); + osmo_timer_schedule(&the_pcu.bvc_timer, secs, 0); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I477e5b702c8b956136d93fc1cee01991233e381f Gerrit-Change-Number: 15427 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at gnumonks.org> Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190916/31279e0f/attachment.htm>