RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

tests/thread_msg_bus: enhance test with non-bus message

Browse Source
This commit is contained in:
Benjamin Valentin 2022-10-18 13:25:09 +02:00
parent 68b9637295
commit 0b4129ae8b
2 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tests/thread_msg_bus/main.c
View File

@ -26,15 +26,30 @@
#include "msg.h"
#include "msg_bus.h"
#define MSG_TYPE_EXIT 0
char t1_stack[THREAD_STACKSIZE_MAIN];
char t2_stack[THREAD_STACKSIZE_MAIN];
char t3_stack[THREAD_STACKSIZE_MAIN];
kernel_pid_t p_main, p1, p2, p3;
void *thread1(void *arg)
static bool _recv_msg(const char *name, const msg_bus_t *bus)
{
msg_t msg;
msg_receive(&msg);
assert(msg_bus_get_sender_pid(&msg) == p_main);
printf("%s recv: %s (type=%d)%s\n", name,
(char*) msg.content.ptr, msg_bus_get_type(&msg),
msg_is_from_bus(bus, &msg) ? " from bus" : "");
return msg_bus_get_type(&msg) != MSG_TYPE_EXIT;
}
void *thread1(void *arg)
{
msg_bus_entry_t sub;
puts("THREAD 1 start");
@ -42,15 +57,9 @@ void *thread1(void *arg)
msg_bus_attach(arg, &sub);
msg_bus_subscribe(&sub, 23);
msg_bus_subscribe(&sub, 24);
msg_bus_subscribe(&sub, MSG_TYPE_EXIT);
msg_receive(&msg);
/* check if the message came from the right bus */
assert(msg_is_from_bus(arg, &msg));
assert(msg_bus_get_sender_pid(&msg) == p_main);
printf("T1 recv: %s (type=%d)\n",
(char*) msg.content.ptr, msg_bus_get_type(&msg));
while (_recv_msg("T1", arg)) {}
msg_bus_detach(arg, &sub);
@ -59,22 +68,15 @@ void *thread1(void *arg)
void *thread2(void *arg)
{
msg_t msg;
msg_bus_entry_t sub;
puts("THREAD 2 start");
msg_bus_attach(arg, &sub);
msg_bus_subscribe(&sub, 24);
msg_bus_subscribe(&sub, MSG_TYPE_EXIT);
msg_receive(&msg);
/* check if the message came from the right bus */
assert(msg_is_from_bus(arg, &msg));
assert(msg_bus_get_sender_pid(&msg) == p_main);
printf("T2 recv: %s (type=%d)\n",
(char*) msg.content.ptr, msg_bus_get_type(&msg));
while (_recv_msg("T2", arg)) {}
msg_bus_detach(arg, &sub);
@ -83,22 +85,15 @@ void *thread2(void *arg)
void *thread3(void *arg)
{
msg_t msg;
msg_bus_entry_t sub;
puts("THREAD 3 start");
msg_bus_attach(arg, &sub);
msg_bus_subscribe(&sub, 23);
msg_bus_subscribe(&sub, MSG_TYPE_EXIT);
msg_receive(&msg);
/* check if the message came from the right bus */
assert(msg_is_from_bus(arg, &msg));
assert(msg_bus_get_sender_pid(&msg) == p_main);
printf("T3 recv: %s (type=%d)\n",
(char*) msg.content.ptr, msg_bus_get_type(&msg));
while (_recv_msg("T3", arg)) {}
msg_bus_detach(arg, &sub);
@ -121,12 +116,25 @@ int main(void)
puts("THREADS CREATED");
const char hello[] = "Hello Threads!";
int woken;
for (int id = 22; id < 25; ++id) {
int woken = msg_bus_post(&my_bus, id, (void*)hello);
woken = msg_bus_post(&my_bus, id, (void*)hello);
printf("Posted event %d to %d threads\n", id, woken);
}
/* mix non-bus message with bus messages */
puts("Post message to thread 1");
msg_t msg = {
.type = 0x1337,
.content.ptr = "Hello Thread 1",
};
msg_send(&msg, p1);
puts("Post shutdown request to all threads");
woken = msg_bus_post(&my_bus, MSG_TYPE_EXIT, "shutdown request");
assert(woken == 3);
/* make sure all threads have terminated */
if (thread_getstatus(p1) != STATUS_NOT_FOUND ||
thread_getstatus(p2) != STATUS_NOT_FOUND ||

17
tests/thread_msg_bus/tests/01-run.py
View File

@ -12,12 +12,21 @@ def testfunc(child):
child.expect_exact('Posted event 22 to 0 threads')
child.expect_exact('T1 recv: Hello Threads! (type=23)')
child.expect_exact('T3 recv: Hello Threads! (type=23)')
child.expect_exact('T1 recv: Hello Threads! (type=23) from bus')
child.expect_exact('T3 recv: Hello Threads! (type=23) from bus')
child.expect_exact('Posted event 23 to 2 threads')
child.expect_exact('T2 recv: Hello Threads! (type=24)')
child.expect_exact('Posted event 24 to 1 threads')
child.expect_exact('T1 recv: Hello Threads! (type=24) from bus')
child.expect_exact('T2 recv: Hello Threads! (type=24) from bus')
child.expect_exact('Posted event 24 to 2 threads')
child.expect_exact('Post message to thread 1')
child.expect_exact('T1 recv: Hello Thread 1 (type=4919)')
child.expect_exact('Post shutdown request to all threads')
child.expect_exact('T1 recv: shutdown request (type=0) from bus')
child.expect_exact('T2 recv: shutdown request (type=0) from bus')
child.expect_exact('T3 recv: shutdown request (type=0) from bus')
child.expect_exact('SUCCESS')