Changeset 9991 for source/ariba/utility

Timestamp:

Jul 28, 2011, 2:03:14 PM (13 years ago)

Author:

Christoph Mayer

Message:

-fixes on protlib for android

Location:

source/ariba/utility/transport/tcpip/protlib

Files:

• address.cpp (modified) (3 diffs)
• address.h (modified) (1 diff)
• eclock_gettime.c (modified) (1 diff)
• fastqueue.c (modified) (2 diffs)
• logfile.h (modified) (1 diff)
• threads.h (modified) (2 diffs)
• tp_over_udp.cpp (modified) (1 diff)

source/ariba/utility/transport/tcpip/protlib/address.cpp

@@ -91 +91 @@
           Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==()" << haddr->get_ip_str()<<"=="<<this->get_ip_str());
           if (!ipv4flag)
-            Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==(), v6=" << IN6_ARE_ADDR_EQUAL(ipv6addr.s6_addr, haddr->ipv6addr.s6_addr));
+            Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==(), v6=" << IN6_ARE_ADDR_EQUAL(&ipv6addr, &(haddr->ipv6addr)));
 #endif
           return ipv4flag ? (ipv4addr.s_addr==haddr->ipv4addr.s_addr) :
-                            IN6_ARE_ADDR_EQUAL(ipv6addr.s6_addr, haddr->ipv6addr.s6_addr);
+                            IN6_ARE_ADDR_EQUAL(&ipv6addr, &(haddr->ipv6addr));
         } else return false;
 } // end operator==
@@ -177 +177 @@
 bool hostaddress::is_ip_unspec() const {
         if (ipv4flag) return (ipv4addr.s_addr==0);
-        else return IN6_IS_ADDR_UNSPECIFIED(ipv6addr.s6_addr);
+        else return IN6_IS_ADDR_UNSPECIFIED(&ipv6addr);
         // never reached
         return true;
@@ -225 +225 @@
                 in = ipv4addr;
                 return true;
-        } else if (IN6_IS_ADDR_V4MAPPED(ipv6addr.s6_addr)) {
+        } else if (IN6_IS_ADDR_V4MAPPED(&ipv6addr)) {
                 memcpy(&(in.s_addr),ipv6addr.s6_addr+12,4);
                 return true;

source/ariba/utility/transport/tcpip/protlib/address.h

@@ -1306 +1306 @@
 hostaddress::is_mapped_ip() const
 {
-  return (ipv4flag) ? false : IN6_IS_ADDR_V4MAPPED(ipv6addr.s6_addr);
+  return (ipv4flag) ? false : IN6_IS_ADDR_V4MAPPED(&ipv6addr);
 } // end is_mapped_ip
 

source/ariba/utility/transport/tcpip/protlib/eclock_gettime.c

@@ -38 +38 @@
 /* struct timezone tz = { 0, DST_NONE }; */
 static struct timeval tv;
-typedef int             clockid_t;
 
 /* syntax for clock_gettime:

source/ariba/utility/transport/tcpip/protlib/fastqueue.c

@@ -58 +58 @@
 #define qerr(errnr)      fprintf(stderr,"queue.c: %s\n",queue_errmsg[errnr])
 
-#ifdef __linux__
-
-// not needed for Linux
-//#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
 
 #define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_TIMED_NP
@@ -74 +70 @@
 #define clock_gettime(clock_id, tspec) eclock_gettime(tspec)
 
-#elif _DECTHREADS_VERSION < 314126L
-
-#define pthread_mutexattr_settype pthread_mutexattr_settype_np
-#define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_NORMAL_NP
-#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP
-#endif
                  /*************** typedefs *****************/
 

source/ariba/utility/transport/tcpip/protlib/logfile.h

@@ -53 +53 @@
 namespace log {
 
-    static const pthread_mutex_t initlogmutex=
-#ifdef _DEBUG
-  // PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; // use this for debugging, it will return errors on potential deadlock situations
-  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-#else // should be recursive mutex because sometimes error log output sometimes occurs
-  // while objects contents are logged
-  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; // PTHREAD_MUTEX_INITIALIZER;
-#endif
+static const pthread_mutex_t initlogmutex=
+    #ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+                PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+    #else
+        PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+    #endif
 
 #undef ERROR_LOG

source/ariba/utility/transport/tcpip/protlib/threads.h

@@ -71 +71 @@
 template <class T> void *thread_starter(void *thread_object) {
 
+#ifdef PTHREAD_CANCEL_ENABLE
         pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+#endif
+#ifdef PTHREAD_CANCEL_DEFERRED
         pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
 
         (static_cast<T*>(thread_object))->start_processing();
@@ -537 +541 @@
                 thread_object.unlock();
                 if (kill) {
+
+#ifdef PTHREAD_CANCEL_ENABLE
                         for (unsigned i = 0; i < pthreads.size(); i++) 
                                 pthread_cancel( pthreads[i] );
 
                         sleepuntilstop();
+#endif
 
                         for (unsigned i = 0; i < pthreads.size(); i++) 

source/ariba/utility/transport/tcpip/protlib/tp_over_udp.cpp

@@ -41 +41 @@
 #include <arpa/inet.h>          /* inet_addr */
 
+#ifndef IPPROTO_IPV6
+        // v6 structs not defined in netinet/in.h, pull in here
+        #include <linux/ipv6.h>
+#endif
+
 #include <fcntl.h>
 #include <sys/poll.h>