Hidden symbols fix

blosc/CMakeLists.txt

@@ -3,6 +3,12 @@ add_definitions(-DUSING_CMAKE)
 
 set(INTERNAL_LIBS ${CMAKE_SOURCE_DIR}/internal-complibs)
 
+# Hide symbols by default unless they're specifically exported.
+# This makes it easier to keep the set of exported symbols the
+# same across all compilers/platforms.
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
 # includes
 if(NOT DEACTIVATE_LZ4)
     if (LZ4_FOUND)
@@ -89,18 +95,20 @@ if(NOT DEACTIVATE_ZLIB)
     endif(ZLIB_FOUND)
 endif(NOT DEACTIVATE_ZLIB)
 
-
 # targets
 add_library(blosc_shared SHARED ${SOURCES})
 set_target_properties(blosc_shared PROPERTIES OUTPUT_NAME blosc)
 set_target_properties(blosc_shared PROPERTIES
         VERSION ${version_string}
         SOVERSION 1  # Change this when an ABI change happens
     )
-if (MSVC)
-	set_target_properties (blosc_shared PROPERTIES COMPILE_FLAGS -DBLOSC_DLL_EXPORT=TRUE)
-endif(MSVC)
+set_property(
+    TARGET blosc_shared
+    APPEND PROPERTY COMPILE_DEFINITIONS BLOSC_SHARED_LIBRARY)
 
+# Based on the target architecture and hardware features supported
+# by the C compiler, set hardware architecture optimization flags
+# for specific shuffle implementations.
 if(COMPILER_SUPPORT_SSE2)
     if (MSVC)
         # MSVC targets SSE2 by default on 64-bit configurations, but not 32-bit configurations.
@@ -132,20 +140,45 @@ if(COMPILER_SUPPORT_AVX2)
         SOURCE shuffle.c
         APPEND PROPERTY COMPILE_DEFINITIONS SHUFFLE_AVX2_ENABLED)
 endif(COMPILER_SUPPORT_AVX2)
+
+# When the option has been selected to compile the test suite,
+# compile an additional version of blosc_shared which exports
+# some normally-hidden symbols (to facilitate unit testing).
+if (BUILD_TESTS)
+    add_library(blosc_shared_testing SHARED ${SOURCES})
+    set_target_properties(blosc_shared_testing PROPERTIES OUTPUT_NAME blosc_testing)
+    set_property(
+        TARGET blosc_shared_testing
+        APPEND PROPERTY COMPILE_DEFINITIONS BLOSC_SHARED_LIBRARY)
+    set_property(
+        TARGET blosc_shared_testing
+        APPEND PROPERTY COMPILE_DEFINITIONS BLOSC_TESTING)
+    # TEMP : CMake doesn't automatically add -lpthread here like it does
+    # for the blosc_shared target. Force it for now.
+    if(UNIX)
+        set_property(
+            TARGET blosc_shared_testing
+            APPEND PROPERTY LINK_FLAGS "-lpthread")
+    endif()
+endif()
+
 target_link_libraries(blosc_shared ${LIBS})
+if (BUILD_TESTS)
+    target_link_libraries(blosc_shared_testing ${LIBS})
+endif()
 
 if(BUILD_STATIC)
     add_library(blosc_static STATIC ${SOURCES})
     set_target_properties(blosc_static PROPERTIES OUTPUT_NAME blosc)
-	if (MSVC)
-		set_target_properties(blosc_static PROPERTIES PREFIX lib)
-	endif()
+    if (MSVC)
+        set_target_properties(blosc_static PROPERTIES PREFIX lib)
+    endif()
     target_link_libraries(blosc_static ${LIBS})
 endif(BUILD_STATIC)
 
 
 # install
-install(FILES blosc.h DESTINATION include COMPONENT DEV)
+install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV)
 install(TARGETS blosc_shared DESTINATION ${lib_dir} COMPONENT LIB)
 if(BUILD_STATIC)
     install(TARGETS blosc_static DESTINATION ${lib_dir} COMPONENT DEV)

blosc/blosc-export.h

