From d35d4232953aa32a27a5a1024377191360441416 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 23 Apr 2019 18:05:49 -0700 Subject: [PATCH] svm: move mq test to ut plugin Change-Id: Ic4e882b784e5773198e55bd97b1bbd3d6dda888a Signed-off-by: Florin Coras --- src/plugins/unittest/session_test.c | 105 ++++++++++++++++++++- src/svm/test_svm_message_queue.c | 177 ------------------------------------ 2 files changed, 101 insertions(+), 181 deletions(-) delete mode 100644 src/svm/test_svm_message_queue.c diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c index 948ea62e798..e54c8a6cd86 100644 --- a/src/plugins/unittest/session_test.c +++ b/src/plugins/unittest/session_test.c @@ -1736,7 +1736,7 @@ wait_for_event (svm_msg_q_t * mq, int fd, int epfd, u8 use_eventfd) } static int -session_test_mq (vlib_main_t * vm, unformat_input_t * input) +session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input) { int error, __clib_unused verbose, use_eventfd = 0; u64 i, n_test_msgs = 1 << 10, *counter; @@ -1868,6 +1868,99 @@ session_test_mq (vlib_main_t * vm, unformat_input_t * input) return 0; } +static int +session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input) +{ + svm_msg_q_cfg_t _cfg, *cfg = &_cfg; + svm_msg_q_msg_t msg1, msg2, msg[12]; + int __clib_unused verbose, i, rv; + svm_msg_q_t *mq; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "verbose")) + verbose = 1; + else + { + vlib_cli_output (vm, "parse error: '%U'", format_unformat_error, + input); + return -1; + } + } + + svm_msg_q_ring_cfg_t rc[2] = { {8, 8, 0} + , {8, 16, 0} + }; + cfg->consumer_pid = ~0; + cfg->n_rings = 2; + cfg->q_nitems = 16; + cfg->ring_cfgs = rc; + + mq = svm_msg_q_alloc (cfg); + SESSION_TEST (mq != 0, "svm_msg_q_alloc"); + SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation"); + + msg1 = svm_msg_q_alloc_msg (mq, 8); + rv = (mq->rings[0].cursize != 1 + || msg1.ring_index != 0 || msg1.elt_index != 0); + SESSION_TEST (rv == 0, "msg alloc1"); + + msg2 = svm_msg_q_alloc_msg (mq, 15); + rv = (mq->rings[1].cursize != 1 + || msg2.ring_index != 1 || msg2.elt_index != 0); + SESSION_TEST (rv == 0, "msg alloc2"); + + svm_msg_q_free_msg (mq, &msg1); + SESSION_TEST (mq->rings[0].cursize == 0, "free msg"); + + for (i = 0; i < 12; i++) + { + msg[i] = svm_msg_q_alloc_msg (mq, 7); + *(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i; + } + + rv = (mq->rings[0].cursize != 8 || mq->rings[1].cursize != 5); + SESSION_TEST (rv == 0, "msg alloc3"); + + *(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123; + svm_msg_q_add (mq, &msg2, SVM_Q_NOWAIT); + for (i = 0; i < 12; i++) + svm_msg_q_add (mq, &msg[i], SVM_Q_NOWAIT); + + rv = svm_msg_q_sub (mq, &msg2, SVM_Q_NOWAIT, 0); + SESSION_TEST (rv == 0, "dequeue1"); + + SESSION_TEST (msg2.ring_index == 1 && msg2.elt_index == 0, + "dequeue1 result"); + rv = (*(u32 *) svm_msg_q_msg_data (mq, &msg2) == 123); + SESSION_TEST (rv, "dequeue 1 data"); + + svm_msg_q_free_msg (mq, &msg2); + + for (i = 0; i < 12; i++) + { + if (svm_msg_q_sub (mq, &msg[i], SVM_Q_NOWAIT, 0)) + SESSION_TEST (0, "dequeue2"); + if (i < 8) + { + if (msg[i].ring_index != 0 || msg[i].elt_index != (i + 1) % 8) + SESSION_TEST (0, "dequeue2 result2"); + } + else + { + if (msg[i].ring_index != 1 || msg[i].elt_index != (i - 8) + 1) + SESSION_TEST (0, "dequeue2 result3"); + } + if (*(u32 *) svm_msg_q_msg_data (mq, &msg[i]) != i) + SESSION_TEST (0, "dequeue2 wrong data"); + svm_msg_q_free_msg (mq, &msg[i]); + } + rv = (mq->rings[0].cursize == 0 && mq->rings[1].cursize == 0); + SESSION_TEST (rv, "post dequeue"); + + return 0; +} + static clib_error_t * session_test (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd_arg) @@ -1890,8 +1983,10 @@ session_test (vlib_main_t * vm, res = session_test_proxy (vm, input); else if (unformat (input, "endpt-cfg")) res = session_test_endpoint_cfg (vm, input); - else if (unformat (input, "mq")) - res = session_test_mq (vm, input); + else if (unformat (input, "mq-speed")) + res = session_test_mq_speed (vm, input); + else if (unformat (input, "mq-basic")) + res = session_test_mq_basic (vm, input); else if (unformat (input, "all")) { if ((res = session_test_basic (vm, input))) @@ -1906,7 +2001,9 @@ session_test (vlib_main_t * vm, goto done; if ((res = session_test_endpoint_cfg (vm, input))) goto done; - if ((res = session_test_mq (vm, input))) + if ((res = session_test_mq_speed (vm, input))) + goto done; + if ((res = session_test_mq_basic (vm, input))) goto done; } else diff --git a/src/svm/test_svm_message_queue.c b/src/svm/test_svm_message_queue.c deleted file mode 100644 index 84719e6db82..00000000000 --- a/src/svm/test_svm_message_queue.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (c) 2018-2019 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#define test1_error(_fmt, _args...) \ -{ \ - ssvm_pop_heap (oldheap); \ - error = clib_error_return (0, _fmt, ##_args); \ - goto done; \ -} - -clib_error_t * -test1 (int verbose) -{ - ssvm_private_t _ssvm, *ssvm = &_ssvm; - svm_msg_q_cfg_t _cfg, *cfg = &_cfg; - svm_msg_q_msg_t msg1, msg2, msg[12]; - ssvm_shared_header_t *sh; - clib_error_t *error = 0; - svm_msg_q_t *mq; - void *oldheap; - int i; - - clib_memset (ssvm, 0, sizeof (*ssvm)); - - ssvm->ssvm_size = 1 << 20; - ssvm->i_am_master = 1; - ssvm->my_pid = getpid (); - ssvm->name = format (0, "%s%c", "test", 0); - ssvm->requested_va = 0; - - if (ssvm_master_init (ssvm, SSVM_SEGMENT_SHM)) - return clib_error_return (0, "failed: segment allocation"); - sh = ssvm->sh; - - svm_msg_q_ring_cfg_t rc[2]= {{8, 8, 0}, {8, 16, 0}}; - cfg->consumer_pid = ~0; - cfg->n_rings = 2; - cfg->q_nitems = 16; - cfg->ring_cfgs = rc; - - oldheap = ssvm_push_heap (sh); - mq = svm_msg_q_alloc (cfg); - if (!mq) - test1_error ("failed: alloc"); - - if (vec_len (mq->rings) != 2) - test1_error ("failed: ring allocation"); - - msg1 = svm_msg_q_alloc_msg (mq, 8); - if (mq->rings[0].cursize != 1 - || msg1.ring_index != 0 - || msg1.elt_index != 0) - test1_error ("failed: msg alloc1"); - - msg2 = svm_msg_q_alloc_msg (mq, 15); - if (mq->rings[1].cursize != 1 - || msg2.ring_index != 1 - || msg2.elt_index != 0) - test1_error ("failed: msg alloc2"); - - svm_msg_q_free_msg (mq, &msg1); - if (mq->rings[0].cursize != 0) - test1_error("failed: free msg"); - - for (i = 0; i < 12; i++) - { - msg[i] = svm_msg_q_alloc_msg (mq, 7); - *(u32 *)svm_msg_q_msg_data (mq, &msg[i]) = i; - } - - if (mq->rings[0].cursize != 8 - || mq->rings[1].cursize != 5) - test1_error ("failed: msg alloc3"); - - *(u32 *)svm_msg_q_msg_data (mq, &msg2) = 123; - svm_msg_q_add (mq, &msg2, SVM_Q_NOWAIT); - for (i = 0; i < 12; i++) - svm_msg_q_add (mq, &msg[i], SVM_Q_NOWAIT); - - if (svm_msg_q_sub (mq, &msg2, SVM_Q_NOWAIT, 0)) - test1_error ("failed: dequeue1"); - - if (msg2.ring_index != 1 || msg2.elt_index != 0) - test1_error ("failed: dequeue1 result"); - if (*(u32 *)svm_msg_q_msg_data (mq, &msg2) != 123) - test1_error ("failed: dequeue1 wrong data"); - - svm_msg_q_free_msg (mq, &msg2); - - for (i = 0; i < 12; i++) - { - if (svm_msg_q_sub (mq, &msg[i], SVM_Q_NOWAIT, 0)) - test1_error ("failed: dequeue2"); - if (i < 8) - { - if (msg[i].ring_index != 0 || msg[i].elt_index != (i + 1) % 8) - test1_error ("failed: dequeue2 result2"); - } - else - { - if (msg[i].ring_index != 1 || msg[i].elt_index != (i - 8) + 1) - test1_error ("failed: dequeue2 result3"); - } - if (*(u32 *)svm_msg_q_msg_data (mq, &msg[i]) != i) - test1_error ("failed: dequeue2 wrong data"); - svm_msg_q_free_msg (mq, &msg[i]); - } - if (mq->rings[0].cursize != 0 || mq->rings[1].cursize != 0) - test1_error ("failed: post dequeue"); - - ssvm_pop_heap (oldheap); - -done: - ssvm_delete (ssvm); - return error; -} - -int -test_svm_message_queue (unformat_input_t * input) -{ - clib_error_t *error = 0; - int verbose = 0; - int test_id = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "test1")) - test_id = 1; - else - { - error = clib_error_create ("unknown input `%U'\n", - format_unformat_error, input); - goto out; - } - } - - switch (test_id) - { - case 1: - error = test1 (verbose); - } -out: - if (error) - clib_error_report (error); - else - clib_warning ("success"); - - return 0; -} - -int -main (int argc, char *argv[]) -{ - unformat_input_t i; - int r; - - clib_mem_init_thread_safe (0, 256 << 20); - unformat_init_command_line (&i, argv); - r = test_svm_message_queue (&i); - unformat_free (&i); - return r; -} -- 2.16.6