len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format code, and rmove implicit tests (#489)

Browse source
This commit is contained in:
alfred gedeon 2022-04-21 10:18:58 -07:00 committed by GitHub
parent 15bc8664b5
commit ec7c40335d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 137 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
portable/ThirdParty/GCC/Posix/port.c vendored
View file

@ -49,6 +49,7 @@
* only or serialized with a FreeRTOS primitive such as a binary
* semaphore or mutex.
*----------------------------------------------------------*/
#include "portmacro.h"
#include <errno.h>
#include <pthread.h>
@ -114,7 +115,8 @@ static void vPortStartFirstTask( void );
static void prvPortYieldFromISR( void );
/*-----------------------------------------------------------*/
static void prvFatalError( const char *pcCall, int iErrno )
static void prvFatalError( const char * pcCall,
int iErrno )
{
fprintf( stderr, "%s: %s\n", pcCall, strerror( iErrno ) );
abort();
@ -125,7 +127,8 @@ static void prvFatalError( const char *pcCall, int iErrno )
*/
portSTACK_TYPE * pxPortInitialiseStack( portSTACK_TYPE * pxTopOfStack,
portSTACK_TYPE * pxEndOfStack,
pdTASK_CODE pxCode, void *pvParameters )
pdTASK_CODE pxCode,
void * pvParameters )
{
Thread_t * thread;
pthread_attr_t xThreadAttributes;
@ -154,7 +157,8 @@ int iRet;
iRet = pthread_create( &thread->pthread, &xThreadAttributes,
prvWaitForStart, thread );
if ( iRet )
if( iRet != 0 )
{
prvFatalError( "pthread_create", iRet );
}
@ -185,7 +189,7 @@ sigset_t xSignals;
hMainThread = pthread_self();
/* Start the timer that generates the tick ISR(SIGALRM).
Interrupts are disabled here already. */
* Interrupts are disabled here already. */
prvSetupTimerInterrupt();
/* Start the first task. */
@ -195,7 +199,7 @@ sigset_t xSignals;
sigemptyset( &xSignals );
sigaddset( &xSignals, SIG_RESUME );
while ( !xSchedulerEnd )
while( xSchedulerEnd != pdTRUE )
{
sigwait( &xSignals, &iSignal );
}
@ -252,6 +256,7 @@ void vPortEnterCritical( void )
{
vPortDisableInterrupts();
}
uxCriticalNesting++;
}
/*-----------------------------------------------------------*/
@ -308,7 +313,7 @@ void vPortEnableInterrupts( void )
portBASE_TYPE xPortSetInterruptMask( void )
{
/* Interrupts are always disabled inside ISRs (signals
handlers). */
* handlers). */
return pdTRUE;
}
/*-----------------------------------------------------------*/
@ -324,10 +329,11 @@ struct timespec t;
clock_gettime( CLOCK_MONOTONIC, &t );
return t.tv_sec * 1000000000ull + t.tv_nsec;
return t.tv_sec * 1000000000ULL + t.tv_nsec;
}
static uint64_t prvStartTimeNs;
/* commented as part of the code below in vPortSystemTickHandler,
* to adjust timing according to full demo requirements */
/* static uint64_t prvTickCount; */
@ -343,7 +349,8 @@ int iRet;
/* Initialise the structure with the current timer information. */
iRet = getitimer( ITIMER_REAL, &itimer );
if ( iRet )
if( iRet == -1 )
{
prvFatalError( "getitimer", errno );
}
@ -358,7 +365,8 @@ int iRet;
/* Set-up the timer interrupt. */
iRet = setitimer( ITIMER_REAL, &itimer, NULL );
if ( iRet )
if( iRet == -1 )
{
prvFatalError( "setitimer", errno );
}
@ -371,6 +379,7 @@ static void vPortSystemTickHandler( int sig )
{
Thread_t * pxThreadToSuspend;
Thread_t * pxThreadToResume;
/* uint64_t xExpectedTicks; */
uxCriticalNesting++; /* Signals are blocked in this signal handler. */
@ -381,12 +390,14 @@ Thread_t *pxThreadToResume;
/* Tick Increment, accounting for any lost signals or drift in
* the timer. */
/*
* Comment code to adjust timing according to full demo requirements
* xExpectedTicks = (prvGetTimeNs() - prvStartTimeNs)
* / (portTICK_RATE_MICROSECONDS * 1000);
* do { */
xTaskIncrementTick();
/* prvTickCount++;
* } while (prvTickCount < xExpectedTicks);
*/
@ -404,7 +415,8 @@ Thread_t *pxThreadToResume;
}
/*-----------------------------------------------------------*/
void vPortThreadDying( void *pxTaskToDelete, volatile BaseType_t *pxPendYield )
void vPortThreadDying( void * pxTaskToDelete,
volatile BaseType_t * pxPendYield )
{
Thread_t * pxThread = prvGetThreadFromTask( pxTaskToDelete );
@ -465,10 +477,12 @@ BaseType_t uxSavedCriticalNesting;
uxSavedCriticalNesting = uxCriticalNesting;
prvResumeThread( pxThreadToResume );
if ( pxThreadToSuspend->xDying )
if( pxThreadToSuspend->xDying == pdTRUE )
{
pthread_exit( NULL );
}
prvSuspendSelf( pxThreadToSuspend );
uxCriticalNesting = uxSavedCriticalNesting;
@ -516,6 +530,7 @@ int iRet;
sigemptyset( &xResumeSignals );
sigaddset( &xResumeSignals, SIG_RESUME );
sigfillset( &xAllSignals );
/* Don't block SIGINT so this can be used to break into GDB while
* in a critical section. */
sigdelset( &xAllSignals, SIGINT );
@ -527,11 +542,12 @@ int iRet;
* When a thread is resumed for the first time, all signals
* will be unblocked.
*/
(void)pthread_sigmask( SIG_SETMASK, &xAllSignals,
( void ) pthread_sigmask( SIG_SETMASK,
&xAllSignals,
&xSchedulerOriginalSignalMask );
/* SIG_RESUME is only used with sigwait() so doesn't need a
handler. */
* handler. */
sigresume.sa_flags = 0;
sigresume.sa_handler = SIG_IGN;
sigfillset( &sigresume.sa_mask );
@ -541,13 +557,15 @@ int iRet;
sigfillset( &sigtick.sa_mask );
iRet = sigaction( SIG_RESUME, &sigresume, NULL );
if ( iRet )
if( iRet == -1 )
{
prvFatalError( "sigaction", errno );
}
iRet = sigaction( SIGALRM, &sigtick, NULL );
if ( iRet )
if( iRet == -1 )
{
prvFatalError( "sigaction", errno );
}