phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Add task switching instrumentation for missing case. Contributed by Petri Tanskanen. 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4734 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-05-14 01:03:19 +00:00
parent 057bba7c82
commit efa79242c5
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nuttx/ChangeLog
View File

@ -2758,3 +2758,5 @@
are multiple queued touchscreen events for the same window and (2) the result of the
first input was to switch windows, then the autoraise implementation will cause the
window to revert to the previous window. Not good behavior.
* sched/sched_mergepending.c: Add task switching instrumentation. There is a case
here where instrumentation was missing. Contributed by Petri Tanskanen.

30
nuttx/sched/sched_mergepending.c
View File

@ -1,8 +1,8 @@
/************************************************************************
* sched/sched_mergepending.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <stdbool.h>
#include <sched.h>
#include <queue.h>
#include <assert.h>
@ -135,24 +136,29 @@ bool sched_mergepending(void)
rtrprev = rtrtcb->blink;
if (!rtrprev)
{
/* Special case: Inserting pndtcb at the head of the list */
/* Special case: Inserting pndtcb at the head of the list */
/* Inform the instrumentation layer that we are switching tasks */
pndtcb->flink = rtrtcb;
pndtcb->blink = NULL;
rtrtcb->blink = pndtcb;
g_readytorun.head = (FAR dq_entry_t*)pndtcb;
sched_note_switch(rtrtcb, pndtcb);
/* Then insert at the head of the list */
pndtcb->flink = rtrtcb;
pndtcb->blink = NULL;
rtrtcb->blink = pndtcb;
g_readytorun.head = (FAR dq_entry_t*)pndtcb;
rtrtcb->task_state = TSTATE_TASK_READYTORUN;
pndtcb->task_state = TSTATE_TASK_RUNNING;
ret = true;
ret = true;
}
else
{
/* Insert in the middle of the list */
pndtcb->flink = rtrtcb;
pndtcb->blink = rtrprev;
rtrprev->flink = pndtcb;
rtrtcb->blink = pndtcb;
pndtcb->flink = rtrtcb;
pndtcb->blink = rtrprev;
rtrprev->flink = pndtcb;
rtrtcb->blink = pndtcb;
pndtcb->task_state = TSTATE_TASK_READYTORUN;
}
}