Changeset 3426

Timestamp:

Feb 28, 2011 10:19:23 PM (14 years ago)

Author:

bennylp

Message:

Re #1202 (pjlib sysinfo): testing on OpenSolaris? and added pjlib-test entry

Location:

pjproject/trunk/pjlib/src

Files:

• pj/os_info.c (modified) (3 diffs)
• pjlib-test/os.c (modified) (1 diff)
• pjlib-test/test.c (modified) (1 diff)
• pjlib-test/test.h (modified) (2 diffs)

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

@@ -89 +89 @@
         return &si;
 
+    si.machine.ptr = si.os_name.ptr = si.sdk_name.ptr = si.info.ptr = "";
+
 #define ALLOC_CP_STR(str,field) \
         do { \
@@ -109 +111 @@
         int i, maxtok;
 
-        if (uname(&u) != 0)
+        /* Successful uname() returns zero on Linux and positive value
+         * on OpenSolaris.
+         */
+        if (uname(&u) == -1)
             goto get_sdk_info;
+
         ALLOC_CP_STR(u.machine, machine);
         ALLOC_CP_STR(u.sysname, os_name);
@@ -227 +233 @@
 
         cnt = pj_ansi_snprintf(tmp, sizeof(tmp),
-                               "%s%s/%s/%s%s",
+                               "%s%s%s%s%s%s%s",
                                si.os_name.ptr,
                                ver_info(si.os_ver, os_ver),
+                               (si.machine.slen ? "/" : ""),
                                si.machine.ptr,
+                               (si.sdk_name.slen ? "/" : ""),
                                si.sdk_name.ptr,
                                ver_info(si.sdk_ver, sdk_ver));

pjproject/trunk/pjlib/src/pjlib-test/os.c

@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
+#include "test.h"
+#include <pj/log.h>
+#include <pj/os.h>
+
+#if INCLUDE_OS_TEST
+int os_test(void)
+{
+    const pj_sys_info *si;
+    int rc = 0;
+
+    si = pj_get_sys_info();
+    PJ_LOG(3,("", "   machine:  %s", si->machine.ptr));
+    PJ_LOG(3,("", "   os_name:  %s", si->os_name.ptr));
+    PJ_LOG(3,("", "   os_ver:   0x%x", si->os_ver));
+    PJ_LOG(3,("", "   sdk_name: %s", si->sdk_name.ptr));
+    PJ_LOG(3,("", "   sdk_ver:  0x%x", si->sdk_ver));
+    PJ_LOG(3,("", "   info:     %s", si->info.ptr));
+
+    return rc;
+}
+
+#else
 int dummy_os_var;
+#endif
+

pjproject/trunk/pjlib/src/pjlib-test/test.c

@@ -76 +76 @@
 #endif
 
+#if INCLUDE_OS_TEST
+    DO_TEST( os_test() );
+#endif
+
 #if INCLUDE_RAND_TEST
     DO_TEST( rand_test() );

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

@@ -48 +48 @@
 #define INCLUDE_MUTEX_TEST          (PJ_HAS_THREADS && GROUP_OS)
 #define INCLUDE_SLEEP_TEST          GROUP_OS
+#define INCLUDE_OS_TEST             GROUP_OS
 #define INCLUDE_THREAD_TEST         (PJ_HAS_THREADS && GROUP_OS)
 #define INCLUDE_SOCK_TEST           GROUP_NETWORK
@@ -79 +80 @@
 extern int list_test(void);
 extern int hash_test(void);
+extern int os_test(void);
 extern int pool_test(void);
 extern int pool_perf_test(void);