POSIX code/demo update.

This was the version we loaded to freertos.org before 2019 Op1 meeting.
This version of the code has:
- updated POSIX internal data structure.
- updated util functions.
- new atomic.h
- POSIX code optimization with atomic.

This version also:
- fixed pthread_cond_timedwait() thread count underflow. https://sourceforge.net/p/freertos/bugs/197/
- pthread_cond_timedwait() mutex release and count semaphore take is not "atomic" in our implementation.

Author: yuhui-zheng

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/FreeRTOS_Plus_POSIX_with_actor.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RTOSDemo", "WIN32.vcxproj", "{C686325E-3261-42F7-AEB1-DDE5280E1CEB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RTOS_POSIX_Demo", "WIN32.vcxproj", "{C686325E-3261-42F7-AEB1-DDE5280E1CEB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {18112148-F9F0-43E0-B713-B146289BDEF3}
+	EndGlobalSection
 EndGlobal

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/WIN32.vcxproj

@@ -13,7 +13,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C686325E-3261-42F7-AEB1-DDE5280E1CEB}</ProjectGuid>
     <ProjectName>RTOS_POSIX_Demo</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -132,7 +131,6 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\croutine.c" />
     <ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c" />
     <ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
     <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_4.c" />

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/WIN32.vcxproj.filters

@@ -90,9 +90,6 @@
     <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
       <Filter>lib\FreeRTOS\Portable\MSVC-W</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\croutine.c">
-      <Filter>lib\FreeRTOS</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c">
       <Filter>lib\FreeRTOS</Filter>
     </ClCompile>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/lib/FreeRTOS-Plus-POSIX/include/FreeRTOS_POSIX.h

@@ -1,5 +1,5 @@
 /*
- * Amazon FreeRTOS+POSIX V1.0.0
+ * Amazon FreeRTOS POSIX V1.1.0
  * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -35,7 +35,7 @@
 
 /* FreeRTOS+POSIX platform-specific configuration headers. */
 #include "FreeRTOS_POSIX_portable.h"
-#include "portable/FreeRTOS_POSIX_portable_default.h"
+#include "FreeRTOS_POSIX_portable_default.h"
 
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/lib/FreeRTOS-Plus-POSIX/include/FreeRTOS_POSIX_internal.h

@@ -1,5 +1,5 @@
 /*
- * Amazon FreeRTOS+POSIX V1.0.0
+ * Amazon FreeRTOS POSIX V1.1.0
  * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -32,64 +32,98 @@
  */
 
 /* Amazon FreeRTOS includes. */
-#include "aws_doubly_linked_list.h"
+#include "iot_doubly_linked_list.h"
 
 /**
  * @brief Mutex attribute object.
  */
-typedef struct pthread_mutexattr_internal
-{
-    int iType; /**< Mutex type. */
-} pthread_mutexattr_internal_t;
+#if posixconfigENABLE_PTHREAD_MUTEXATTR_T == 1
+    typedef struct pthread_mutexattr_internal
+    {
+        int iType; /**< Mutex type. */
+    } pthread_mutexattr_internal_t;
+#endif
+
+#if posixconfigENABLE_PTHREAD_MUTEX_T == 1
 
 /**
  * @brief Mutex.
  */
-typedef struct pthread_mutex_internal
-{
-    BaseType_t xIsInitialized;          /**< Set to pdTRUE if this mutex is initialized, pdFALSE otherwise. */
-    StaticSemaphore_t xMutex;           /**< FreeRTOS mutex. */
-    TaskHandle_t xTaskOwner;            /**< Owner; used for deadlock detection and permission checks. */
-    pthread_mutexattr_internal_t xAttr; /**< Mutex attributes. */
-} pthread_mutex_internal_t;
+    typedef struct pthread_mutex_internal
+    {
+        BaseType_t xIsInitialized;          /**< Set to pdTRUE if this mutex is initialized, pdFALSE otherwise. */
+        StaticSemaphore_t xMutex;           /**< FreeRTOS mutex. */
+        TaskHandle_t xTaskOwner;            /**< Owner; used for deadlock detection and permission checks. */
+        pthread_mutexattr_internal_t xAttr; /**< Mutex attributes. */
+    } pthread_mutex_internal_t;
 
 /**
  * @brief Compile-time initializer of pthread_mutex_internal_t.
  */
-#define FREERTOS_POSIX_MUTEX_INITIALIZER \
-    ( &( ( pthread_mutex_internal_t )    \
-    {                                    \
-        .xIsInitialized = pdFALSE,       \
-        .xMutex = { { 0 } },             \
-        .xTaskOwner = NULL,              \
-        .xAttr = { .iType = 0 }          \
-    }                                    \
-         )                               \
+    #define FREERTOS_POSIX_MUTEX_INITIALIZER \
+    ( ( ( pthread_mutex_internal_t )         \
+    {                                        \
+        .xIsInitialized = pdFALSE,           \
+        .xMutex = { { 0 } },                 \
+        .xTaskOwner = NULL,                  \
+        .xAttr = { .iType = 0 }              \
+    }                                        \
+        )                                    \
     )
+#endif /* if posixconfigENABLE_PTHREAD_MUTEX_T == 1 */
+
+#if posixconfigENABLE_PTHREAD_COND_T == 1
 
 /**
  * @brief Condition variable.
  */
-typedef struct pthread_cond_internal
-{
-    BaseType_t xIsInitialized;            /**< Set to pdTRUE if this condition variable is initialized, pdFALSE otherwise. */
-    StaticSemaphore_t xCondMutex;         /**< Prevents concurrent accesses to iWaitingThreads. */
-    StaticSemaphore_t xCondWaitSemaphore; /**< Threads block on this semaphore in pthread_cond_wait. */
-    int iWaitingThreads;                  /**< The number of threads currently waiting on this condition variable. */
-} pthread_cond_internal_t;
+    typedef struct pthread_cond_internal
+    {
+        BaseType_t xIsInitialized;            /**< Set to pdTRUE if this condition variable is initialized, pdFALSE otherwise. */
+        StaticSemaphore_t xCondWaitSemaphore; /**< Threads block on this semaphore in pthread_cond_wait. */
+        unsigned iWaitingThreads;             /**< The number of threads currently waiting on this condition variable. */
+    } pthread_cond_internal_t;
 
 /**
  * @brief Compile-time initializer of pthread_cond_internal_t.
  */
-#define FREERTOS_POSIX_COND_INITIALIZER \
-    ( &( ( pthread_cond_internal_t )    \
-    {                                   \
-        .xIsInitialized = pdFALSE,      \
-        .xCondMutex = { { 0 } },        \
-        .xCondWaitSemaphore = { { 0 } },\
-        .iWaitingThreads = 0            \
-    }                                   \
-         )                              \
+
+    #define FREERTOS_POSIX_COND_INITIALIZER \
+    ( ( ( pthread_cond_internal_t )         \
+    {                                       \
+        .xIsInitialized = pdFALSE,          \
+        .xCondWaitSemaphore = { { 0 } },    \
+        .iWaitingThreads = 0                \
+    }                                       \
+        )                                   \
     )
 
+#endif /* if posixconfigENABLE_PTHREAD_COND_T == 1 */
+
+#if posixconfigENABLE_SEM_T == 1
+
+/**
+ * @brief Semaphore type.
+ */
+    typedef struct
+    {
+        StaticSemaphore_t xSemaphore; /**< FreeRTOS semaphore. */
+        int value;                    /**< POSIX semaphore count. */
+    } sem_internal_t;
+#endif /* if posixconfigENABLE_SEM_T == 1 */
+
+#if posixconfigENABLE_PTHREAD_BARRIER_T == 1
+
+/**
+ * @brief Barrier object.
+ */
+    typedef struct pthread_barrier_internal
+    {
+        unsigned uThreadCount;                   /**< Current number of threads that have entered barrier. */
+        unsigned uThreshold;                     /**< The count argument of pthread_barrier_init. */
+        StaticSemaphore_t xThreadCountSemaphore; /**< Prevents more than uThreshold threads from exiting pthread_barrier_wait at once. */
+        StaticEventGroup_t xBarrierEventGroup;   /**< FreeRTOS event group that blocks to wait on threads entering barrier. */
+    } pthread_barrier_internal_t;
+#endif /* if posixconfigENABLE_PTHREAD_BARRIER_T == 1 */
+
 #endif /* _FREERTOS_POSIX_INTERNAL_H_ */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/lib/FreeRTOS-Plus-POSIX/include/FreeRTOS_POSIX_types.h

@@ -0,0 +1,81 @@
+/*
+ * Amazon FreeRTOS POSIX V1.1.0
+ * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * http://aws.amazon.com/freertos
+ * http://www.FreeRTOS.org
+ */
+
+#ifndef _FREERTOS_POSIX_INTERNAL_TYPES_H_
+#define _FREERTOS_POSIX_INTERNAL_TYPES_H_
+
+#include "FreeRTOS_POSIX_internal.h"
+
+/*
+ * sys/types.h defines a POSIX type when posixconfigENABLE_PTHREAD_<TYPE>_T
+ * is not defined AND when posixconfigENABLE_PTHREAD_<TYPE>_T is set to 1.
+ * FreeRTOS_POSIX_internal.h defines internal type ONLY when
+ * posixconfigENABLE_PTHREAD_<TYPE>_T is set to 1.
+ * #else part below is to have a type defined, so the code compiles, when
+ * posixconfigENABLE_PTHREAD_<TYPE>_T is not defined.
+ */
+#if posixconfigENABLE_PTHREAD_MUTEX_T == 1
+    typedef pthread_mutex_internal_t   PthreadMutexType_t;
+#else
+    typedef void                       * PthreadMutexType_t;
+#endif
+
+#if posixconfigENABLE_PTHREAD_COND_T == 1
+    typedef pthread_cond_internal_t    PthreadCondType_t;
+#else
+    typedef void                       * PthreadCondType_t;
+#endif
+
+#if posixconfigENABLE_SEM_T == 1
+    typedef sem_internal_t             PosixSemType_t;
+#else
+    typedef void                       * PosixSemType_t;
+#endif
+
+#if posixconfigENABLE_PTHREAD_MUTEXATTR_T == 1
+    typedef struct pthread_mutexattr
+    {
+        uint32_t ulpthreadMutexAttrStorage;
+    } PthreadMutexAttrType_t;
+#else
+    typedef void * PthreadMutexAttrType_t;
+#endif
+
+#if posixconfigENABLE_PTHREAD_ATTR_T == 1
+    typedef struct pthread_attr
+    {
+        uint32_t ulpthreadAttrStorage;
+    } PthreadAttrType_t;
+#else
+    typedef void                       * PthreadAttrType_t;
+#endif
+
+#if posixconfigENABLE_PTHREAD_BARRIER_T == 1
+    typedef pthread_barrier_internal_t PthreadBarrierType_t;
+#else
+    typedef void                       * PthreadBarrierType_t;
+#endif
+
+#endif /* _FREERTOS_POSIX_INTERNAL_TYPES_H_ */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/lib/FreeRTOS-Plus-POSIX/include/portable/FreeRTOS_POSIX_portable_default.h

@@ -1,5 +1,5 @@
 /*
- * Amazon FreeRTOS+POSIX V1.0.0
+ * Amazon FreeRTOS POSIX V1.1.0
  * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -32,21 +32,25 @@
 #define _FREERTOS_POSIX_PORTABLE_DEFAULT_H_
 
 /**
- * @brief The FreeRTOS task name given to pthreads.
+ * @name The FreeRTOS task name given to pthreads.
  */
+/**@{ */
 #ifndef posixconfigPTHREAD_TASK_NAME
-    #define posixconfigPTHREAD_TASK_NAME    "pthread"
+    #define posixconfigPTHREAD_TASK_NAME    "pthread" /**< Task name. */
 #endif
+/**@} */
 
 /**
- * @brief the FreeRTOS timer name given to POSIX timers.
+ * @name the FreeRTOS timer name given to POSIX timers.
  */
+/**@{ */
 #ifndef posixconfigTIMER_NAME
-    #define posixconfigTIMER_NAME    "timer"
+    #define posixconfigTIMER_NAME    "timer" /**< Timer name. */
 #endif
+/**@} */
 
 /**
- * @defgroup Defaults for POSIX message queue implementation.
+ * @name Defaults for POSIX message queue implementation.
  */
 /**@{ */
 #ifndef posixconfigMQ_MAX_MESSAGES
@@ -59,7 +63,7 @@
 /**@} */
 
 /**
- * @defgroup POSIX implementation-dependent constants usually defined in limits.h.
+ * @name POSIX implementation-dependent constants usually defined in limits.h.
  *
  * They are defined here to provide portability between platforms.
  */
@@ -71,12 +75,12 @@
     #define NAME_MAX             64                                               /**< Maximum number of bytes in a filename (not including terminating null). */
 #endif
 #ifndef SEM_VALUE_MAX
-    #define SEM_VALUE_MAX        0xFFFFU                                          /**< Maximum value of a sem_t. */
+    #define SEM_VALUE_MAX        0x7FFFU                                          /**< Maximum value of a sem_t. */
 #endif
 /**@} */
 
 /**
- * @defgroup Enable typedefs of POSIX types.
+ * @name Enable typedefs of POSIX types.
  *
  * Set these values to 1 or 0 to enable or disable the typedefs, respectively.
  * These typedefs should only be disabled if they conflict with system typedefs.
@@ -130,8 +134,11 @@
 #ifndef posixconfigENABLE_ITIMERSPEC
     #define posixconfigENABLE_ITIMERSPEC             1 /**< struct itimerspec in time.h */
 #endif
-#ifndef posixconfigENABLE_TM
-    #define posixconfigENABLE_TM                     1 /**< struct tm in time.h */
+#ifndef posixconfigENABLE_SEM_T
+    #define posixconfigENABLE_SEM_T                  1 /**< struct sem_t in semaphore.h */
+#endif
+#ifndef posixconfigENABLE_PTHREAD_BARRIER_T
+    #define posixconfigENABLE_PTHREAD_BARRIER_T      1 /**< pthread_barrier_t in sys/types.h */
 #endif
 /**@} */
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_POSIX_with_actor_Windows_Simulator/lib/FreeRTOS-Plus-POSIX/include/portable/espressif/esp32_devkitc_esp_wrover_kit/FreeRTOS_POSIX_portable.h

@@ -1,5 +1,5 @@
 /*
- * Amazon FreeRTOS+POSIX V1.0.0
+ * Amazon FreeRTOS+POSIX V1.0.4
  * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -42,12 +42,19 @@
 #define posixconfigENABLE_PTHREAD_MUTEXATTR_T    0
 #define posixconfigENABLE_PTHREAD_T              0
 #define posixconfigENABLE_TIME_T                 0
-#define posixconfigENABLE_TIMER_T                0
 #define posixconfigENABLE_TIMESPEC               0
 #define posixconfigENABLE_ITIMERSPEC             0
 
-/* ESP-IDF already provides the header sched.h. Exclude them by
- * activating the double inclusion guards. */
+/* ESP-IDF already provides the header sched.h. Exclude FreeRTOS+POSIX sched.h by
+ * defining its double inclusion guard. */
 #define _FREERTOS_POSIX_SCHED_H_
 
+/* Use the FreeRTOS+POSIX time.h header instead of the ESP-IDF time.h. Disable
+ * ESP-IDF time.h by defining its double inclusion guard. */
+#define _TIME_H_
+
+/* Disable the timer_t type defined by ESP-IDF. */
+#define __timer_t_defined
+#include <sys/types.h>
+
 #endif /* _FREERTOS_POSIX_PORTABLE_H_ */