From d2909f968412c5f1e3e05f56223884d92a4e0cf7 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sat, 1 Jun 2013 17:00:59 +0200 Subject: HO: Count neighbor measurements and reduce window of neigh_meas_avg Always start with a counter of 0 for a new measurement report. If the neigh_meas_avg is caluclated over the given window, the window is reduced, if there are less measurement reports received so far. --- openbsc/src/libbsc/handover_decision.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c index a66354423..5f9a2c3af 100644 --- a/openbsc/src/libbsc/handover_decision.c +++ b/openbsc/src/libbsc/handover_decision.c @@ -76,6 +76,13 @@ static int neigh_meas_avg(struct neigh_meas_proc *nmp, int window) unsigned int i, idx; int avg = 0; + /* reduce window to the actual number of existing measurements */ + if (window < nmp->rxlev_cnt) + window = nmp->rxlev_cnt; + /* this should never happen */ + if (window == 0) + return 0; + idx = calc_initial_idx(ARRAY_SIZE(nmp->rxlev), nmp->rxlev_cnt % ARRAY_SIZE(nmp->rxlev), window); @@ -154,6 +161,7 @@ static void process_meas_neigh(struct gsm_meas_rep *mr) nmp->arfcn = mrc->arfcn; nmp->bsic = mrc->bsic; + nmp->rxlev_cnt = 0; idx = nmp->rxlev_cnt % ARRAY_SIZE(nmp->rxlev); nmp->rxlev[idx] = mrc->rxlev; nmp->rxlev_cnt++; -- cgit v1.2.3