Changeset 4618 for pjproject/branches/projects/winphone/pjlib/src/pj/os_core_win32.c

Timestamp:

Oct 16, 2013 8:04:59 AM (11 years ago)

Author:

riza

Message:

Re #1704: Initial implementation with cli/telnet mode pjsua

File:

• pjproject/branches/projects/winphone/pjlib/src/pj/os_core_win32.c (modified) (12 diffs)

pjproject/branches/projects/winphone/pjlib/src/pj/os_core_win32.c

@@ -39 +39 @@
 #endif
 
+#if PJ_WIN32_WINPHONE
+#   include "../../third_party/threademulation/include/ThreadEmulation.h"
+#endif
+
+#if PJ_WIN32_WINNT >= 0x0602
+#  include <synchapi.h>
+#endif
+
 /* Activate mutex related logging if PJ_DEBUG_MUTEX is set, otherwise
  * use default level 6 logging.
@@ -298 +306 @@
 PJ_DEF(int) pj_thread_get_prio(pj_thread_t *thread)
 {
+#if PJ_WIN32_WINPHONE
+    PJ_UNUSED_ARG(thread);
+    return -1;
+#else
     return GetThreadPriority(thread->hthread);
+#endif
 }
 
@@ -507 +520 @@
     rec->proc = proc;
     rec->arg = arg;
+
+#ifdef PJ_WIN32_WINPHONE
+    rec->hthread = CreateThread(NULL, stack_size, 
+                                thread_main, rec,
+                                dwflags, NULL);
+#else
     rec->hthread = CreateThread(NULL, stack_size, 
                                 thread_main, rec,
                                 dwflags, &rec->idthread);
+#endif
+
     if (rec->hthread == NULL)
         return PJ_RETURN_OS_ERROR(GetLastError());
@@ -552 +573 @@
 PJ_DEF(pj_thread_t*) pj_thread_this(void)
 {
-    pj_thread_t *rec = pj_thread_local_get(thread_tls_id);
+    pj_thread_t *rec = (pj_thread_t *)pj_thread_local_get(thread_tls_id);
 
     if (rec == NULL) {
@@ -585 +606 @@
     PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name));
 
+#if PJ_WIN32_WINPHONE
+    rc = WaitForSingleObjectEx(rec->hthread, INFINITE, FALSE);
+#else
     rc = WaitForSingleObject(rec->hthread, INFINITE);
+#endif
 
     if (rc==WAIT_OBJECT_0)
@@ -859 +884 @@
     PJ_CHECK_STACK();
 
-#if PJ_WIN32_WINNT >= 0x0400
-    InitializeCriticalSection(&mutex->crit);
+#if PJ_WIN32_WINPHONE
+    InitializeCriticalSectionEx(&mutex->crit, 0, 0);
+#elif PJ_WIN32_WINNT >= 0x0400
+    InitializeCriticalSection(&mutex->crit);   
 #else
     mutex->hMutex = CreateMutex(NULL, FALSE, NULL);
@@ -1112 +1139 @@
     PJ_ASSERT_RETURN(pool && sem_ptr, PJ_EINVAL);
 
-    sem = pj_pool_alloc(pool, sizeof(*sem));    
+    sem = pj_pool_alloc(pool, sizeof(*sem)); 
+#if PJ_WIN32_WINPHONE
+    /** SEMAPHORE_ALL_ACCESS **/
+    sem->hSemaphore = CreateSemaphoreEx(NULL, initial, max, NULL, 0, 
+                                        SEMAPHORE_ALL_ACCESS);
+#else
     sem->hSemaphore = CreateSemaphore(NULL, initial, max, NULL);
+#endif
     if (!sem->hSemaphore)
         return PJ_RETURN_OS_ERROR(GetLastError());
@@ -1144 +1177 @@
                               pj_thread_this()->obj_name));
 
+#if PJ_WIN32_WINPHONE
+    result = WaitForSingleObjectEx(sem->hSemaphore, timeout, FALSE);
+#else
     result = WaitForSingleObject(sem->hSemaphore, timeout);
+#endif
+
     if (result == WAIT_OBJECT_0) {
         LOG_MUTEX((sem->obj_name, "Semaphore acquired by thread %s", 
@@ -1241 +1279 @@
         return PJ_ENOMEM;
 
+#if PJ_WIN32_WINPHONE
+    event->hEvent = CreateEventEx(NULL, NULL, 
+                                  (manual_reset?0x1:0x0)|(initial?0x2:0x0), 
+                                  EVENT_ALL_ACCESS);
+#else
     event->hEvent = CreateEvent(NULL, manual_reset?TRUE:FALSE, 
                                 initial?TRUE:FALSE, NULL);
+#endif
 
     if (!event->hEvent)
@@ -1274 +1318 @@
                                 pj_thread_this()->obj_name));
 
+#if PJ_WIN32_WINPHONE
+    result = WaitForSingleObjectEx(event->hEvent, timeout, FALSE);
+#else
     result = WaitForSingleObject(event->hEvent, timeout);
+#endif
     if (result == WAIT_OBJECT_0) {
         PJ_LOG(6, (event->obj_name, "Event: thread %s is released", 
@@ -1332 +1380 @@
 PJ_DEF(pj_status_t) pj_event_pulse(pj_event_t *event)
 {
+#ifdef PJ_WIN32_WINPHONE
+    PJ_UNUSED_ARG(event);
+    pj_assert(!"pj_event_pulse() not supported!");
+    return PJ_ENOTSUP;
+#else
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(event, PJ_EINVAL);
@@ -1341 +1394 @@
     else
         return PJ_RETURN_OS_ERROR(GetLastError());
+#endif
 }