vbox的更動 6951 路徑 trunk/src/VBox/Runtime/r3/os2

時間撮記:

2008-2-14 下午02:09:52 (17 年 以前)

作者:

vboxsync

訊息:

Aligned the TLS destructor bits even more with posix.

檔案:

• trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -229 +229 @@
 
 
-RTR3DECL(int) RTTlsAllocEx(PRTTLS piTls)
-{
+RTR3DECL(int) RTTlsAllocEx(PRTTLS piTls, PFNRTTLSDTOR pfnDestructor)
+{
+    int rc;
     int iTls = __libc_TLSAlloc();
     if (iTls != -1)
-        return iTls;
-    return RTErrConvertFromErrno(errno);
+    {
+        if (    !pfnDestructor
+            ||  __libc_TLSDestructor(iTls, (void (*)(void *, int, unsigned))pfnDestructor, fFlags) != -1)
+        {
+            *piTls = iTls;
+            return VINF_SUCCESS;
+        }
+
+        rc = RTErrConvertFromErrno(errno);
+        __libc_TLSFree(iTls);
+    }
+    else
+        rc = RTErrConvertFromErrno(errno);
+
+    *piTls = NIL_RTTLS;
+    return rc;
 }
 
@@ -278 +293 @@
 }
 
-
-RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor)
-{
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER)
-    if (__libc_TLSDestructor(iTls, (void (*)(void *, int, unsigned))pfnDestructor, fFlags) == -1)
-        return VINF_SUCCESS;
-    return RTErrConvertFromErrno(errno);
-}
-
-
-PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor)
-{
-    unsigned fFlags;
-    errno = 0;
-    *ppfnDestructor = (PFNRTTLSDTOR)__libc_TLSGetDestructor(iTls, &fFlags);
-    if (!*ppfnDestructor && errno)
-        return RTErrConvertFromErrno(errno);
-    return VINF_SUCCESS;
-}
-