Changeset 624

Timestamp:

Jul 23, 2006 2:38:49 PM (18 years ago)

Author:

bennylp

Message:

Added 64bit Linux target (x86_64), also fixed compilation warnings when compiling for this target

Location:

pjproject/trunk

Files:

• build/m-x86_64.mak (added)
• configure (modified) (1 diff)
• pjlib/include/pj/compat/m_x86_64.h (added)
• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/src/pj/ioqueue_common_abs.c (modified) (2 diffs)
• pjlib/src/pj/pool_caching.c (modified) (2 diffs)
• pjmedia/build/m-x86_64.mak (added)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (5 diffs)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_ua_layer.c (modified) (1 diff)
• pjsip/src/test-pjsip/msg_test.c (modified) (3 diffs)
• pjsip/src/test-pjsip/transport_loop_test.c (modified) (1 diff)
• pjsip/src/test-pjsip/transport_tcp_test.c (modified) (1 diff)
• pjsip/src/test-pjsip/transport_test.c (modified) (2 diffs)
• pjsip/src/test-pjsip/transport_udp_test.c (modified) (1 diff)
• pjsip/src/test-pjsip/uri_test.c (modified) (3 diffs)

pjproject/trunk/configure

@@ -12 +12 @@
 elif echo $MACHINE | grep i.86 > /dev/null; then
     MACHINE_NAME=i386
+elif echo $MACHINE | grep x86_64 > /dev/null; then
+    MACHINE_NAME=x86_64
 elif echo $MACHINE | grep alpha > /dev/null; then
     MACHINE_NAME=alpha

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

@@ -66 +66 @@
 #if defined (PJ_M_I386) && PJ_M_I386 != 0
 #   include <pj/compat/m_i386.h>
+#elif defined (PJ_M_X86_64) && PJ_M_X86_64 != 0
+#   include <pj/compat/m_x86_64.h>
 #elif defined (PJ_M_M68K) && PJ_M_M68K != 0
 #   include <pj/compat/m_m68k.h>

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

@@ -209 +209 @@
         {
           int value;
-          socklen_t vallen = sizeof(value);
+          int vallen = sizeof(value);
           int gs_rc = pj_sock_getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
                                          &value, &vallen);
@@ -529 +529 @@
 #if (defined(PJ_HAS_SO_ERROR) && PJ_HAS_SO_ERROR!=0)
         int value;
-        socklen_t vallen = sizeof(value);
+        int vallen = sizeof(value);
         int gs_rc = pj_sock_getsockopt(h->fd, SOL_SOCKET, SO_ERROR, 
                                        &value, &vallen);

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

@@ -176 +176 @@
 
     /* Mark factory data */
-    pool->factory_data = (void*) idx;
+    pool->factory_data = (void*) (long) idx;
 
     /* Increment used count. */
@@ -226 +226 @@
      * Otherwise put the pool in our recycle list.
      */
-    i = (unsigned)pool->factory_data;
+    i = (unsigned) (unsigned long) pool->factory_data;
 
     pj_assert(i<PJ_CACHING_POOL_ARRAY_SIZE);

pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c

@@ -505 +505 @@
 
     /*
-     * Respond any requests with 500.
+     * Respond any requests (except ACK!) with 500.
      */
-    pjsip_endpt_respond_stateless(app.sip_endpt, rdata, 500, &reason,
-                                  NULL, NULL);
+    if (rdata->msg_info.msg->line.req.method.id != PJSIP_ACK_METHOD) {
+        pjsip_endpt_respond_stateless(app.sip_endpt, rdata, 500, &reason,
+                                      NULL, NULL);
+    }
+
     return PJ_TRUE;
 }
