riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5038 from cgundogan/pr/pktdump/global_pid

Browse Source 
gnrc_pktdump: make pid global
This commit is contained in:
Martine Lenders 2016-03-11 15:33:36 +01:00
commit 78136ff25f
10 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/default/main.c
View File

@ -55,7 +55,7 @@ int main(void)
#ifdef MODULE_NETIF #ifdef MODULE_NETIF
gnrc_netreg_entry_t dump; gnrc_netreg_entry_t dump;
dump.pid = gnrc_pktdump_getpid(); dump.pid = gnrc_pktdump_pid;
dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL;
gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump);
#endif #endif

2
examples/gnrc_networking/udp.c
View File

@ -103,7 +103,7 @@ static void start_server(char *port_str)
return; return;
} }
/* start server (which means registering pktdump for the chosen port) */ /* 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; server.demux_ctx = (uint32_t)port;
gnrc_netreg_register(GNRC_NETTYPE_UDP, &server); gnrc_netreg_register(GNRC_NETTYPE_UDP, &server);
printf("Success: started UDP server on port %" PRIu16 "\n", port); printf("Success: started UDP server on port %" PRIu16 "\n", port);

7
sys/include/net/gnrc/pktdump.h
View File

@ -50,12 +50,9 @@ extern "C" {
#endif #endif
/** /**
* @brief Get the PID of the pktdump thread * @brief The PID of the pktdump thread
*
* @return PID of the pktdump thread
* @return @ref KERNEL_PID_UNDEF if not initialized
*/ */
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 * @brief Start the packet dump thread and listening for incoming packets

13
sys/net/gnrc/pktdump/gnrc_pktdump.c
View File

@ -36,7 +36,7 @@
/** /**
* @brief PID of the pktdump thread * @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 * @brief Stack for the pktdump thread
@ -154,17 +154,12 @@ static void *_eventloop(void *arg)
return NULL; return NULL;
} }
kernel_pid_t gnrc_pktdump_getpid(void)
{
return _pid;
}
kernel_pid_t gnrc_pktdump_init(void) kernel_pid_t gnrc_pktdump_init(void)
{ {
if (_pid == KERNEL_PID_UNDEF) { if (gnrc_pktdump_pid == KERNEL_PID_UNDEF) {
_pid = thread_create(_stack, sizeof(_stack), GNRC_PKTDUMP_PRIO, gnrc_pktdump_pid = thread_create(_stack, sizeof(_stack), GNRC_PKTDUMP_PRIO,
THREAD_CREATE_STACKTEST, THREAD_CREATE_STACKTEST,
_eventloop, NULL, "pktdump"); _eventloop, NULL, "pktdump");
} }
return _pid; return gnrc_pktdump_pid;
} }

2
tests/driver_at86rf2xx/main.c
View File

@ -36,7 +36,7 @@ int main(void)
/* register the pktdump thread */ /* register the pktdump thread */
puts("Register the packet dump thread for GNRC_NETTYPE_UNDEF packets"); 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; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL;
gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump);

2
tests/driver_kw2xrf/main.c
View File

@ -32,7 +32,7 @@ int main(void)
/* register the pktdump thread */ /* register the pktdump thread */
puts("Register the packet dump thread for GNRC_NETTYPE_UNDEF packets"); 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; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL;
gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump); gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &dump);

2
tests/driver_nrfmin/main.c
View File

@ -41,7 +41,7 @@ int main(void)
gnrc_nomac_init(nomac_stack, sizeof(nomac_stack), 5, "nomac", &dev); gnrc_nomac_init(nomac_stack, sizeof(nomac_stack), 5, "nomac", &dev);
/* initialize packet dumper */ /* initialize packet dumper */
netobj.pid = gnrc_pktdump_getpid(); netobj.pid = gnrc_pktdump_pid;
netobj.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; netobj.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL;
gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &netobj); gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &netobj);

2
tests/driver_xbee/main.c
View File

@ -35,7 +35,7 @@ int main(void)
puts("Xbee S1 device driver test"); puts("Xbee S1 device driver test");
/* initialize and register pktdump */ /* initialize and register pktdump */
dump.pid = gnrc_pktdump_getpid(); dump.pid = gnrc_pktdump_pid;
if (dump.pid <= KERNEL_PID_UNDEF) { if (dump.pid <= KERNEL_PID_UNDEF) {
puts("Error starting pktdump thread"); puts("Error starting pktdump thread");
return -1; return -1;

2
tests/slip/main.c
View File

@ -35,7 +35,7 @@ int main(void)
puts("SLIP test"); puts("SLIP test");
/* initialize and register pktdump */ /* initialize and register pktdump */
dump.pid = gnrc_pktdump_getpid(); dump.pid = gnrc_pktdump_pid;
dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL; dump.demux_ctx = GNRC_NETREG_DEMUX_CTX_ALL;
if (dump.pid <= KERNEL_PID_UNDEF) { if (dump.pid <= KERNEL_PID_UNDEF) {

2
tests/zep/main.c
View File

@ -35,7 +35,7 @@ int main(void)
puts("ZEP module test"); puts("ZEP module test");
/* initialize and register pktdump */ /* initialize and register pktdump */
dump.pid = gnrc_pktdump_getpid(); dump.pid = gnrc_pktdump_pid;
if (dump.pid <= KERNEL_PID_UNDEF) { if (dump.pid <= KERNEL_PID_UNDEF) {
puts("Error starting pktdump thread"); puts("Error starting pktdump thread");