kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-17 18:43:50 +01:00
Code Releases Activity

Add the ability to send a message to the current thread's message queue

Browse Source 
(without raising an error)
This commit is contained in:
Kévin Roussel 2014-04-02 17:48:09 +02:00
parent 3903b8add2
commit 24f5cfafbb
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/include/msg.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2013 Freie Universität Berlin * Copyright (C) 2014 Freie Universität Berlin
* *
* This file subject to the terms and conditions of the GNU Lesser General * This file subject to the terms and conditions of the GNU Lesser General
* Public License. See the file LICENSE in the top level directory for more * Public License. See the file LICENSE in the top level directory for more
@ -26,6 +26,7 @@
* *
* @author Freie Universität Berlin, Computer Systems & Telematics * @author Freie Universität Berlin, Computer Systems & Telematics
* @author Kaspar Schleiser <kaspar@schleiser.de> * @author Kaspar Schleiser <kaspar@schleiser.de>
* @author Kévin Roussel <Kevin.Roussel@inria.fr>
*/ */
#ifndef __MSG_H #ifndef __MSG_H
@ -76,6 +77,21 @@ typedef struct msg {
int msg_send(msg_t *m, unsigned int target_pid, bool block); int msg_send(msg_t *m, unsigned int target_pid, bool block);
/**
* @brief Send a message to the current thread.
* @details Will work only if the thread has a message queue.
*
* Will be automatically chosen instead of @c msg_send
* if @c target_pid == @c thread_pid.
* This function never blocks.
*
* @param m pointer to message structure
*
* @return 1 if sending was successful
* @return 0 if the thread's message queue is full (or inexistent)
*/
int msg_send_to_self(msg_t *m);
/** /**
* @brief Send message from interrupt. * @brief Send message from interrupt.
* *

15
core/msg.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2013 Freie Universität Berlin * Copyright (C) 2014 Freie Universität Berlin
* *
* This file is subject to the terms and conditions of the GNU Lesser General * This file is subject to the terms and conditions of the GNU Lesser General
* Public License. See the file LICENSE in the top level directory for more * Public License. See the file LICENSE in the top level directory for more
@ -16,6 +16,7 @@
* @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
* @author Kaspar Schleiser <kaspar@schleiser.de> * @author Kaspar Schleiser <kaspar@schleiser.de>
* @author Oliver Hahm <oliver.hahm@inria.fr> * @author Oliver Hahm <oliver.hahm@inria.fr>
* @author Kévin Roussel <Kevin.Roussel@inria.fr>
* *
* @} * @}
*/ */
@ -62,7 +63,7 @@ int msg_send(msg_t *m, unsigned int target_pid, bool block)
m->sender_pid = thread_pid; m->sender_pid = thread_pid;
if (m->sender_pid == target_pid) { if (m->sender_pid == target_pid) {
return -1; return msg_send_to_self(m);
} }
if (target == NULL) { if (target == NULL) {
@ -128,6 +129,16 @@ int msg_send(msg_t *m, unsigned int target_pid, bool block)
return 1; return 1;
} }
int msg_send_to_self(msg_t *m)
{
unsigned int state = disableIRQ();
int res = queue_msg(active_thread, m);
restoreIRQ(state);
return res;
}
int msg_send_int(msg_t *m, unsigned int target_pid) int msg_send_int(msg_t *m, unsigned int target_pid)
{ {
tcb_t *target = (tcb_t *) sched_threads[target_pid]; tcb_t *target = (tcb_t *) sched_threads[target_pid];