Change in ...osmo-pcu[master]: Use osmo_tdef for BSSGP T1 and T2

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.org
Thu Sep 5 14:22:18 UTC 2019


pespin has uploaded this change for review. ( 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, 11 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/15427/1

diff --git a/src/bts.cpp b/src/bts.cpp
index 44027ce..33ca309 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -68,6 +68,8 @@
 
 static BTS s_bts;
 
+#define BSSGP_T1_SECS	30	/* Guards the (un)blocking procedures */
+#define BSSGP_T2_SECS	30	/* Guards the reset procedure */
 #define T3142_SECS 20
 #define T3169_SECS 5
 #define T3191_SECS 5
@@ -78,6 +80,8 @@
 #define X2002_MSECS 200
 
 static struct osmo_tdef bts_T_defs[] = {
+	{ .T=1, .default_val=BSSGP_T1_SECS, .desc="BSSGP (un)blocking procedures timer (s)" },
+	{ .T=2, .default_val=BSSGP_T2_SECS, .desc="BSSGP reset procedure timer (s)" },
 	{ .T=3142, .default_val=T3142_SECS, .desc="timer (s)" },
 	{ .T=3169, .default_val=T3169_SECS, .desc="timer (s)" },
 	{ .T=3191, .default_val=T3191_SECS, .desc="timer (s)" },
diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp
index ce56154..4fdf338 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, 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, 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, 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: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190905/315a7478/attachment.htm>


More information about the gerrit-log mailing list