From f5df674a4f9f2cfbaf71db853b3c6e15ca4b1b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Fri, 11 Mar 2016 14:22:20 +0100 Subject: [PATCH 1/3] gnrc_pktdump: make pid global --- sys/include/net/gnrc/pktdump.h | 7 ++----- sys/net/gnrc/pktdump/gnrc_pktdump.c | 13 ++++--------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h index 47bbb20e11..63d095a50f 100644 --- a/sys/include/net/gnrc/pktdump.h +++ b/sys/include/net/gnrc/pktdump.h @@ -50,12 +50,9 @@ extern "C" { #endif /** - * @brief Get the PID of the pktdump thread - * - * @return PID of the pktdump thread - * @return @ref KERNEL_PID_UNDEF if not initialized + * @brief The PID of the pktdump thread */ -kernel_pid_t gnrc_pktdump_getpid(void); +extern kernel_pid_t gnrc_pktdump_pid; /** * @brief Start the packet dump thread and listening for incoming packets diff --git a/sys/net/gnrc/pktdump/gnrc_pktdump.c b/sys/net/gnrc/pktdump/gnrc_pktdump.c index 3224563d50..5d3deae32d 100644 --- a/sys/net/gnrc/pktdump/gnrc_pktdump.c +++ b/sys/net/gnrc/pktdump/gnrc_pktdump.c @@ -36,7 +36,7 @@ /** * @brief PID of the pktdump thread */ -static kernel_pid_t _pid = KERNEL_PID_UNDEF; +kernel_pid_t gnrc_pktdump_pid = KERNEL_PID_UNDEF; /** * @brief Stack for the pktdump thread @@ -154,17 +154,12 @@ static void *_eventloop(void *arg) return NULL; } -kernel_pid_t gnrc_pktdump_getpid(void) -{ - return _pid; -} - kernel_pid_t gnrc_pktdump_init(void) { - if (_pid == KERNEL_PID_UNDEF) { - _pid = thread_create(_stack, sizeof(_stack), GNRC_PKTDUMP_PRIO, + if (gnrc_pktdump_pid == KERNEL_PID_UNDEF) { + gnrc_pktdump_pid = thread_create(_stack, sizeof(_stack), GNRC_PKTDUMP_PRIO, THREAD_CREATE_STACKTEST, _eventloop, NULL, "pktdump"); } - return _pid; + return gnrc_pktdump_pid; } From bf1af5953f4de93079e8d443486a5a765518e9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Fri, 11 Mar 2016 14:22:42 +0100 Subject: [PATCH 2/3] examples: use global gnrc_pktdump_pid --- examples/default/main.c | 2 +- examples/gnrc_networking/udp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/default/main.c b/examples/default/main.c index 76f5627641..4e5ad60a7f 100644 --- a/examples/default/main.c +++ b/examples/default/main.c @@ -55,7 +55,7 @@ int main(void) #ifdef MODULE_NETIF gnrc_netreg_entry_t dump; - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); #endif diff --git a/examples/gnrc_networking/udp.c b/examples/gnrc_networking/udp.c index a03770e4fd..9d9758a6f1 100644 --- a/examples/gnrc_networking/udp.c +++ b/examples/gnrc_networking/udp.c @@ -103,7 +103,7 @@ static void start_server(char *port_str) return; } /* start server (which means registering pktdump for the chosen port) */ - server.pid = gnrc_pktdump_getpid(); + server.pid = gnrc_pktdump_pid; server.demux_ctx = (uint32_t)port; gnrc_netreg_register(GNRC_NETTYPE_UDP, &server); printf("Success: started UDP server on port %" PRIu16 "\n", port); From 047fd79ae671ab86e357b1fb7efb54e3f8057ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Fri, 11 Mar 2016 14:23:07 +0100 Subject: [PATCH 3/3] tests: use global gnrc_pktdump_pid --- tests/driver_at86rf2xx/main.c | 2 +- tests/driver_kw2xrf/main.c | 2 +- tests/driver_nrfmin/main.c | 2 +- tests/driver_xbee/main.c | 2 +- tests/slip/main.c | 2 +- tests/zep/main.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/driver_at86rf2xx/main.c b/tests/driver_at86rf2xx/main.c index 06c7bf4917..1a5f12f9a7 100644 --- a/tests/driver_at86rf2xx/main.c +++ b/tests/driver_at86rf2xx/main.c @@ -36,7 +36,7 @@ int main(void) /* register the pktdump thread */ puts("Register the packet dump thread for GNRC_NETTYPE_UNDEF packets"); - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); diff --git a/tests/driver_kw2xrf/main.c b/tests/driver_kw2xrf/main.c index 2591bdfdd0..199e8f9189 100644 --- a/tests/driver_kw2xrf/main.c +++ b/tests/driver_kw2xrf/main.c @@ -32,7 +32,7 @@ int main(void) /* register the pktdump thread */ puts("Register the packet dump thread for GNRC_NETTYPE_UNDEF packets"); - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); diff --git a/tests/driver_nrfmin/main.c b/tests/driver_nrfmin/main.c index 5dadfc3bd4..15cf9e2070 100644 --- a/tests/driver_nrfmin/main.c +++ b/tests/driver_nrfmin/main.c @@ -41,7 +41,7 @@ int main(void) gnrc_nomac_init(nomac_stack, sizeof(nomac_stack), 5, "nomac", &dev); /* initialize packet dumper */ - netobj.pid = gnrc_pktdump_getpid(); + netobj.pid = gnrc_pktdump_pid; netobj.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &netobj); diff --git a/tests/driver_xbee/main.c b/tests/driver_xbee/main.c index bf0641ae67..d9cc6a5f92 100644 --- a/tests/driver_xbee/main.c +++ b/tests/driver_xbee/main.c @@ -35,7 +35,7 @@ int main(void) puts("Xbee S1 device driver test"); /* initialize and register pktdump */ - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; if (dump.pid <= KERNEL_PID_UNDEF) { puts("Error starting pktdump thread"); return -1; diff --git a/tests/slip/main.c b/tests/slip/main.c index a600fa2a54..ee718cf99e 100644 --- a/tests/slip/main.c +++ b/tests/slip/main.c @@ -35,7 +35,7 @@ int main(void) puts("SLIP test"); /* initialize and register pktdump */ - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; if (dump.pid <= KERNEL_PID_UNDEF) { diff --git a/tests/zep/main.c b/tests/zep/main.c index da9aacbed4..d34bb6131b 100644 --- a/tests/zep/main.c +++ b/tests/zep/main.c @@ -35,7 +35,7 @@ int main(void) puts("ZEP module test"); /* initialize and register pktdump */ - dump.pid = gnrc_pktdump_getpid(); + dump.pid = gnrc_pktdump_pid; if (dump.pid <= KERNEL_PID_UNDEF) { puts("Error starting pktdump thread");