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

core: introduce msg_sent_by_int()

Browse Source 
msg_send_int() sets `m->sender_pid = target_pid`. This was used to flag a
message as having been sent by an ISR.

This PR introduces a static inline function `msg_sent_by_int()` and a
specific define for this purpose.
This commit is contained in:
René Kijewski 2014-10-10 11:28:38 +02:00
parent a17d89fbed
commit 5f29fed076
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/include/msg.h
View File

@ -114,13 +114,22 @@ int msg_try_send(msg_t *m, kernel_pid_t target_pid);
*/ */
int msg_send_to_self(msg_t *m); int msg_send_to_self(msg_t *m);
/**
* Value of msg_t::sender_pid if the sender was an interrupt service routine.
*/
#define KERNEL_PID_ISR (KERNEL_PID_LAST + 1)
/** /**
* @brief Send message from interrupt. * @brief Send message from interrupt.
* *
* Will be automatically chosen instead of ``msg_send()`` if called from an * Will be automatically chosen instead of msg_send() if called from an
* interrupt/ISR. * interrupt/ISR.
* *
* @param[in] m Pointer to preallocated ``msg_t`` structure, must * The value of ``m->sender_pid`` is set to @ref KERNEL_PID_ISR.
*
* @see msg_sent_by_int()
*
* @param[in] m Pointer to preallocated @ref msg_t structure, must
* not be NULL. * not be NULL.
* @param[in] target_pid PID of target thread. * @param[in] target_pid PID of target thread.
* *
@ -130,6 +139,17 @@ int msg_send_to_self(msg_t *m);
*/ */
int msg_send_int(msg_t *m, kernel_pid_t target_pid); int msg_send_int(msg_t *m, kernel_pid_t target_pid);
/**
* @brief Test if the message was sent inside an ISR.
* @see msg_send_int()
* @param[in] m The message in question.
* @returns `== 0` if *not* sent by an ISR
* @returns `!= 0` if sent by an ISR
*/
static inline int msg_sent_by_int(const msg_t *m)
{
return (m->sender_pid == KERNEL_PID_ISR);
}
/** /**
* @brief Receive a message. * @brief Receive a message.

2
core/msg.c
View File

@ -179,7 +179,7 @@ int msg_send_int(msg_t *m, kernel_pid_t target_pid)
return -1; return -1;
} }
m->sender_pid = target_pid; m->sender_pid = KERNEL_PID_ISR;
if (target->status == STATUS_RECEIVE_BLOCKED) { if (target->status == STATUS_RECEIVE_BLOCKED) {
DEBUG("msg_send_int: Direct msg copy from %" PRIkernel_pid " to %" PRIkernel_pid ".\n", thread_getpid(), target_pid); DEBUG("msg_send_int: Direct msg copy from %" PRIkernel_pid " to %" PRIkernel_pid ".\n", thread_getpid(), target_pid);

7
sys/chardev_thread.c
View File

@ -18,10 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include "kernel.h"
#include "irq.h" #include "irq.h"
#include "thread.h"
#include "msg.h" #include "msg.h"
#include "ringbuffer.h" #include "ringbuffer.h"
@ -45,8 +42,6 @@ void chardev_loop(ringbuffer_t *rb)
{ {
msg_t m; msg_t m;
kernel_pid_t pid = thread_getpid();
kernel_pid_t reader_pid = KERNEL_PID_UNDEF; kernel_pid_t reader_pid = KERNEL_PID_UNDEF;
struct posix_iop_t *r = NULL; struct posix_iop_t *r = NULL;
@ -55,7 +50,7 @@ void chardev_loop(ringbuffer_t *rb)
while (1) { while (1) {
msg_receive(&m); msg_receive(&m);
if (m.sender_pid != pid) { if (!msg_sent_by_int(&m)) {
DEBUG("Receiving message from another thread: "); DEBUG("Receiving message from another thread: ");
switch(m.type) { switch(m.type) {