Changeset 10f924c for lib

Timestamp:

05/23/14 17:31:26 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

2a7047c

Parents:

d3b6b91

Message:

Fixed broken -fvisibility check in configure

• Added a m4 script that does this properly rather than our hax gcc version check.
• Tidied up CFLAGS in configure so we aren't adding the same sets of flags multiple times
• Created a wandio_internal.h file for storing global variables that shouldn't be made public

Thanks to Alistair King, whose patch to try and make this work for
non-gcc systems brought my attention to just how broken this was :)

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• libtrace.h.in (modified) (3 diffs)
• libtrace_int.h (modified) (1 diff)
• protocols_ospf.c (modified) (1 diff)
• protocols_transport.c (modified) (1 diff)

lib/Makefile.am

@@ -2 +2 @@
 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h  
 
-AM_CFLAGS=@LIBCFLAGS@
-AM_CXXFLAGS=@LIBCXXFLAGS@
+AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@
+AM_CXXFLAGS=@LIBCXXFLAGS@ @CFLAG_VISIBILITY@
 
 extra_DIST = format_template.c

lib/libtrace.h.in

@@ -80 +80 @@
 #if defined(LITTLE_ENDIAN) && !defined(__LITTLE_ENDIAN)
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
-#endif
-
-#ifdef _MSC_VER
-    /* define the following from MSVC's internal types */
-    typedef             __int8  int8_t;
-    typedef             __int16 int16_t;
-    typedef             __int32 int32_t;
-    typedef             __int64 int64_t;
-    typedef unsigned    __int8  uint8_t;
-    typedef unsigned    __int16 uint16_t;
-    typedef unsigned    __int32 uint32_t;
-    typedef unsigned    __int64 uint64_t;
-    #ifdef LT_BUILDING_DLL
-        #define DLLEXPORT __declspec(dllexport)
-    #else
-        #define DLLEXPORT __declspec(dllimport)
-    #endif
-    #define DLLLOCAL
-    /* Windows pads bitfields out to to the size of their parent type
-     * however gcc warns that this doesn't meet with the iso C specification
-     * so produces warnings for this behaviour.  sigh.
-     */
-    #define LT_BITFIELD8        uint8_t
-    #define LT_BITFIELD16       uint16_t
-    #define LT_BITFIELD32       uint32_t
-    #define LT_BITFIELD64       uint64_t
-#else
-    #ifdef HAVE_STDINT_H
-        #   include <stdint.h>
-    #endif
-    #if __GNUC__ >= 4
-        #ifdef LT_BUILDING_DLL
-                #define DLLEXPORT __attribute__ ((visibility("default")))
-                #define DLLLOCAL __attribute__ ((visibility("hidden")))
-        #else
-                #define DLLEXPORT
-                #define DLLLOCAL
-        #endif
-    #else
-        #define DLLEXPORT
-        #define DLLLOCAL
-    #endif
-    /* GCC warns if the bitfield type is not "unsigned int", however windows
-     * generates incorrect code for this (see above), so we define these
-     * macros.  How Hideous.  So much for C's portability.
-     */
-    #define LT_BITFIELD8        unsigned int
-    #define LT_BITFIELD16       unsigned int
-    #define LT_BITFIELD32       unsigned int
-    #define LT_BITFIELD64       unsigned int
 #endif
 
@@ -170 +120 @@
 #endif
 
+#ifdef _MSC_VER
+    /* define the following from MSVC's internal types */
+    typedef             __int8  int8_t;
+    typedef             __int16 int16_t;
+    typedef             __int32 int32_t;
+    typedef             __int64 int64_t;
+    typedef unsigned    __int8  uint8_t;
+    typedef unsigned    __int16 uint16_t;
+    typedef unsigned    __int32 uint32_t;
+    typedef unsigned    __int64 uint64_t;
+    
+    /* Windows pads bitfields out to to the size of their parent type
+     * however gcc warns that this doesn't meet with the iso C specification
+     * so produces warnings for this behaviour.  sigh.
+     */
+    #define LT_BITFIELD8        uint8_t
+    #define LT_BITFIELD16       uint16_t
+    #define LT_BITFIELD32       uint32_t
+    #define LT_BITFIELD64       uint64_t
+#else
+    #ifdef HAVE_STDINT_H
+        #   include <stdint.h>
+    #endif
+    /* GCC warns if the bitfield type is not "unsigned int", however windows
+     * generates incorrect code for this (see above), so we define these
+     * macros.  How Hideous.  So much for C's portability.
+     */
+    #define LT_BITFIELD8        unsigned int
+    #define LT_BITFIELD16       unsigned int
+    #define LT_BITFIELD32       unsigned int
+    #define LT_BITFIELD64       unsigned int
+#endif
+
 /* Function does not depend on anything but its
  * parameters, used to hint gcc's optimisations
+ *
+ * TODO: Find a way to check for these that is not gcc-specific
  */
 #if __GNUC__ >= 3 
@@ -186 +171 @@
 #  define PRINTF(formatpos,argpos) 
 #endif
+
+#ifdef _MSC_VER
+    #ifdef LT_BUILDING_DLL
+        #define DLLEXPORT __declspec(dllexport)
+    #else
+        #define DLLEXPORT __declspec(dllimport)
+    #endif
+    #define DLLLOCAL
+#else
+    #ifndef DLLEXPORT
+        #if HAVE_VISIBILITY && LT_BUILDING_DLL
+            #define DLLEXPORT __attribute__ ((visibility("default")))
+            #define DLLLOCAL __attribute__ ((visibility("hidden")))
+        #else
+            #define DLLEXPORT
+            #define DLLLOCAL
+        #endif
+    #endif
+#endif
+
         
 /** Opaque structure holding information about an output trace */

lib/libtrace_int.h

@@ -147 +147 @@
 #include "bpf-jit/bpf-jit.h"
 #endif
+
 
 //#define RP_BUFSIZE 65536U

lib/protocols_ospf.c

@@ -32 +32 @@
  */
 
+#include "libtrace_int.h"
 #include "libtrace.h"
 #include "protocols.h"

lib/protocols_transport.c

@@ -33 +33 @@
 
 
+#include "libtrace_int.h"
 #include "libtrace.h"
 #include "protocols.h"