Changeset 109 for pjproject/trunk/pjsip/src/test-pjsip/uri_test.c

Timestamp:

Jan 7, 2006 6:44:25 PM (18 years ago)

Author:

bennylp

Message:

Added test functions for UAC transaction

File:

• pjproject/trunk/pjsip/src/test-pjsip/uri_test.c (modified) (11 diffs)

pjproject/trunk/pjsip/src/test-pjsip/uri_test.c

@@ -20 +20 @@
 #include <pjsip_core.h>
 #include <pjlib.h>
+
+#define THIS_FILE   "uri_test.c"
 
 
@@ -693 +695 @@
         status = entry->status==ERR_SYNTAX_ERR ? PJ_SUCCESS : -10;
         if (status != 0) {
-            PJ_LOG(3,("", "   uri parse error!\n"
-                          "   uri='%s'\n",
-                          entry->str));
+            PJ_LOG(3,(THIS_FILE, "   uri parse error!\n"
+                                 "   uri='%s'\n",
+                                 entry->str));
         }
         goto on_return;
@@ -739 +741 @@
         status = entry->status==ERR_NOT_EQUAL ? PJ_SUCCESS : -40;
         if (status != 0) {
-            PJ_LOG(3,("", "   uri comparison mismatch, status=%d:\n"
-                          "    uri1='%s'\n"
-                          "    uri2='%s'",
-                          status, s1.ptr, s2.ptr));
+            PJ_LOG(3,(THIS_FILE, "   uri comparison mismatch, status=%d:\n"
+                                 "    uri1='%s'\n"
+                                 "    uri2='%s'",
+                                 status, s1.ptr, s2.ptr));
         }
         goto on_return;
@@ -763 +765 @@
         if (pj_strcmp2(&s1, entry->printed) != 0) {
             /* Not equal. */
-            PJ_LOG(3,("", "   uri print mismatch:\n"
-                          "    printed='%s'\n"
-                          "    expectd='%s'",
-                          s1.ptr, entry->printed));
+            PJ_LOG(3,(THIS_FILE, "   uri print mismatch:\n"
+                                 "    printed='%s'\n"
+                                 "    expectd='%s'",
+                                 s1.ptr, entry->printed));
             status = -60;
         }
@@ -772 +774 @@
         if (pj_strcmp(&s1, &s2) != 0) {
             /* Not equal. */
-            PJ_LOG(3,("", "   uri print mismatch:\n"
-                          "    uri1='%s'\n"
-                          "    uri2='%s'",
-                          s1.ptr, s2.ptr));
+            PJ_LOG(3,(THIS_FILE, "   uri print mismatch:\n"
+                                 "    uri1='%s'\n"
+                                 "    uri2='%s'",
+                                 s1.ptr, s2.ptr));
             status = -70;
         }
@@ -795 +797 @@
     zero.u32.hi = zero.u32.lo = 0;
 
-    PJ_LOG(3,("", "  simple test"));
+    PJ_LOG(3,(THIS_FILE, "  simple test"));
     pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
     for (i=0; i<PJ_ARRAY_SIZE(uri_test_array); ++i) {
         status = do_uri_test(pool, &uri_test_array[i]);
         if (status != PJ_SUCCESS) {
-            PJ_LOG(3,("uri_test", "  error %d when testing entry %d",
+            PJ_LOG(3,(THIS_FILE, "  error %d when testing entry %d",
                       status, i));
             goto on_return;
@@ -807 +809 @@
     pjsip_endpt_release_pool(endpt, pool);
 
-    PJ_LOG(3,("", "  benchmarking..."));
+    PJ_LOG(3,(THIS_FILE, "  benchmarking..."));
     parse_len = print_len = cmp_len = 0;
     parse_time.u32.hi = parse_time.u32.lo = 0;
@@ -817 +819 @@
             status = do_uri_test(pool, &uri_test_array[i]);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(3,("uri_test", "  error %d when testing entry %d",
+                PJ_LOG(3,(THIS_FILE, "  error %d when testing entry %d",
                           status, i));
                 pjsip_endpt_release_pool(endpt, pool);
@@ -835 +837 @@
     avg_parse = 1000000 / avg_parse;
 
-    PJ_LOG(3,("", "    %u.%u MB of urls parsed in %d.%03ds (avg=%d urls/sec)", 
-                  (unsigned)(parse_len/1000000), (unsigned)kbytes,
-                  elapsed.sec, elapsed.msec,
-                  (unsigned)avg_parse));
+    PJ_LOG(3,(THIS_FILE, 
+              "    %u.%u MB of urls parsed in %d.%03ds (avg=%d urls/sec)", 
+              (unsigned)(parse_len/1000000), (unsigned)kbytes,
+              elapsed.sec, elapsed.msec,
+              (unsigned)avg_parse));
 
     kbytes = print_len;
@@ -849 +852 @@
     avg_print = 1000000 / avg_print;
 
-    PJ_LOG(3,("", "    %u.%u MB of urls printed in %d.%03ds (avg=%d urls/sec)", 
-                  (unsigned)(print_len/1000000), (unsigned)kbytes,
-                  elapsed.sec, elapsed.msec,
-                  (unsigned)avg_print));
+    PJ_LOG(3,(THIS_FILE, 
+              "    %u.%u MB of urls printed in %d.%03ds (avg=%d urls/sec)", 
+              (unsigned)(print_len/1000000), (unsigned)kbytes,
+              elapsed.sec, elapsed.msec,
+              (unsigned)avg_print));
 
     kbytes = cmp_len;
@@ -863 +867 @@
     avg_cmp = 1000000 / avg_cmp;
 
-    PJ_LOG(3,("", "    %u.%u MB of urls compared in %d.%03ds (avg=%d urls/sec)", 
-                  (unsigned)(cmp_len/1000000), (unsigned)kbytes,
-                  elapsed.sec, elapsed.msec,
-                  (unsigned)avg_cmp));
-
-    PJ_LOG(3,("", "  multithreaded test"));
+    PJ_LOG(3,(THIS_FILE, 
+              "    %u.%u MB of urls compared in %d.%03ds (avg=%d urls/sec)", 
+              (unsigned)(cmp_len/1000000), (unsigned)kbytes,
+              elapsed.sec, elapsed.msec,
+              (unsigned)avg_cmp));
+
+    PJ_LOG(3,(THIS_FILE, "  multithreaded test"));