Changeset 6946 in vbox

Timestamp:

Feb 14, 2008 12:59:57 PM (17 years ago)

Author:

vboxsync

Message:

Aligned the TLS destructor bits with posix.

Location:

trunk

Files:

• include/iprt/thread.h (modified) (4 diffs)
• src/VBox/Runtime/r3/os2/thread-os2.cpp (modified) (1 diff)

trunk/include/iprt/thread.h

@@ -379 +379 @@
  * @returns NIL_RTTLS on failure.
  */
-RTR3DECL(int) RTTlsAlloc(void);
+RTR3DECL(RTTLS) RTTlsAlloc(void);
 
 /**
@@ -436 +436 @@
  *
  * @param   pvValue     The current value.
- * @param   iTls        The index of TLS entry.
- * @param   fFlags      Reserved for the future.
- */
-typedef DECLCALLBACK(void) FNRTTLSDTOR(void *pvValue, RTTLS iTls, uint32_t fFlags);
+ */
+typedef DECLCALLBACK(void) FNRTTLSDTOR(void *pvValue);
 /** Pointer to a FNRTTLSDTOR. */
 typedef FNRTTLSDTOR *PFNRTTLSDTOR;
@@ -460 +458 @@
  *                          registered destructor.
  *
- *                          It's pvValue argument is the non-zero value in the
- *                          TLS entry for the thread it's called on.
- *
- *                          It's fFlags argument is reserved for future use, it will
- *                          always be zero when the fFlags parameter to this API is zero.
- *
- * @param   fFlags          Flags reserved for future use. At the moment
- *                          only ZERO is allowed.
- *
- */
-RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor, uint32_t fFlags);
+ */
+RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor);
 
 /**
@@ -482 +471 @@
  * @param   iTls            The index of the TLS entry.
  * @param   ppfnDestructor  Where to store the destructor address.
- * @param   pfFlags         Where to store the flags supplied to RTTlsSetDestructor(). NULL is fine.
- */
-PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor, uint32_t *pfFlags);
+ */
+PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor);
 
 /** @} */

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

@@ -279 +279 @@
 
 
-RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor, uint32_t fFlags)
+RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor)
 {
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER)
-    if (__libc_TLSDestructor(iTls, pfnDestructor, fFlags) == -1)
-        return VINF_SUCCESS;
-    return RTErrConvertFromErrno(errno);
-}
-
-
-PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor, uint32_t *pfFlags)
-{
-    uint32_t fFlags;
-    if (!pfFlags)
-        pfFlags = &fFlags;
+    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 = __libc_TLSGetDestructor(iTls, pFlags);
+    *ppfnDestructor = (PFNRTTLSDTOR)__libc_TLSGetDestructor(iTls, &fFlags);
     if (!*ppfnDestructor && errno)
         return RTErrConvertFromErrno(errno);