Changeset 750

Timestamp:

Oct 4, 2006 8:46:27 PM (18 years ago)

Author:

bennylp

Message:

Fixed compilation errors when threading is disabled (PJ_HAS_THREADS=0) and safe ioqueue unregistration is disabled (PJ_IOQUEUE_HAS_SAFE_UNREG=0). Also increase PJ_IOQUEUE_MAX_HANDLES for minimum config to 16 in config_sample.h [thanks Olivier Gournet].

Location:

pjproject/trunk/pjlib

Files:

• include/pj/config_site_sample.h (modified) (2 diffs)
• src/pj/ioqueue_common_abs.c (modified) (9 diffs)
• src/pj/ioqueue_select.c (modified) (3 diffs)
• src/pj/os_core_unix.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -45 +45 @@
 #   define PJ_HAS_ERROR_STRING          0
 #   undef PJ_IOQUEUE_MAX_HANDLES
-#   define PJ_IOQUEUE_MAX_HANDLES       4
-#   define PJSIP_MAX_TSX_COUNT          16
-#   define PJSIP_MAX_DIALOG_COUNT       16
+#   define PJ_IOQUEUE_MAX_HANDLES       16
+#   define PJSIP_MAX_TSX_COUNT          15
+#   define PJSIP_MAX_DIALOG_COUNT       15
 #   define PJSIP_UDP_SO_SNDBUF_SIZE     4000
 #   define PJSIP_UDP_SO_RCVBUF_SIZE     4000
@@ -54 +54 @@
 #   define PJSIP_AUTH_QOP_SUPPORT       0
 #   define PJMEDIA_HAS_LARGE_FILTER     0
-#   define PJMEDIA_HAS_SMALL_FILTER     1
+#   define PJMEDIA_HAS_SMALL_FILTER     0
 
 

pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

@@ -184 +184 @@
     pj_mutex_lock(h->mutex);
 
-    if (h->closing) {
+    if (IS_CLOSING(h)) {
         pj_mutex_unlock(h->mutex);
         return;
@@ -362 +362 @@
     pj_mutex_lock(h->mutex);
 
-    if (h->closing) {
+    if (IS_CLOSING(h)) {
         pj_mutex_unlock(h->mutex);
         return;
@@ -511 +511 @@
     }
 
-    if (h->closing) {
+    if (IS_CLOSING(h)) {
         pj_mutex_unlock(h->mutex);
         return;
@@ -561 +561 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 
@@ -623 +623 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 
@@ -692 +692 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 
@@ -801 +801 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 
@@ -914 +914 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 
@@ -979 +979 @@
 
     /* Check if key is closing. */
-    if (key->closing)
+    if (IS_CLOSING(key))
         return PJ_ECANCELLED;
 

pjproject/trunk/pjlib/src/pj/ioqueue_select.c

@@ -697 +697 @@
 
         if ( (key_has_pending_write(h) || key_has_pending_connect(h))
-             && PJ_FD_ISSET(h->fd, &wfdset) && !h->closing)
+             && PJ_FD_ISSET(h->fd, &wfdset) && !IS_CLOSING(h))
         {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -709 +709 @@
         /* Scan for readable socket. */
         if ((key_has_pending_read(h) || key_has_pending_accept(h))
-            && PJ_FD_ISSET(h->fd, &rfdset) && !h->closing)
+            && PJ_FD_ISSET(h->fd, &rfdset) && !IS_CLOSING(h))
         {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -721 +721 @@
 #if PJ_HAS_TCP
         if (key_has_pending_connect(h) && PJ_FD_ISSET(h->fd, &xfdset) &&
-            !h->closing) 
+            !IS_CLOSING(h)) 
         {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -185 +185 @@
 PJ_DEF(pj_bool_t) pj_thread_is_registered(void)
 {
+#if PJ_HAS_THREADS
     return pj_thread_local_get(thread_tls_id) != 0;
+#else
+    pj_assert("pj_thread_is_registered() called in non-threading mode!");
+    return PJ_TRUE;
+#endif
 }
 
@@ -945 +950 @@
     return PJ_SUCCESS;
 #else /* PJ_HAS_THREADS */
-    return (pj_mutex_t*)1;
+    *ptr_mutex = (pj_mutex_t*)1;
+    return PJ_SUCCESS;
 #endif
 }