Skip to content

Commit

Permalink
Delete kernel created task in posix port
Browse files Browse the repository at this point in the history
  • Loading branch information
chinglee-iot committed Jan 25, 2024
1 parent 741f287 commit 3a5a463
Showing 1 changed file with 15 additions and 29 deletions.
44 changes: 15 additions & 29 deletions portable/ThirdParty/GCC/Posix/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
#include <sys/time.h>
#include <sys/times.h>
#include <time.h>
#include <unistd.h>

#ifdef __APPLE__
#include <mach/mach_vm.h>
Expand All @@ -73,7 +72,6 @@
/* Scheduler includes. */
#include "FreeRTOS.h"
#include "task.h"
#include "list.h"
#include "timers.h"
#include "utils/wait_for_event.h"
/*-----------------------------------------------------------*/
Expand All @@ -87,7 +85,6 @@ typedef struct THREAD
void * pvParams;
BaseType_t xDying;
struct event * ev;
ListItem_t xThreadListItem;
} Thread_t;

/*
Expand All @@ -112,7 +109,6 @@ static BaseType_t xSchedulerEnd = pdFALSE;
static pthread_t hTimerTickThread;
static bool xTimerTickThreadShouldRun;
static uint64_t prvStartTimeNs;
static List_t xThreadList;
/*-----------------------------------------------------------*/

static void prvSetupSignalsAndSchedulerPolicy( void );
Expand Down Expand Up @@ -196,14 +192,8 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,

thread->ev = event_create();

vListInitialiseItem( &thread->xThreadListItem );
listSET_LIST_ITEM_OWNER( &thread->xThreadListItem, thread );

vPortEnterCritical();

/* Add the new thread in xThreadList. */
vListInsertEnd( &xThreadList, &thread->xThreadListItem );

iRet = pthread_create( &thread->pthread, &xThreadAttributes,
prvWaitForStart, thread );

Expand Down Expand Up @@ -234,8 +224,6 @@ BaseType_t xPortStartScheduler( void )
{
int iSignal;
sigset_t xSignals;
ListItem_t * pxIterator;
const ListItem_t * pxEndMarker;

hMainThread = pthread_self();
prvPortSetCurrentThreadName("Scheduler");
Expand Down Expand Up @@ -265,15 +253,18 @@ BaseType_t xPortStartScheduler( void )
/* Cancel all the running thread. */
pxEndMarker = listGET_END_MARKER( &xThreadList );

for( pxIterator = listGET_HEAD_ENTRY( &xThreadList ); pxIterator != pxEndMarker; pxIterator = listGET_NEXT( pxIterator ) )
{
Thread_t * pxThread = ( Thread_t * ) listGET_LIST_ITEM_OWNER( pxIterator );
/* Cancel the Idle task and free its resources */
#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
vTaskDelete( xTaskGetIdleTaskHandle() );
#endif /* #if ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) */

pthread_cancel( pxThread->pthread );
event_signal( pxThread->ev );
pthread_join( pxThread->pthread, NULL );
event_delete( pxThread->ev );
}
#if ( configUSE_TIMERS == 1 )
/* Cancel the Timer task and free its resources */
vTaskDelete( xTimerGetTimerDaemonTaskHandle() );
#endif /* #if ( configUSE_TIMERS == 1 ) */

/* Cancel the last task. */
vTaskDelete( xTaskGetCurrentTaskHandle() );

/*
* clear out the variable that is used to end the scheduler, otherwise
Expand Down Expand Up @@ -302,7 +293,10 @@ void vPortEndScheduler( void )
xSchedulerEnd = pdTRUE;
( void ) pthread_kill( hMainThread, SIG_RESUME );

pthread_exit( NULL );
/* Waiting to be deleted here. */
xCurrentThread = prvGetThreadFromTask( xTaskGetCurrentTaskHandle() );
event_wait( xCurrentThread->ev );
pthread_testcancel();
}
/*-----------------------------------------------------------*/

Expand Down Expand Up @@ -485,11 +479,6 @@ void vPortCancelThread( void * pxTaskToDelete )
{
Thread_t * pxThreadToCancel = prvGetThreadFromTask( pxTaskToDelete );

/* Remove the thread from xThreadList. */
vPortEnterCritical();
uxListRemove( &pxThreadToCancel->xThreadListItem );
vPortExitCritical();

/*
* The thread has already been suspended so it can be safely cancelled.
*/
Expand Down Expand Up @@ -594,9 +583,6 @@ static void prvSetupSignalsAndSchedulerPolicy( void )

hMainThread = pthread_self();

/* Setup thread list to record all the task which are not deleted. */
vListInitialise( &xThreadList );

/* Initialise common signal masks. */
sigfillset( &xAllSignals );

Expand Down

0 comments on commit 3a5a463

Please sign in to comment.