paulmataruso/osmo-msc
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-msc.git synced 2025-11-02 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

sqlite optimisation: check VLR earlier for dest. subscriber

Browse Source 
sms_from_result() calls a number of sqlite3_column_XXX functions
to build the SMS in memory.

If the destination subscriber is not attached, the sms
will be free'd immediatly anyway in smsq_take_next_sms()
so let's check if the destination subscriber is present
and attached before we call all the sqlite3 routines.

Change-Id: Ibd07b9d200b48108d705ed4c461cc4ddfa421fd2
This commit is contained in:
Keith
2025-10-10 16:38:21 -06:00
committed by keith
parent 81cbad69c9
commit 5faf693182
4 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libmsc/db.c
View File

@@ -747,6 +747,22 @@ static struct gsm_sms *sms_from_result(struct gsm_network *net, sqlite3_stmt *st
if (!sms)
return NULL;
daddr = (const char *)sqlite3_column_text(stmt, COL_DEST_ADDR);
if (daddr)
OSMO_STRLCPY_ARRAY(sms->dst.addr, daddr);
if (net != NULL) { /* db_sms_test passes NULL, so we need to be tolerant */
sms->receiver = vlr_subscr_find_by_msisdn(net->vlr, sms->dst.addr,
VSUB_USE_SMS_RECEIVER);
if (!sms->receiver || !sms->receiver->lu_complete) {
LOGP(DLSMS, LOGL_DEBUG,
"Subscriber %s%s is not attached, skipping SMS\n",
sms->receiver ? "" : "MSISDN-",
sms->receiver ? vlr_subscr_msisdn_or_name(sms->receiver) : daddr);
return sms;
}
}
sms->id = sqlite3_column_int64(stmt, COL_ID);
sms->created = sqlite3_column_int64(stmt, COL_CREATED);
@@ -763,13 +779,6 @@ static struct gsm_sms *sms_from_result(struct gsm_network *net, sqlite3_stmt *st
sms->dst.npi = sqlite3_column_int(stmt, COL_DEST_NPI);
sms->dst.ton = sqlite3_column_int(stmt, COL_DEST_TON);
daddr = (const char *)sqlite3_column_text(stmt, COL_DEST_ADDR);
if (daddr)
OSMO_STRLCPY_ARRAY(sms->dst.addr, daddr);
if (net != NULL) /* db_sms_test passes NULL, so we need to be tolerant */
sms->receiver = vlr_subscr_find_by_msisdn(net->vlr, sms->dst.addr,
VSUB_USE_SMS_RECEIVER);
sms->src.npi = sqlite3_column_int(stmt, COL_SRC_NPI);
sms->src.ton = sqlite3_column_int(stmt, COL_SRC_TON);

7
src/libmsc/sms_queue.c
View File

@@ -316,12 +316,7 @@ struct gsm_sms *smsq_take_next_sms(struct gsm_network *net,
osmo_strlcpy(last_msisdn, sms->dst.addr, last_msisdn_buflen);
/* Is the subscriber attached? If not, go to next SMS */
if (!sms->receiver || !sms->receiver->lu_complete) {
LOGP(DLSMS, LOGL_DEBUG,
"Subscriber %s%s is not attached, skipping SMS %llu\n",
sms->receiver ? "" : "MSISDN-",
sms->receiver ? vlr_subscr_msisdn_or_name(sms->receiver)
: sms->dst.addr, sms->id);
if (!sms->id) {
sms_free(sms);
continue;
}

4
tests/sms_queue/sms_queue_test.c
View File

@@ -122,13 +122,15 @@ struct gsm_sms *__wrap_db_sms_get_next_unsent_rr_msisdn(struct gsm_network *net,
continue;
if (fake_sms_db[i].failed_attempts > max_failed)
continue;
if (!fake_sms_db[i].vsub_attached)
continue;
sms = sms_alloc();
OSMO_ASSERT(sms);
osmo_strlcpy(sms->dst.addr, fake_sms_db[i].msisdn,
sizeof(sms->dst.addr));
sms->receiver = fake_sms_db[i].vsub_attached? &arbitrary_vsub : NULL;
sms->id = 1 + i;
osmo_strlcpy(sms->text, fake_sms_db[i].msisdn, sizeof(sms->text));
if (fake_sms_db[i].vsub_attached)
fake_sms_db[i].nr_of_sms--;

31
tests/sms_queue/sms_queue_test.ok
View File

@@ -12,21 +12,17 @@ Testing smsq_take_next_sms()
hitting database: looking for MSISDN > '2222', failed_attempts <= 9
#1: sending SMS to 3333 (last_msisdn='3333')
hitting database: looking for MSISDN > '3333', failed_attempts <= 9
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
hitting database: looking for MSISDN > '', failed_attempts <= 9
#2: sending SMS to 2222 (last_msisdn='2222')
hitting database: looking for MSISDN > '2222', failed_attempts <= 9
#3: sending SMS to 3333 (last_msisdn='3333')
hitting database: looking for MSISDN > '3333', failed_attempts <= 9
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
hitting database: looking for MSISDN > '', failed_attempts <= 9
#4: no SMS to send (last_msisdn='5555')
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
#4: no SMS to send (last_msisdn='')
hitting database: looking for MSISDN > '', failed_attempts <= 9
#5: no SMS to send (last_msisdn='5555')
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
#5: no SMS to send (last_msisdn='')
hitting database: looking for MSISDN > '', failed_attempts <= 9
#6: no SMS to send (last_msisdn='5555')
#6: no SMS to send (last_msisdn='')
- SMS are pending at various nr failed attempts (cutoff at >= 10)
1111 has 1 SMS pending, 0 failed attempts
@@ -60,27 +56,12 @@ Testing smsq_take_next_sms()
5555 (NOT attached) has 1 SMS pending, 0 failed attempts
-->
hitting database: looking for MSISDN > '2345', failed_attempts <= 9
hitting database: looking for MSISDN > '3333', failed_attempts <= 9
hitting database: looking for MSISDN > '4444', failed_attempts <= 9
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
hitting database: looking for MSISDN > '', failed_attempts <= 9
hitting database: looking for MSISDN > '1111', failed_attempts <= 9
hitting database: looking for MSISDN > '2222', failed_attempts <= 9
#0: no SMS to send (last_msisdn='3333')
hitting database: looking for MSISDN > '3333', failed_attempts <= 9
hitting database: looking for MSISDN > '4444', failed_attempts <= 9
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
#0: no SMS to send (last_msisdn='')
hitting database: looking for MSISDN > '', failed_attempts <= 9
hitting database: looking for MSISDN > '1111', failed_attempts <= 9
hitting database: looking for MSISDN > '2222', failed_attempts <= 9
#1: no SMS to send (last_msisdn='3333')
hitting database: looking for MSISDN > '3333', failed_attempts <= 9
hitting database: looking for MSISDN > '4444', failed_attempts <= 9
hitting database: looking for MSISDN > '5555', failed_attempts <= 9
#1: no SMS to send (last_msisdn='')
hitting database: looking for MSISDN > '', failed_attempts <= 9
hitting database: looking for MSISDN > '1111', failed_attempts <= 9
hitting database: looking for MSISDN > '2222', failed_attempts <= 9
#2: no SMS to send (last_msisdn='3333')
#2: no SMS to send (last_msisdn='')
- there are no SMS in the DB
1111 has 0 SMS pending, 0 failed attempts