Changeset 96052 in vbox

Timestamp:

Aug 5, 2022 10:48:48 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Added no-CRT per-thread data like errno and strtok state. Implemented strtol and errno accessor. bugref:10261

Location:

trunk

Files:

trunk/include/iprt/nocrt/errno.h

r95975	r96052
46	46
47	47	RT_C_DECLS_BEGIN
	48
48	49	RTDECL(int *) rtNoCrtGetErrnoPtr(void);
49	50	# define errno (*rtNoCrtGetErrnoPtr())

-              r96045
+              r96052
         common/string/nocrt-strdup.cpp \
         common/string/nocrt-stricmp.cpp \
+        common/string/strtok_r.cpp
+        common/string/nocrt-strtol.cpp \
+        common/string/strtok_r.cpp \
+        r3/nocrt-per-thread-1.cpp \
+        r3/nocrt-per-thread-2.cpp \
+        r3/nocrt-errno.cpp
   RuntimeR3_SOURCES.x86 = $(RuntimeBaseR3_SOURCES.x86) \
         common/misc/setjmp.asm \

-              r95200
+              r96052
 #ifdef RT_WITH_ICONV_CACHE
         rtStrIconvCacheInit(pThread);
+#endif
+#if defined(IPRT_NO_CRT) && defined(IN_RING3)
+        pThread->NoCrt.enmAllocType = RTNOCRTTHREADDATA::kAllocType_Embedded;
+        RTListInit(&pThread->NoCrt.ListEntry);
 #endif
         rc = RTSemEventMultiCreate(&pThread->EventUser);
 …
                     ASMAtomicIncU32(&g_cThreadInTree);
                     ASMAtomicIncU32(&g_acRTThreadTypeStats[pThread->enmType]);
+#if defined(IPRT_NO_CRT) && defined(IN_RING3)
+                    RTTLS const iTlsPerThread = g_iTlsRtNoCrtPerThread;
+                    if (   iTlsPerThread != NIL_RTTLS
+                        && RTTlsGet(iTlsPerThread) == NULL)
+                        RTTlsSet(iTlsPerThread, &pThread->NoCrt);
+#endif
+                }
 …
      */
     rtThreadRemove(pThread);
+#if defined(IPRT_NO_CRT) && defined(IN_RING3)
+    RTTLS const iTlsPerThread = g_iTlsRtNoCrtPerThread;
+    if (   iTlsPerThread != NIL_RTTLS
+        && RTTlsGet(iTlsPerThread) == &pThread->NoCrt)
+        RTTlsSet(iTlsPerThread, &g_RtNoCrtPerThreadDummy);
+#endif
     rtThreadRelease(pThread);
+}

-              r96045
+              r96052
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
 #include "internal/iprt.h"
+#include "internal/nocrt.h"
 #include <iprt/string.h>
 …
 char *RT_NOCRT(strtok)(char *psz, const char *pszDelimiters)
+{
+    static char *s_pszState = NULL; /** @todo make this a TLS variable. */
+    return RT_NOCRT(strtok_r)(psz, pszDelimiters, &s_pszState);
+    PRTNOCRTTHREADDATA pNoCrtData = rtNoCrtThreadDataGet();
+    if (pNoCrtData)
+        return RT_NOCRT(strtok_r)(psz, pszDelimiters, &pNoCrtData->pszStrToken);
+    static char *s_pszFallback = NULL;
+    return RT_NOCRT(strtok_r)(psz, pszDelimiters, &s_pszFallback);
+}
 RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(strtok);

-              r94718
+              r96052
 #ifdef RT_WITH_ICONV_CACHE
 # include "internal/string.h"
+#endif
+#if defined(IPRT_NO_CRT) && defined(IN_RING3)
+# include "internal/nocrt.h"
 #endif
 …
     /** Handle cache for iconv.
      * @remarks ASSUMES sizeof(void *) >= sizeof(iconv_t). */
     void *ahIconvs[RTSTRICONV_END];
+    void                   *ahIconvs[RTSTRICONV_END];
 #endif
 #ifdef IPRT_WITH_GENERIC_TLS
 …
     /** Thread name. */
     char                    szName[RTTHREAD_NAME_LEN];
+#if defined(IPRT_NO_CRT) && defined(IN_RING3)
+    /** No-CRT per thread data. */
+    RTNOCRTTHREADDATA       NoCrt;
+#endif
 } RTTHREADINT;
 /** Pointer to the internal representation of a thread. */

Note: See TracChangeset for help on using the changeset viewer.