@@ -1314 +1317 @@
 {
     pj_time_val end_time, last_report, now;
-    unsigned thread_index = (unsigned)arg;
+    unsigned thread_index = (unsigned)(long)arg;
     unsigned cycle = 0, last_cycle = 0;
 
@@ -1471 +1474 @@
 {
     pj_time_val timeout = { 0, 1 };
-    unsigned thread_index = (unsigned)arg;
+    unsigned thread_index = (unsigned)(long)arg;
     pj_time_val last_report, next_report;
 
@@ -1607 +1610 @@
 
         for (i=0; i<app.thread_count; ++i) {
-            status = pj_thread_create(app.pool, NULL, &client_thread, (void*)i,
-                                      0, 0, &app.thread[i]);
+            status = pj_thread_create(app.pool, NULL, &client_thread, 
+                                      (void*)(long)i, 0, 0, &app.thread[i]);
             if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "Unable to create thread", status);
@@ -1716 +1719 @@
 
         for (i=0; i<app.thread_count; ++i) {
-            status = pj_thread_create(app.pool, NULL, &server_thread, (void*)i,
-                                      0, 0, &app.thread[i]);
+            status = pj_thread_create(app.pool, NULL, &server_thread, 
+                                      (void*)(long)i, 0, 0, &app.thread[i]);
             if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "Unable to create thread", status);

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -87 +87 @@
     rdata->tp_info.pool = pool;
     rdata->tp_info.transport = &tp->base;
-    rdata->tp_info.tp_data = (void*) rdata_index;
+    rdata->tp_info.tp_data = (void*)(long)rdata_index;
     rdata->tp_info.op_key.rdata = rdata;
     pj_ioqueue_op_key_init(&rdata->tp_info.op_key.op_key, 
@@ -191 +191 @@
 
             rdata_tp = (struct udp_transport*)rdata->tp_info.transport;
-            rdata_index = (unsigned)rdata->tp_info.tp_data;
+            rdata_index = (unsigned)(unsigned long)rdata->tp_info.tp_data;
 
             pj_pool_reset(rdata_pool);

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -540 +540 @@
             pj_mutex_unlock(mod_ua.mutex);
 
-            PJ_LOG(5,(THIS_FILE, 
-                      "Unable to find dialog for %s, answering with 481",
-                      pjsip_rx_data_get_info(rdata)));
-
-            pjsip_endpt_respond_stateless(mod_ua.endpt, rdata,
-                                          PJSIP_SC_CALL_TSX_DOES_NOT_EXIST, 
-                                          NULL, NULL, NULL);
+            if (rdata->msg_info.msg->line.req.method.id != PJSIP_ACK_METHOD) {
+                PJ_LOG(5,(THIS_FILE, 
+                          "Unable to find dialog for %s, answering with 481",
+                          pjsip_rx_data_get_info(rdata)));
+
+                pjsip_endpt_respond_stateless(mod_ua.endpt, rdata,
+                                              PJSIP_SC_CALL_TSX_DOES_NOT_EXIST, 
+                                              NULL, NULL, NULL);
+            } else {
+                PJ_LOG(5,(THIS_FILE, 
+                          "Unable to find dialog for %s",
+                          pjsip_rx_data_get_info(rdata)));
+            }
             return PJ_TRUE;
         }

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

@@ -819 +819 @@
                           "per second (tested with %d message sets with "
                           "average message length of "
-                          "%d bytes)", PJ_ARRAY_SIZE(test_array), avg_len);
+                          "%d bytes)", (int)PJ_ARRAY_SIZE(test_array), avg_len);
     report_ival("msg-detect-per-sec", max, "msg/sec", desc);
 
@@ -832 +832 @@
                           "per second (tested with %d message sets with "
                           "average message length of "
-                          "%d bytes)", PJ_ARRAY_SIZE(test_array), avg_len);
+                          "%d bytes)", (int)PJ_ARRAY_SIZE(test_array), avg_len);
     report_ival("msg-parse-per-sec", max, "msg/sec", desc);
 
@@ -852 +852 @@
                           " per second (tested with %d message sets with "
                           "average message length of "
-                          "%d bytes)", PJ_ARRAY_SIZE(test_array), avg_len);
+                          "%d bytes)", (int)PJ_ARRAY_SIZE(test_array), avg_len);
 
     report_ival("msg-print-per-sec", max, "msg/sec", desc);

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

@@ -32 +32 @@
     pj_status_t status;
     long ref_cnt;
-    unsigned rtt[LOOP], min_rtt;
+    int rtt[LOOP], min_rtt;
 
     PJ_LOG(3,(THIS_FILE, "testing datagram loop transport"));

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

@@ -36 +36 @@
     pj_status_t status;
     char url[64];
-    unsigned rtt[SEND_RECV_LOOP], min_rtt;
+    int rtt[SEND_RECV_LOOP], min_rtt;
     int i, pkt_lost;
 

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

@@ -490 +490 @@
 static int rt_worker_thread(void *arg)
 {
-    int i, thread_id = (int)arg;
+    int i, thread_id = (int)(long)arg;
     pj_time_val poll_delay = { 0, 10 };
 
@@ -577 +577 @@
 
         /* Create thread, suspended. */
-        status = pj_thread_create(pool, "rttest%p", &rt_worker_thread, (void*)i, 0,
+        status = pj_thread_create(pool, "rttest%p", &rt_worker_thread, (void*)(long)i, 0,
                                   PJ_THREAD_SUSPENDED, &rt_test_data[i].thread);
         if (status != PJ_SUCCESS) {

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

@@ -35 +35 @@
     pj_str_t s;
     pj_status_t status;
-    unsigned rtt[SEND_RECV_LOOP], min_rtt;
+    int rtt[SEND_RECV_LOOP], min_rtt;
     int i, pkt_lost;
 

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

@@ -956 +956 @@
                           "(tested with %d URI set, with average length of "
                           "%d chars)",
-                          PJ_ARRAY_SIZE(uri_test_array), avg_len);
+                          (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
 
     report_ival("uri-parse-per-sec", max, "URI/sec", desc);
@@ -976 +976 @@
                           "(tested with %d URI set, with average length of "
                           "%d chars)",
-                          PJ_ARRAY_SIZE(uri_test_array), avg_len);
+                          (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
 
     report_ival("uri-print-per-sec", max, "URI/sec", desc);
@@ -990 +990 @@
                           "(tested with %d URI set, with average length of "
                           "%d chars)",
-                          PJ_ARRAY_SIZE(uri_test_array), avg_len);
+                          (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
 
     report_ival("uri-cmp-per-sec", max, "URI/sec", desc);