Osmocom Open Build Service

osmo-bsc.spec Changed

commit_1784524392a2d1def2614a136edbbe5b0dd7db16.txt Deleted

commit_94951af66af6b1764ecfe417c79dd894bae4f8cf.txt Added

osmo-bsc_1.9.0.94.17845.dsc -> osmo-bsc_1.9.0.97.94951.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.9.0.94.17845
+Version: 1.9.0.97.94951
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- f5696fe3c344f3d272a6cdba829b5c865d913831 583428 osmo-bsc_1.9.0.94.17845.tar.xz
+ 15a8ec1b2487471d439ba8481c64a0dcd4c5ae0e 583524 osmo-bsc_1.9.0.97.94951.tar.xz
 Checksums-Sha256:
- 6327c1f20d562993edb80ccfbe931150d48d7a17c66da58e18c513cd51f63221 583428 osmo-bsc_1.9.0.94.17845.tar.xz
+ b9b4ccf760fcd779f730ccc4d9a1e6e2bf0230802207cd4c2f45fe6a8ad83c9b 583524 osmo-bsc_1.9.0.97.94951.tar.xz
 Files:
- 77a230531d6b2d987edc491bf8f7f536 583428 osmo-bsc_1.9.0.94.17845.tar.xz
+ 871dcbffc759d0efce1cb358d81e8da4 583524 osmo-bsc_1.9.0.97.94951.tar.xz

osmo-bsc_1.9.0.94.17845.tar.xz/.tarball-version -> osmo-bsc_1.9.0.97.94951.tar.xz/.tarball-version Changed

osmo-bsc_1.9.0.94.17845.tar.xz/debian/changelog -> osmo-bsc_1.9.0.97.94951.tar.xz/debian/changelog Changed

osmo-bsc_1.9.0.94.17845.tar.xz/include/osmocom/bsc/bts.h -> osmo-bsc_1.9.0.97.94951.tar.xz/include/osmocom/bsc/bts.h Changed

osmo-bsc_1.9.0.94.17845.tar.xz/src/osmo-bsc/bts.c -> osmo-bsc_1.9.0.97.94951.tar.xz/src/osmo-bsc/bts.c Changed

@@ -1042,7 +1042,9 @@
 	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL), 0);
 	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_USED), 0);
 	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_TOTAL), 0);
-	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), 0);
+	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), 0);
+	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), paging_pending_requests_nr(bts));
+	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), bts->paging.available_slots);
 }
 
 const struct rate_ctr_desc bts_ctr_description = {
@@ -1694,8 +1696,16 @@
 		{ "num_trx:total",
 		  "Number of configured TRX in this BTS",
 		  "" },
-	BTS_STAT_T3113 = \
-		{ "t3113",
+	BTS_STAT_PAGING_REQ_QUEUE_LENGTH = \
+		{ "paging:request_queue_length",
+		  "Paging Request queue length",
+		  "", 60, 0 },
+	BTS_STAT_PAGING_AVAILABLE_SLOTS = \
+		{ "paging:available_slots",
+		  "Available paging slots in this BTS",
+		  "", 60, 0 },
+	BTS_STAT_PAGING_T3113 = \
+		{ "paging:t3113",
 		  "T3113 paging timer",
 		  "s", 60, 0 },
 };

osmo-bsc_1.9.0.94.17845.tar.xz/src/osmo-bsc/paging.c -> osmo-bsc_1.9.0.97.94951.tar.xz/src/osmo-bsc/paging.c Changed

@@ -89,6 +89,7 @@
 	osmo_timer_del(&to_be_deleted->T3113);
 	llist_del(&to_be_deleted->entry);
 	paging_bts->pending_requests_len--;
+	osmo_stat_item_dec(osmo_stat_item_group_get_item(to_be_deleted->bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1);
 	bsc_subscr_remove_active_paging_request(to_be_deleted->bsub, to_be_deleted);
 	talloc_free(to_be_deleted);
 	if (llist_empty(&paging_bts->pending_requests))
@@ -135,6 +136,13 @@
 		paging_handle_pending_requests(paging_bts);
 }
 
+/* Placeholder to set the value and update the related osmo_stat: */
+static void paging_set_available_slots(struct gsm_bts *bts, uint16_t available_slots)
+{
+	bts->paging.available_slots = available_slots;
+	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), available_slots);
+}
+
 static void paging_give_credit(void *data)
 {
 	struct gsm_bts_paging_state *paging_bts_st = data;
@@ -144,7 +152,7 @@
 	LOG_BTS(bts, DPAG, LOGL_INFO,
 		"Timeout waiting for CCCH Load Indication, assuming BTS is below Load Threshold (available_slots %u -> %u)\n",
 		paging_bts_st->available_slots, estimated_slots);
-	paging_bts_st->available_slots = estimated_slots;
+	paging_set_available_slots(bts, estimated_slots);
 	paging_schedule_if_needed(paging_bts_st);
 	osmo_timer_schedule(&bts->paging.credit_timer, load_ind_timeout, 0);
 }
