Fix windows compile issue and revert invalid Zephyr stack index init

Signed-off-by: Patrick Masselink <patrick.masselink@zettascale.tech>
eclipse-cyclonedds · Mar 23, 2023 · f706b9f · f706b9f
1 parent 24c8e9f
commit f706b9f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/core/ddsi/src/ddsi_plist.c b/src/core/ddsi/src/ddsi_plist.c
@@ -1605,7 +1605,7 @@ static dds_return_t valid_generic (const void *src, size_t srcoff, const enum dd
       case XSTOP: return 0;
       case XO: SIMPLE (XO, ddsi_octetseq_t, (x->length == 0) == (x->value == NULL)); break;
       case XS: SIMPLE (XS, const char *, *x != NULL); break;
-      case XE1: case XE2: case XE3: SIMPLE (*desc, enum xe3_prototype, *x <= 1 + (uint32_t) *desc - XE1); break;
+      case XE1: case XE2: case XE3: SIMPLE (*desc, enum xe3_prototype, *x <= (int32_t) (1 + (uint32_t) *desc - XE1)); break;
       case Xs: TRIVIAL (Xs, int16_t); break;
       case Xi: case Xix2: case Xix3: case Xix4: TRIVIAL (Xi, int32_t); break;
       case Xu: case Xux2: case Xux3: case Xux4: case Xux5: TRIVIAL (Xu, uint32_t); break;

diff --git a/src/ddsrt/src/cdtors.c b/src/ddsrt/src/cdtors.c
@@ -23,8 +23,6 @@ extern void ddsrt_winsock_init(void);
 extern void ddsrt_winsock_fini(void);
 extern void ddsrt_time_init(void);
 extern void ddsrt_time_fini(void);
-#elif __ZEPHYR__
-extern void ddsrt_thread_stack_init(void);
 #endif
 
 #define INIT_STATUS_OK 0x80000000u
@@ -45,8 +43,6 @@ void ddsrt_init (void)
 #if _WIN32
     ddsrt_winsock_init();
     ddsrt_time_init();
-#elif __ZEPHYR__
-    ddsrt_thread_stack_init();
 #endif
     ddsrt_random_init();
     ddsrt_atomics_init();

diff --git a/src/ddsrt/src/threads/posix/threads.c b/src/ddsrt/src/threads/posix/threads.c
@@ -240,14 +240,9 @@ static void *os_startRoutineWrapper (void *threadContext)
 #error "CONFIG_MAX_PTHREAD_COUNT is insufficient to run CycloneDDS"
 #endif
 
-static int currThrIdx;
+static int currThrIdx = 0;
 K_THREAD_STACK_ARRAY_DEFINE(zephyr_stacks, CYCLONEDDS_THREAD_COUNT, CYCLONEDDS_THREAD_STACK_SIZE);
 
-void
-ddsrt_thread_stack_init (void)
-{
-  currThrIdx = 0;
-}
 #endif
 
 dds_return_t