Changeset 2 for pjproject/main/pjlib/src/pj/os_core_win32.c

Timestamp:

Nov 1, 2005 4:42:51 PM (18 years ago)

Author:

bennylp

Message:

Added suppor /and fix things for SunOS port

File:

• pjproject/main/pjlib/src/pj/os_core_win32.c (modified) (5 diffs)

pjproject/main/pjlib/src/pj/os_core_win32.c

@@ -192 +192 @@
 {
     char stack_ptr;
+    pj_status_t rc;
     pj_thread_t *thread = (pj_thread_t *)desc;
     pj_str_t thread_name = pj_str((char*)cstr_thread_name);
@@ -208 +209 @@
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(pj_thread_desc));
+    pj_memset(desc, 0, sizeof(struct pj_thread_t));
     thread->hthread = GetCurrentThread();
     thread->idthread = GetCurrentThreadId();
@@ -225 +226 @@
         pj_sprintf(thread->obj_name, "thr%p", (void*)thread->idthread);
     
-    pj_thread_local_set(thread_tls_id, thread);
+    rc = pj_thread_local_set(thread_tls_id, thread);
+    if (rc != PJ_SUCCESS)
+        return rc;
 
     *thread_ptr = thread;
@@ -257 +260 @@
     PJ_LOG(6,(rec->obj_name, "Thread started"));
 
-    pj_thread_local_set(thread_tls_id, rec);
+    if (pj_thread_local_set(thread_tls_id, rec) != PJ_SUCCESS) {
+        pj_assert(!"TLS is not set (pj_init() error?)");
+    }
+
     result = (*rec->proc)(rec->arg);
 
@@ -586 +592 @@
  * pj_thread_local_set()
  */
-PJ_DEF(void) pj_thread_local_set(long index, void *value)
-{
+PJ_DEF(pj_status_t) pj_thread_local_set(long index, void *value)
+{
+    BOOL rc;
+
     //Can't check stack because this function is called in the
     //beginning before main thread is initialized.
     //PJ_CHECK_STACK();
-    TlsSetValue(index, value);
+    rc = TlsSetValue(index, value);
+    return rc!=0 ? PJ_SUCCESS : PJ_RETURN_OS_ERROR(GetLastError());
 }