@@ -270,7 +278,7 @@
 
 		/* handle the paging request now */
 		page_ms(request);
-		paging_bts->available_slots--;
+		paging_set_available_slots(bts, paging_bts->available_slots - 1);
 		request->last_attempt_ts = now;
 		request->attempts++;
 		num_paged++;
@@ -302,7 +310,7 @@
 {
 	bts->paging.bts = bts;
 	bts->paging.free_chans_need = -1;
-	bts->paging.available_slots = 0;
+	paging_set_available_slots(bts, 0);
 	INIT_LLIST_HEAD(&bts->paging.pending_requests);
 	osmo_timer_setup(&bts->paging.work_timer, paging_worker, &bts->paging);
 	osmo_timer_setup(&bts->paging.credit_timer, paging_give_credit, &bts->paging);
@@ -388,7 +396,7 @@
 		       "Paging request: T3113 expires in %u seconds (estimated %u)\n",
 		       to, estimated_to);
 ret:
-	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), to);
+	osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), to);
 	return to;
 }
 
@@ -466,6 +474,7 @@
 	bsc_subscr_add_active_paging_request(req->bsub, req);
 
 	bts_entry->pending_requests_len++;
+	osmo_stat_item_inc(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1);
 	/* there's no initial req (attempts==0), add to the start of the list */
 	if (last_initial_req == NULL)
 		llist_add(&req->entry, &bts_entry->pending_requests);
@@ -607,7 +616,7 @@
 {
 	LOG_BTS(bts, DPAG, LOGL_DEBUG, "Rx CCCH Load Indication from BTS (available_slots %u -> %u)\n",
 		bts->paging.available_slots, free_slots);
-	bts->paging.available_slots = free_slots;
+	paging_set_available_slots(bts, free_slots);
 	/* Re-arm credit_timer if needed */
 	if (trx_is_usable(bts->c0)) {
 		paging_schedule_if_needed(&bts->paging);
@@ -700,6 +709,7 @@
 	struct gsm_bts *bts;
 	struct gsm_bts_trx *trx;
 	unsigned int load_ind_timeout;
+	uint16_t estimated_slots;
 
 	if (signal != S_NM_RUNNING_CHG)
 		return 0;
@@ -727,7 +737,8 @@
 			LOG_BTS(bts, DPAG, LOGL_INFO, "C0 becomes available for paging\n");
 			/* Fill in initial credit */
 			load_ind_timeout = bts_no_ccch_load_ind_timeout_sec(bts);
-			bts->paging.available_slots = paging_estimate_available_slots(bts, load_ind_timeout);
+			estimated_slots = paging_estimate_available_slots(bts, load_ind_timeout);
+			paging_set_available_slots(bts, estimated_slots);
 			/* Start scheduling credit_timer */
 			osmo_timer_schedule(&bts->paging.credit_timer,
 					    bts_no_ccch_load_ind_timeout_sec(bts), 0);

Changes of Revision 32