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

core: put more intelligence into queue_msg()

Browse Source 
Fixes #1942.

There were two instances were it was not checked the target thread has a
message queue before queuing the message.

This PR centralizes the check into `queue_msg()`.
This commit is contained in:
René Kijewski 2014-11-07 12:32:15 +01:00
parent 1b64725eeb
commit c3ba66781d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/msg.c
View File

@ -39,17 +39,23 @@
static int _msg_receive(msg_t *m, int block); static int _msg_receive(msg_t *m, int block);
static int _msg_send(msg_t *m, kernel_pid_t target_pid, bool block); static int _msg_send(msg_t *m, kernel_pid_t target_pid, bool block);
static int queue_msg(tcb_t *target, const msg_t *m)
static int queue_msg(tcb_t *target, msg_t *m)
{ {
int n = cib_put(&(target->msg_queue)); if (target->msg_array == NULL) {
DEBUG("queue_msg(): no message queue present\n");
if (n != -1) { return 0;
target->msg_array[n] = *m;
return 1;
} }
int n = cib_put(&(target->msg_queue));
if (n < 0) {
DEBUG("queue_msg(): message queue is full\n");
return 0; return 0;
}
DEBUG("queue_msg(): queuing message\n");
msg_t *dest = &target->msg_array[n];
*dest = *m;
return 1;
} }
int msg_send(msg_t *m, kernel_pid_t target_pid) { int msg_send(msg_t *m, kernel_pid_t target_pid) {
@ -92,7 +98,7 @@ static int _msg_send(msg_t *m, kernel_pid_t target_pid, bool block)
if (target->status != STATUS_RECEIVE_BLOCKED) { if (target->status != STATUS_RECEIVE_BLOCKED) {
DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid " is not RECEIVE_BLOCKED.\n", __FILE__, __LINE__, target_pid); DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid " is not RECEIVE_BLOCKED.\n", __FILE__, __LINE__, target_pid);
if (target->msg_array && queue_msg(target, m)) { if (queue_msg(target, m)) {
DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid " has a msg_queue. Queueing message.\n", __FILE__, __LINE__, target_pid); DEBUG("msg_send() %s:%i: Target %" PRIkernel_pid " has a msg_queue. Queueing message.\n", __FILE__, __LINE__, target_pid);
eINT(); eINT();
if (sched_active_thread->status == STATUS_REPLY_BLOCKED) { if (sched_active_thread->status == STATUS_REPLY_BLOCKED) {