@@ -0,0 +1,45 @@
+/*********************************************************************
+  Blosc - Blocked Shuffling and Compression Library
+
+  Author: Francesc Alted <[email protected]>
+
+  See LICENSES/BLOSC.txt for details about copyright and rights to use.
+**********************************************************************/
+#ifndef BLOSC_EXPORT_H
+#define BLOSC_EXPORT_H
+
+/* Macros for specifying exported symbols.
+   BLOSC_EXPORT is used to decorate symbols that should be
+   exported by the blosc shared library.
+   BLOSC_NO_EXPORT is used to decorate symbols that should NOT
+   be exported by the blosc shared library.
+*/
+#if defined(BLOSC_SHARED_LIBRARY)
+  #if defined(_MSC_VER)
+    #define BLOSC_EXPORT __declspec(dllexport)
+  #elif (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
+    #if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+      #define BLOSC_EXPORT __attribute__((dllexport))
+    #else
+      #define BLOSC_EXPORT __attribute__((visibility("default")))
+    #endif  /* defined(_WIN32) || defined(__CYGWIN__) */
+  #else
+    #error Cannot determine how to define BLOSC_EXPORT for this compiler.
+  #endif
+#else
+  #define BLOSC_EXPORT
+#endif  /* defined(BLOSC_SHARED_LIBRARY) */
+
+#if defined(__GNUC__) || defined(__clang__)
+  #define BLOSC_NO_EXPORT __attribute__((visibility("hidden")))
+#else
+  #define BLOSC_NO_EXPORT
+#endif  /* defined(__GNUC__) || defined(__clang__) */
+
+/* When testing, export everything to make it easier to implement tests. */
+#if defined(BLOSC_TESTING)
+  #undef BLOSC_NO_EXPORT
+  #define BLOSC_NO_EXPORT BLOSC_EXPORT
+#endif  /* defined(BLOSC_TESTING) */
+
+#endif  /* BLOSC_EXPORT_H */

blosc/blosc.h

@@ -10,18 +10,12 @@
 
 #include <limits.h>
 #include <stdlib.h>
+#include "blosc-export.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef BLOSC_DLL_EXPORT
-    #undef BLOSC_DLL_EXPORT
-	#define BLOSC_DLL_EXPORT __declspec(dllexport)
-#else
-    #undef BLOSC_DLL_EXPORT
-	#define BLOSC_DLL_EXPORT
-#endif
-
 /* Version numbers */
 #define BLOSC_VERSION_MAJOR    1    /* for major interface/format changes  */
 #define BLOSC_VERSION_MINOR    6    /* for minor interface/format changes  */
