Changes in / [30:20]

Location:

/pjproject/main

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 diff)
• build.mak (added)
• build.mak.txt (deleted)
• configure (deleted)
• pjlib-util (deleted)
• pjlib/build/os-linux.mak (modified) (1 diff)
• pjlib/build/pjlib.dsp (modified) (1 diff)
• pjlib/include/pj++ (deleted)
• pjlib/include/pj/md5.h (added)
• pjlib/include/pj/scanner.h (added)
• pjlib/include/pj/stun.h (added)
• pjlib/include/pj/xml.h (added)
• pjlib/src/pj++/hash.hpp (added)
• pjlib/src/pj++/ioqueue.hpp (added)
• pjlib/src/pj++/list.hpp (added)
• pjlib/src/pj++/os.hpp (added)
• pjlib/src/pj++/pool.hpp (added)
• pjlib/src/pj++/proactor.hpp (added)
• pjlib/src/pj++/scanner.hpp (added)
• pjlib/src/pj++/sock.hpp (added)
• pjlib/src/pj++/string.hpp (added)
• pjlib/src/pj++/timer.hpp (added)
• pjlib/src/pj++/tree.hpp (added)
• pjlib/src/pj++/types.hpp (added)
• pjlib/src/pj/ioqueue_common_abs.c (modified) (2 diffs)
• pjlib/src/pj/md5.c (added)
• pjlib/src/pj/scanner.c (added)
• pjlib/src/pj/stun.c (added)
• pjlib/src/pj/stun_client.c (added)
• pjlib/src/pj/xml.c (added)
• pjlib/src/pjlib-test/exception.c (modified) (1 diff)
• pjlib/src/pjlib-test/test.h (modified) (3 diffs)
• pjlib/src/pjlib-test/udp_echo_srv_sync.c (modified) (3 diffs)
• pjlib/src/pjlib-test/xml.c (added)

/pjproject/main/Makefile

@@ -1 @@
-DIRS = pjlib
+DIRS = pjlib pjsdp pjmedia pjsip
 
 ifdef MINSIZE

/pjproject/main/pjlib/build/os-linux.mak

@@ -15 +15 @@
                         pool_policy_malloc.o sock_bsd.o sock_select.o
 
-ifeq (epoll,$(LINUX_POLL))
+#export PJLIB_OBJS += ioqueue_select.o 
 export PJLIB_OBJS += ioqueue_epoll.o
-else
-export PJLIB_OBJS += ioqueue_select.o 
-endif
 
 export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o

/pjproject/main/pjlib/build/pjlib.dsp

@@ -200 +200 @@
 
 SOURCE=..\src\pj\file_io_ansi.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=..\src\pj\file_io_win32.c
-# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File

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

@@ -169 +169 @@
          * successfully (if SO_ERROR is zero).
          */
-        {
-          int value;
-          socklen_t vallen = sizeof(value);
-          int gs_rc = getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
+        int value;
+        socklen_t vallen = sizeof(value);
+        int gs_rc = getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
                                &value, &vallen);
-          if (gs_rc != 0) {
+        if (gs_rc != 0) {
             /* Argh!! What to do now??? 
              * Just indicate that the socket is connected. The
@@ -181 +180 @@
              */
             bytes_transfered = 0;
-          } else {
+        } else {
             bytes_transfered = value;
-          }
-        }
+        }
 #elif defined(PJ_WIN32) && PJ_WIN32!=0
         bytes_transfered = 0; /* success */

/pjproject/main/pjlib/src/pjlib-test/exception.c

@@ -141 +141 @@
 
     for (i=0; i<LOOP; ++i) {
-        if ((rc=test()) != 0) {
-            PJ_LOG(3,("", "...failed at i=%d (rc=%d)", i, rc));
+        if ((rc=test()) != 0)
             return rc;
-        }
     }
     return 0;

/pjproject/main/pjlib/src/pjlib-test/test.h

@@ -6 +6 @@
 #include <pj/types.h>
 
-#define GROUP_LIBC                  1
-#define GROUP_OS                    1
-#define GROUP_DATA_STRUCTURE        1
-#define GROUP_NETWORK               1
-#define GROUP_FILE                  1
+#define GROUP_LIBC                  0
+#define GROUP_OS                    0
+#define GROUP_DATA_STRUCTURE        0
+#define GROUP_NETWORK               0
+#define GROUP_FILE                  0
 #define GROUP_EXTRA                 0
 
@@ -38 +38 @@
 
 #define INCLUDE_ECHO_SERVER         0
-#define INCLUDE_ECHO_CLIENT         0
+#define INCLUDE_ECHO_CLIENT         1
 
 
@@ -46 +46 @@
 #define ECHO_SERVER_DURATION_MSEC   (60*60*1000)
 
-#define ECHO_CLIENT_MAX_THREADS     6
+#define ECHO_CLIENT_MAX_THREADS     10
 
 PJ_BEGIN_DECL

/pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c

@@ -91 +91 @@
     pj_time_val last_print;
     unsigned count;
-    const char *ioqueue_name;
 
     last_received = 0;
@@ -97 +96 @@
     avg_bw = highest_bw = 0;
     count = 0;
-
-    ioqueue_name = pj_ioqueue_name();
 
     for (;;) {
@@ -125 +122 @@
         count++;
 
-        PJ_LOG(3,("", "%s UDP (%d threads): %u KB/s (avg=%u KB/s) %s", 
-                  ioqueue_name,
+        PJ_LOG(3,("", "Synchronous UDP (%d threads): %u KB/s (avg=%u KB/s) %s", 
                   ECHO_SERVER_MAX_THREADS, 
                   (unsigned)(bw / 1000),