rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

More tweaks to OSX simulator

Browse Source
This commit is contained in:
James Cotton 2012-03-14 20:05:05 -05:00
parent ca535c2632
commit fdfaac6559
1 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
View File

@ -1315,15 +1315,20 @@ static int pauseOtherThread(xTaskHandle hTask)
* or another thread) and returns when that thread has done so. Sends resume * or another thread) and returns when that thread has done so. Sends resume
* condition to that thread and waits for the status flag to change to running. * condition to that thread and waits for the status flag to change to running.
*/ */
tskTCB *lastResumeAttempt;
tskTCB *lastResume;
static void resumeThread(xTaskHandle hTask) static void resumeThread(xTaskHandle hTask)
{ {
const unsigned int MAX_TIME = 100; // us const unsigned int MAX_TIME = 100; // us
const int MAX_ATTEMPTS = 2000; const int MAX_ATTEMPTS = 2000;
lastResumeAttempt = (tskTCB *) hTask;
portLONG lIndex; portLONG lIndex;
for ( lIndex = 0; lIndex < MAX_NUMBER_OF_TASKS && pxThreads[ lIndex ].hTask != hTask; lIndex++ ); for ( lIndex = 0; lIndex < MAX_NUMBER_OF_TASKS && pxThreads[ lIndex ].hTask != hTask; lIndex++ );
assert(pxThreads[ lIndex ].hTask == hTask); assert(pxThreads[ lIndex ].hTask == hTask);
for(int i = 0; i < MAX_ATTEMPTS; i++) { for(int i = 0; i < MAX_ATTEMPTS; i++) {
//pthread_t thread_to_resume = prvGetThreadHandle( hTask ); //pthread_t thread_to_resume = prvGetThreadHandle( hTask );
//fprintf(stdout, "Requesting resume of thread %s from %s.\r\n", threadToName(thread_to_resume), threadToName( pthread_self() ) ); //fprintf(stdout, "Requesting resume of thread %s from %s.\r\n", threadToName(thread_to_resume), threadToName( pthread_self() ) );
@ -1335,6 +1340,7 @@ static void resumeThread(xTaskHandle hTask)
while( (clock() - start_time) < MAX_TIME ) { while( (clock() - start_time) < MAX_TIME ) {
if(pxThreads[ lIndex ].status == RUNNING) { if(pxThreads[ lIndex ].status == RUNNING) {
//fprintf(stdout, "Resume detected of %s by %s\r\n", threadToName(pxThreads[lIndex].hThread), threadToName(pthread_self())); //fprintf(stdout, "Resume detected of %s by %s\r\n", threadToName(pxThreads[lIndex].hThread), threadToName(pthread_self()));
lastResume = (tskTCB *) hTask;
return; return;
} }
} }
@ -1357,24 +1363,50 @@ int claim_count = 0;
static void claimRunningSemaphore(int source) static void claimRunningSemaphore(int source)
{ {
//fprintf(stderr,"Claimed the semaphore(%d) %s\r\n", source, threadToName(pthread_self())); //fprintf(stderr,"Claimed the semaphore(%d) %s\r\n", source, threadToName(pthread_self()));
xTaskHandle hTask = prvGetTaskHandle( pthread_self() );
// And they succeed // And they succeed
int succeed = 0; int succeed = 0;
for (int i = 0; i < 10 && !succeed; i++) { for (int i = 0; i < 100 && !succeed; i++) {
succeed = (pthread_mutex_trylock( &xRunningThread ) == 0); succeed = (pthread_mutex_trylock( &xRunningThread ) == 0);
if (!succeed) if (!succeed)
usleep(1); usleep(10);
} }
assert( succeed );
// Make sure the right task is trying for this (SystemTick doesn't have a handle) if(succeed) {
xTaskHandle hTask = prvGetTaskHandle( pthread_self() ); lastClaim = (tskTCB *) hTask;
assert( hTask == NULL || hTask == xTaskGetCurrentTaskHandle() ); lastClaimType = source;
claim_count ++;
if(hTask != NULL && hTask != xTaskGetCurrentTaskHandle()) {
fprintf(stdout,"This shouldn't have happened\r\b");
storeSelf();
pauseSelf();
claimRunningSemaphore(10);
unmaskSuspend();
}
} else {
/* Block further suspend signals. They need to go to their thread */
maskSuspend();
lastClaim = (tskTCB *) hTask; /* Store self without releasing semaphore */
lastClaimType = source; prvSetTaskCriticalNesting( hTask, uxCriticalNesting );
claim_count ++; prvSetTaskInterrupt( hTask, xInterruptsEnabled );
releaseRunningSemaphore();
prvSetThreadStatus( pthread_self(), STORED );
pauseSelf();
claimRunningSemaphore(11);
unmaskSuspend();
}
// Make sure the right task is trying for this (SystemTick doesn't have a handle)
assert( hTask == NULL || hTask == xTaskGetCurrentTaskHandle() );
} }
/** /**