@@ -109,7 +103,7 @@ extern "C" {
   which case you should *exclusively* use the
   blosc_compress_ctx()/blosc_decompress_ctx() pair (see below).
   */
-BLOSC_DLL_EXPORT void blosc_init(void);
+BLOSC_EXPORT void blosc_init(void);
 
 
 /**
@@ -119,7 +113,7 @@ BLOSC_DLL_EXPORT void blosc_init(void);
   unless you have not used blosc_init() before (see blosc_init()
   above).
   */
-BLOSC_DLL_EXPORT void blosc_destroy(void);
+BLOSC_EXPORT void blosc_destroy(void);
 
 
 /**
@@ -156,7 +150,7 @@ BLOSC_DLL_EXPORT void blosc_destroy(void);
   should never happen.  If you see this, please report it back
   together with the buffer data causing this and compression settings.
   */
-BLOSC_DLL_EXPORT int blosc_compress(int clevel, int doshuffle, size_t typesize,
+BLOSC_EXPORT int blosc_compress(int clevel, int doshuffle, size_t typesize,
                                     size_t nbytes, const void *src, void *dest,
                                     size_t destsize);
 
@@ -180,7 +174,7 @@ BLOSC_DLL_EXPORT int blosc_compress(int clevel, int doshuffle, size_t typesize,
   should never happen.  If you see this, please report it back
   together with the buffer data causing this and compression settings.
 */
-BLOSC_DLL_EXPORT int blosc_compress_ctx(int clevel, int doshuffle, size_t typesize,
+BLOSC_EXPORT int blosc_compress_ctx(int clevel, int doshuffle, size_t typesize,
                                         size_t nbytes, const void* src, void* dest,
                                         size_t destsize, const char* compressor,
                                         size_t blocksize, int numinternalthreads);
@@ -198,7 +192,7 @@ BLOSC_DLL_EXPORT int blosc_compress_ctx(int clevel, int doshuffle, size_t typesi
   output buffer is not large enough, then 0 (zero) or a negative value
   will be returned instead.
 */
-BLOSC_DLL_EXPORT int blosc_decompress(const void *src, void *dest, size_t destsize);
+BLOSC_EXPORT int blosc_decompress(const void *src, void *dest, size_t destsize);
 
 
 /**
@@ -218,7 +212,7 @@ BLOSC_DLL_EXPORT int blosc_decompress(const void *src, void *dest, size_t destsi
   output buffer is not large enough, then 0 (zero) or a negative value
   will be returned instead.
 */
-BLOSC_DLL_EXPORT int blosc_decompress_ctx(const void *src, void *dest,
+BLOSC_EXPORT int blosc_decompress_ctx(const void *src, void *dest,
                                           size_t destsize, int numinternalthreads);
 
 /**
@@ -229,7 +223,7 @@ BLOSC_DLL_EXPORT int blosc_decompress_ctx(const void *src, void *dest,
   Returns the number of bytes copied to `dest` or a negative value if
   some error happens.
   */
-BLOSC_DLL_EXPORT int blosc_getitem(const void *src, int start, int nitems, void *dest);
+BLOSC_EXPORT int blosc_getitem(const void *src, int start, int nitems, void *dest);
 
 
 /**
@@ -240,7 +234,7 @@ BLOSC_DLL_EXPORT int blosc_getitem(const void *src, int start, int nitems, void
 
   Returns the previous number of threads.
   */
-BLOSC_DLL_EXPORT int blosc_set_nthreads(int nthreads);
+BLOSC_EXPORT int blosc_set_nthreads(int nthreads);
 
 
 /**
@@ -252,7 +246,7 @@ BLOSC_DLL_EXPORT int blosc_set_nthreads(int nthreads);
   for it in this build, it returns a -1.  Else it returns the code for
   the compressor (>=0).
   */
-BLOSC_DLL_EXPORT int blosc_set_compressor(const char* compname);
+BLOSC_EXPORT int blosc_set_compressor(const char* compname);
 
 
 /**
@@ -262,7 +256,7 @@ BLOSC_DLL_EXPORT int blosc_set_compressor(const char* compname);
   for it in this build, -1 is returned.  Else, the compressor code is
   returned.
  */
-BLOSC_DLL_EXPORT int blosc_compcode_to_compname(int compcode, char **compname);
+BLOSC_EXPORT int blosc_compcode_to_compname(int compcode, char **compname);
 
 
 /**
@@ -271,7 +265,7 @@ BLOSC_DLL_EXPORT int blosc_compcode_to_compname(int compcode, char **compname);
   If the compressor name is not recognized, or there is not support
   for it in this build, -1 is returned instead.
  */
-BLOSC_DLL_EXPORT int blosc_compname_to_compcode(const char *compname);
+BLOSC_EXPORT int blosc_compname_to_compcode(const char *compname);
 
 
 /**
@@ -285,7 +279,7 @@ BLOSC_DLL_EXPORT int blosc_compname_to_compcode(const char *compname);
 
   This function should always succeed.
   */
-BLOSC_DLL_EXPORT char* blosc_list_compressors(void);
+BLOSC_EXPORT char* blosc_list_compressors(void);
 
 
 /**
@@ -302,7 +296,7 @@ BLOSC_DLL_EXPORT char* blosc_list_compressors(void);
   If the compressor is supported, it returns the code for the library
   (>=0).  If it is not supported, this function returns -1.
   */
-BLOSC_DLL_EXPORT int blosc_get_complib_info(char *compname, char **complib, char **version);
+BLOSC_EXPORT int blosc_get_complib_info(char *compname, char **complib, char **version);
 
 
 /**
@@ -311,7 +305,7 @@ BLOSC_DLL_EXPORT int blosc_get_complib_info(char *compname, char **complib, char
   problems releasing the resources, it returns a negative number, else
   it returns 0.
   */
-BLOSC_DLL_EXPORT int blosc_free_resources(void);
+BLOSC_EXPORT int blosc_free_resources(void);
 
 
 /**
@@ -325,7 +319,7 @@ BLOSC_DLL_EXPORT int blosc_free_resources(void);
 
   This function should always succeed.
   */
-BLOSC_DLL_EXPORT void blosc_cbuffer_sizes(const void *cbuffer, size_t *nbytes,
+BLOSC_EXPORT void blosc_cbuffer_sizes(const void *cbuffer, size_t *nbytes,
                                           size_t *cbytes, size_t *blocksize);
 
 
@@ -343,7 +337,7 @@ BLOSC_DLL_EXPORT void blosc_cbuffer_sizes(const void *cbuffer, size_t *nbytes,
 
   This function should always succeed.
   */
-BLOSC_DLL_EXPORT void blosc_cbuffer_metainfo(const void *cbuffer, size_t *typesize,
+BLOSC_EXPORT void blosc_cbuffer_metainfo(const void *cbuffer, size_t *typesize,
                                              int *flags);
 
 
@@ -354,7 +348,7 @@ BLOSC_DLL_EXPORT void blosc_cbuffer_metainfo(const void *cbuffer, size_t *typesi
 
   This function should always succeed.
   */
-BLOSC_DLL_EXPORT void blosc_cbuffer_versions(const void *cbuffer, int *version,
+BLOSC_EXPORT void blosc_cbuffer_versions(const void *cbuffer, int *version,
                                              int *versionlz);
 
 
@@ -363,7 +357,7 @@ BLOSC_DLL_EXPORT void blosc_cbuffer_versions(const void *cbuffer, int *version,
 
   This function should always succeed.
   */
-BLOSC_DLL_EXPORT char *blosc_cbuffer_complib(const void *cbuffer);
+BLOSC_EXPORT char *blosc_cbuffer_complib(const void *cbuffer);
 
 
 
@@ -378,7 +372,7 @@ BLOSC_DLL_EXPORT char *blosc_cbuffer_complib(const void *cbuffer);
   Force the use of a specific blocksize.  If 0, an automatic
   blocksize will be used (the default).
   */
-BLOSC_DLL_EXPORT void blosc_set_blocksize(size_t blocksize);
+BLOSC_EXPORT void blosc_set_blocksize(size_t blocksize);
 
 #ifdef __cplusplus
 }

blosc/shuffle-avx2.h

@@ -20,13 +20,13 @@ extern "C" {
 /**
   AVX2-accelerated shuffle routine.
 */
-BLOSC_DLL_EXPORT void shuffle_avx2(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void shuffle_avx2(const size_t bytesoftype, const size_t blocksize,
                                    const uint8_t* const _src, uint8_t* const _dest);
 
 /**
   AVX2-accelerated unshuffle routine.
 */
-BLOSC_DLL_EXPORT void unshuffle_avx2(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void unshuffle_avx2(const size_t bytesoftype, const size_t blocksize,
                                      const uint8_t* const _src, uint8_t* const _dest);
 
 #ifdef __cplusplus

blosc/shuffle-common.h

@@ -9,19 +9,7 @@
 #ifndef SHUFFLE_COMMON_H
 #define SHUFFLE_COMMON_H
 
-/* Macro for specifying an exported function. */
-#if defined(_WIN32) && defined(BLOSC_DLL_EXPORT)
-  #undef BLOSC_DLL_EXPORT
-  #define BLOSC_DLL_EXPORT __declspec(dllexport)
-#else
-#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
-  #undef BLOSC_DLL_EXPORT
-  #define BLOSC_DLL_EXPORT __attribute__((visibility("hidden")))
-#else
-  #undef BLOSC_DLL_EXPORT
-  #define BLOSC_DLL_EXPORT
-#endif
-#endif
+#include "blosc-export.h"
 
 /* Define the __SSE2__ symbol if compiling with Visual C++ and
    targeting the minimum architecture level supporting SSE2.

blosc/shuffle-generic.h

@@ -24,13 +24,13 @@ extern "C" {
 /**
   Generic (non-hardware-accelerated) shuffle routine.
 */
-BLOSC_DLL_EXPORT void shuffle_generic(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void shuffle_generic(const size_t bytesoftype, const size_t blocksize,
                                       const uint8_t* const _src, uint8_t* const _dest);
 
 /**
   Generic (non-hardware-accelerated) unshuffle routine.
 */
-BLOSC_DLL_EXPORT void unshuffle_generic(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void unshuffle_generic(const size_t bytesoftype, const size_t blocksize,
                                         const uint8_t* const _src, uint8_t* const _dest);
 
 #ifdef __cplusplus

blosc/shuffle-sse2.h

@@ -20,13 +20,13 @@ extern "C" {
 /**
   SSE2-accelerated shuffle routine.
 */
-BLOSC_DLL_EXPORT void shuffle_sse2(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void shuffle_sse2(const size_t bytesoftype, const size_t blocksize,
                                    const uint8_t* const _src, uint8_t* const _dest);
 
 /**
   SSE2-accelerated unshuffle routine.
 */
-BLOSC_DLL_EXPORT void unshuffle_sse2(const size_t bytesoftype, const size_t blocksize,
+BLOSC_NO_EXPORT void unshuffle_sse2(const size_t bytesoftype, const size_t blocksize,
                                      const uint8_t* const _src, uint8_t* const _dest);
 
 #ifdef __cplusplus