aboutsummaryrefslogtreecommitdiffstats
path: root/tests/llc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/llc')
-rw-r--r--tests/llc/LlcTest.cpp261
-rw-r--r--tests/llc/LlcTest.err10
-rw-r--r--tests/llc/LlcTest.ok4
3 files changed, 208 insertions, 67 deletions
diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp
index d98636af..f5bc54a4 100644
--- a/tests/llc/LlcTest.cpp
+++ b/tests/llc/LlcTest.cpp
@@ -24,11 +24,14 @@ extern "C" {
#include <osmocom/core/linuxlist.h>
}
-#include "llc.h"
#include "gprs_debug.h"
+#include "bts.h"
extern "C" {
#include "pcu_vty.h"
+#include "gprs_pcu.h"
+#include "llc.h"
+#include "gprs_ms.h"
#include <osmocom/core/application.h>
#include <osmocom/core/msgb.h>
@@ -44,6 +47,15 @@ int16_t spoof_mnc = 0, spoof_mcc = 0;
bool spoof_mnc_3_digits = false;
static struct timespec *clk_mono_override_time;
+static struct gprs_llc_queue *prepare_queue(void)
+{
+ the_pcu = gprs_pcu_alloc(tall_pcu_ctx);
+ the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_DISABLE;
+ struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0);
+ struct GprsMs *ms = ms_alloc(bts, NULL);
+ return ms_llc_queue(ms);
+}
+
static void enqueue_data(gprs_llc_queue *queue, const uint8_t *data, size_t len,
const struct timespec *expire_time)
{
@@ -56,16 +68,16 @@ static void enqueue_data(gprs_llc_queue *queue, const uint8_t *data, size_t len,
memcpy(msg_data, data, len);
- queue->enqueue(llc_msg, expire_time);
+ llc_queue_enqueue(queue, llc_msg, expire_time);
}
static void dequeue_and_check(gprs_llc_queue *queue, const uint8_t *exp_data,
size_t len, const MetaInfo *exp_info)
{
struct msgb *llc_msg;
- const MetaInfo *info_res;
+ MetaInfo info_res;
- llc_msg = queue->dequeue(&info_res);
+ llc_msg = llc_queue_dequeue(queue, NULL, &info_res);
OSMO_ASSERT(llc_msg != NULL);
fprintf(stderr, "dequeued msg, length %u (expected %zu), data %s\n",
@@ -75,8 +87,8 @@ static void dequeue_and_check(gprs_llc_queue *queue, const uint8_t *exp_data,
fprintf(stderr, "check failed!\n");
if (exp_info) {
- OSMO_ASSERT(memcmp(&exp_info->recv_time, &info_res->recv_time, sizeof(info_res->recv_time)) == 0);
- OSMO_ASSERT(memcmp(&exp_info->expire_time, &info_res->expire_time, sizeof(info_res->expire_time)) == 0);
+ OSMO_ASSERT(memcmp(&exp_info->recv_time, &info_res.recv_time, sizeof(info_res.recv_time)) == 0);
+ OSMO_ASSERT(memcmp(&exp_info->expire_time, &info_res.expire_time, sizeof(info_res.expire_time)) == 0);
}
msgb_free(llc_msg);
}
@@ -96,126 +108,238 @@ static void dequeue_and_check(gprs_llc_queue *queue, const char *exp_message,
static void test_llc_queue()
{
- gprs_llc_queue queue;
+ gprs_llc_queue *queue = prepare_queue();
struct timespec expire_time = {0};
printf("=== start %s ===\n", __func__);
- llc_queue_init(&queue);
- OSMO_ASSERT(llc_queue_size(&queue) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue) == 0);
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
- enqueue_data(&queue, "LLC message", &expire_time);
- OSMO_ASSERT(llc_queue_size(&queue) == 1);
- OSMO_ASSERT(llc_queue_octets(&queue) == 11);
+ enqueue_data(queue, "LLC message", &expire_time);
+ OSMO_ASSERT(llc_queue_size(queue) == 1);
+ OSMO_ASSERT(llc_queue_octets(queue) == 11);
- enqueue_data(&queue, "other LLC message", &expire_time);
- OSMO_ASSERT(llc_queue_size(&queue) == 2);
- OSMO_ASSERT(llc_queue_octets(&queue) == 28);
+ enqueue_data(queue, "other LLC message", &expire_time);
+ OSMO_ASSERT(llc_queue_size(queue) == 2);
+ OSMO_ASSERT(llc_queue_octets(queue) == 28);
- dequeue_and_check(&queue, "LLC message");
- OSMO_ASSERT(llc_queue_size(&queue) == 1);
- OSMO_ASSERT(llc_queue_octets(&queue) == 17);
+ dequeue_and_check(queue, "LLC message");
+ OSMO_ASSERT(llc_queue_size(queue) == 1);
+ OSMO_ASSERT(llc_queue_octets(queue) == 17);
- dequeue_and_check(&queue, "other LLC message");
- OSMO_ASSERT(llc_queue_size(&queue) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue) == 0);
+ dequeue_and_check(queue, "other LLC message");
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
- enqueue_data(&queue, "LLC", &expire_time);
- OSMO_ASSERT(llc_queue_size(&queue) == 1);
- OSMO_ASSERT(llc_queue_octets(&queue) == 3);
+ enqueue_data(queue, "LLC", &expire_time);
+ OSMO_ASSERT(llc_queue_size(queue) == 1);
+ OSMO_ASSERT(llc_queue_octets(queue) == 3);
- llc_queue_clear(&queue, NULL);
- OSMO_ASSERT(llc_queue_size(&queue) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue) == 0);
+ llc_queue_clear(queue, NULL);
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
printf("=== end %s ===\n", __func__);
+ TALLOC_FREE(the_pcu);
}
static void test_llc_meta()
{
- gprs_llc_queue queue;
+ gprs_llc_queue *queue = prepare_queue();
+ MetaInfo info1 = {0};
+ MetaInfo info2 = {0};
+
+ printf("=== start %s ===\n", __func__);
+
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
+
+ info1.recv_time.tv_sec = 123456777;
+ info1.recv_time.tv_nsec = 123456000;
+ info1.expire_time.tv_sec = 123456789;
+ info1.expire_time.tv_nsec = 987654000;
+ *clk_mono_override_time = info1.recv_time;
+ enqueue_data(queue, "LLC message 1", &info1.expire_time);
+
+ info2.recv_time.tv_sec = 123458000;
+ info2.recv_time.tv_nsec = 547352000;
+ info2.expire_time.tv_sec = 123458006;
+ info2.expire_time.tv_nsec = 867252000;
+ *clk_mono_override_time = info2.recv_time;
+ enqueue_data(queue, "LLC message 2", &info2.expire_time);
+
+ clk_mono_override_time->tv_sec = info1.expire_time.tv_sec - 1;
+ clk_mono_override_time->tv_nsec = info1.expire_time.tv_nsec;
+
+ dequeue_and_check(queue, "LLC message 1", &info1);
+ dequeue_and_check(queue, "LLC message 2", &info2);
+
+ llc_queue_clear(queue, NULL);
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
+
+ printf("=== end %s ===\n", __func__);
+ TALLOC_FREE(the_pcu);
+}
+
+/* Test PDU lifetime is taken into account and packet is dropped if dequeued too
+ * late */
+static void test_llc_meta_pdu_life_expire()
+{
+ gprs_llc_queue *queue = prepare_queue();
MetaInfo info1 = {0};
MetaInfo info2 = {0};
printf("=== start %s ===\n", __func__);
- llc_queue_init(&queue);
- OSMO_ASSERT(llc_queue_size(&queue) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue) == 0);
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
info1.recv_time.tv_sec = 123456777;
info1.recv_time.tv_nsec = 123456000;
info1.expire_time.tv_sec = 123456789;
info1.expire_time.tv_nsec = 987654000;
*clk_mono_override_time = info1.recv_time;
- enqueue_data(&queue, "LLC message 1", &info1.expire_time);
+ enqueue_data(queue, "LLC message 1", &info1.expire_time);
info2.recv_time.tv_sec = 123458000;
info2.recv_time.tv_nsec = 547352000;
info2.expire_time.tv_sec = 123458006;
info2.expire_time.tv_nsec = 867252000;
*clk_mono_override_time = info2.recv_time;
- enqueue_data(&queue, "LLC message 2", &info2.expire_time);
+ enqueue_data(queue, "LLC message 2", &info2.expire_time);
+
+ clk_mono_override_time->tv_sec = info1.expire_time.tv_sec + 1;
+ clk_mono_override_time->tv_nsec = info1.expire_time.tv_nsec;
- dequeue_and_check(&queue, "LLC message 1", &info1);
- dequeue_and_check(&queue, "LLC message 2", &info2);
+ dequeue_and_check(queue, "LLC message 2", &info2);
- llc_queue_clear(&queue, NULL);
- OSMO_ASSERT(llc_queue_size(&queue) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue) == 0);
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
+ llc_queue_clear(queue, NULL);
printf("=== end %s ===\n", __func__);
+ TALLOC_FREE(the_pcu);
+}
+
+/* Test codel entering in action */
+static void test_llc_codel()
+{
+ clk_mono_override_time->tv_sec = 1000;
+ clk_mono_override_time->tv_nsec = 0;
+
+ the_pcu = gprs_pcu_alloc(tall_pcu_ctx);
+ the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_USE_DEFAULT;
+ /* DEFAULT should be resolved to GPRS_CODEL_SLOW_INTERVAL_MS 4000 */
+ #define GPRS_CODEL_SLOW_INTERVAL_MS 4000
+ struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0);
+ struct GprsMs *ms = ms_alloc(bts, NULL);
+ gprs_llc_queue *queue = ms_llc_queue(ms);
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(queue->pq); i++) {
+ gprs_codel_set_maxpacket(&queue->pq[i].codel_state, 8);
+ }
+
+ MetaInfo info1 = {0};
+
+ printf("=== start %s ===\n", __func__);
+
+ for (i = 0; i < 10; i++) {
+ char buf[256];
+
+ snprintf(buf, sizeof(buf), "LLC message %u", i);
+ info1.recv_time.tv_sec = clk_mono_override_time->tv_sec;
+ info1.recv_time.tv_nsec = clk_mono_override_time->tv_nsec;
+ info1.expire_time.tv_sec = clk_mono_override_time->tv_sec + 500;
+ info1.expire_time.tv_nsec = clk_mono_override_time->tv_nsec;
+ clk_mono_override_time->tv_sec += 1;
+ enqueue_data(queue, buf, &info1.expire_time);
+ }
+
+ OSMO_ASSERT(llc_queue_size(queue) == 10);
+ OSMO_ASSERT(llc_queue_octets(queue) != 0);
+
+ dequeue_and_check(queue, "LLC message 0", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.first_above_time.tv_sec ==
+ clk_mono_override_time->tv_sec + GPRS_CODEL_SLOW_INTERVAL_MS/1000);
+ dequeue_and_check(queue, "LLC message 1", NULL);
+ clk_mono_override_time->tv_sec += 7;
+ dequeue_and_check(queue, "LLC message 2", NULL); /*recently == 0*/
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 0);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 0);
+ clk_mono_override_time->tv_sec += GPRS_CODEL_SLOW_INTERVAL_MS/1000 + 1;
+ dequeue_and_check(queue, "LLC message 4", NULL); /* recently = 1, message 3 is dropped here */
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 1);
+ dequeue_and_check(queue, "LLC message 5", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.count == 1);
+ dequeue_and_check(queue, "LLC message 6", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1);
+ dequeue_and_check(queue, "LLC message 7", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1);
+ dequeue_and_check(queue, "LLC message 8", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 1);
+ dequeue_and_check(queue, "LLC message 9", NULL);
+ OSMO_ASSERT(queue->pq[LLC_QUEUE_PRIO_OTHER].codel_state.dropping == 0);
+
+ OSMO_ASSERT(llc_queue_size(queue) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue) == 0);
+ llc_queue_clear(queue, NULL);
+
+ printf("=== end %s ===\n", __func__);
+ TALLOC_FREE(the_pcu);
}
static void test_llc_merge()
{
- gprs_llc_queue queue1;
- gprs_llc_queue queue2;
+ gprs_llc_queue *queue1 = prepare_queue();
+ struct GprsMs *ms = ms_alloc(queue1->ms->bts, NULL);
+ gprs_llc_queue *queue2 = ms_llc_queue(ms);
struct timespec expire_time = {0};
printf("=== start %s ===\n", __func__);
- llc_queue_init(&queue1);
- llc_queue_init(&queue2);
-
clk_mono_override_time->tv_sec += 1;
- enqueue_data(&queue1, "*A*", &expire_time);
+ enqueue_data(queue1, "*A*", &expire_time);
clk_mono_override_time->tv_sec += 1;
- enqueue_data(&queue1, "*B*", &expire_time);
+ enqueue_data(queue1, "*B*", &expire_time);
clk_mono_override_time->tv_sec += 1;
- enqueue_data(&queue2, "*C*", &expire_time);
+ enqueue_data(queue2, "*C*", &expire_time);
clk_mono_override_time->tv_sec += 1;
- enqueue_data(&queue1, "*D*", &expire_time);
+ enqueue_data(queue1, "*D*", &expire_time);
clk_mono_override_time->tv_sec += 1;
- enqueue_data(&queue2, "*E*", &expire_time);
+ enqueue_data(queue2, "*E*", &expire_time);
- OSMO_ASSERT(llc_queue_size(&queue1) == 3);
- OSMO_ASSERT(llc_queue_octets(&queue1) == 9);
- OSMO_ASSERT(llc_queue_size(&queue2) == 2);
- OSMO_ASSERT(llc_queue_octets(&queue2) == 6);
+ OSMO_ASSERT(llc_queue_size(queue1) == 3);
+ OSMO_ASSERT(llc_queue_octets(queue1) == 9);
+ OSMO_ASSERT(llc_queue_size(queue2) == 2);
+ OSMO_ASSERT(llc_queue_octets(queue2) == 6);
- llc_queue_move_and_merge(&queue2, &queue1);
+ llc_queue_move_and_merge(queue2, queue1);
- OSMO_ASSERT(llc_queue_size(&queue1) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue1) == 0);
- OSMO_ASSERT(llc_queue_size(&queue2) == 5);
- OSMO_ASSERT(llc_queue_octets(&queue2) == 15);
+ OSMO_ASSERT(llc_queue_size(queue1) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue1) == 0);
+ OSMO_ASSERT(llc_queue_size(queue2) == 5);
+ OSMO_ASSERT(llc_queue_octets(queue2) == 15);
- dequeue_and_check(&queue2, "*A*");
- dequeue_and_check(&queue2, "*B*");
- dequeue_and_check(&queue2, "*C*");
- dequeue_and_check(&queue2, "*D*");
- dequeue_and_check(&queue2, "*E*");
+ dequeue_and_check(queue2, "*A*");
+ dequeue_and_check(queue2, "*B*");
+ dequeue_and_check(queue2, "*C*");
+ dequeue_and_check(queue2, "*D*");
+ dequeue_and_check(queue2, "*E*");
- OSMO_ASSERT(llc_queue_size(&queue2) == 0);
- OSMO_ASSERT(llc_queue_octets(&queue2) == 0);
+ OSMO_ASSERT(llc_queue_size(queue2) == 0);
+ OSMO_ASSERT(llc_queue_octets(queue2) == 0);
printf("=== end %s ===\n", __func__);
+ TALLOC_FREE(the_pcu);
}
int main(int argc, char **argv)
@@ -243,6 +367,8 @@ int main(int argc, char **argv)
test_llc_queue();
test_llc_meta();
+ test_llc_meta_pdu_life_expire();
+ test_llc_codel();
test_llc_merge();
if (getenv("TALLOC_REPORT_FULL"))
@@ -254,6 +380,7 @@ int main(int argc, char **argv)
extern "C" {
void l1if_pdch_req() { abort(); }
void l1if_connect_pdch() { abort(); }
-void l1if_close_pdch() { abort(); }
-void l1if_open_pdch() { abort(); }
+void l1if_disconnect_pdch() { abort(); }
+void l1if_close_trx() { abort(); }
+void l1if_open_trx() { abort(); }
}
diff --git a/tests/llc/LlcTest.err b/tests/llc/LlcTest.err
index f2c5cab8..90ddd1aa 100644
--- a/tests/llc/LlcTest.err
+++ b/tests/llc/LlcTest.err
@@ -2,6 +2,16 @@ dequeued msg, length 11 (expected 11), data 4c 4c 43 20 6d 65 73 73 61 67 65
dequeued msg, length 17 (expected 17), data 6f 74 68 65 72 20 4c 4c 43 20 6d 65 73 73 61 67 65
dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 31
dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 30
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 31
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 32
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 34
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 35
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 36
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 37
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 38
+dequeued msg, length 13 (expected 13), data 4c 4c 43 20 6d 65 73 73 61 67 65 20 39
dequeued msg, length 3 (expected 3), data 2a 41 2a
dequeued msg, length 3 (expected 3), data 2a 42 2a
dequeued msg, length 3 (expected 3), data 2a 43 2a
diff --git a/tests/llc/LlcTest.ok b/tests/llc/LlcTest.ok
index 311f37cd..307c7b74 100644
--- a/tests/llc/LlcTest.ok
+++ b/tests/llc/LlcTest.ok
@@ -2,5 +2,9 @@
=== end test_llc_queue ===
=== start test_llc_meta ===
=== end test_llc_meta ===
+=== start test_llc_meta_pdu_life_expire ===
+=== end test_llc_meta_pdu_life_expire ===
+=== start test_llc_codel ===
+=== end test_llc_codel ===
=== start test_llc_merge ===
=== end test_llc_merge ===
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:52:40 +0000