Merge pull request #505 from sartura/static_build

add static compile support

Author: michalvasko

CMakeLists.txt

@@ -76,7 +76,6 @@ configure_file(${PROJECT_SOURCE_DIR}/src/common.h.in ${PROJECT_BINARY_DIR}/src/c
 
 set(EXTENSIONS_PLUGINS_DIR_MACRO "${PLUGINS_DIR}/extensions")
 set(USER_TYPES_PLUGINS_DIR_MACRO "${PLUGINS_DIR}/user_types")
-configure_file(${PROJECT_SOURCE_DIR}/src/plugin_config.h.in ${PROJECT_BINARY_DIR}/src/plugin_config.h)
 
 # include custom Modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
@@ -174,6 +173,10 @@ else ()
     configure_file(${PROJECT_SOURCE_DIR}/packages/local-rpm.sh.in ${PROJECT_BINARY_DIR}/build-packages/local-rpm.sh @ONLY)
 endif()
 
+# by default build shared library
+# static build requires static libpcre library
+option(ENABLE_STATIC "Build static (.a) library" OFF)
+
 # check the supported platform
 if(NOT UNIX)
     message(FATAL_ERROR "Only *nix like systems are supported.")
@@ -229,24 +232,40 @@ set(headers
     src/xml.h
     src/dict.h)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-add_library(yangobj OBJECT ${libsrc})
-add_library(yang SHARED $<TARGET_OBJECTS:yangobj>)
+# create static libyang library
+if(ENABLE_STATIC)
+    add_definitions(-DSTATIC)
+    set(CMAKE_EXE_LINKER_FLAGS -static)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+    set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
+    set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
+    add_library(yang STATIC ${libsrc})
+else()
+    set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+    add_library(yangobj OBJECT ${libsrc})
+    add_library(yang SHARED $<TARGET_OBJECTS:yangobj>)
+
+    #link dl
+    target_link_libraries(yang ${CMAKE_DL_LIBS})
+endif(ENABLE_STATIC)
+
 set_target_properties(yang PROPERTIES VERSION ${LIBYANG_VERSION} SOVERSION ${LIBYANG_SOVERSION})
 set_target_properties(yang PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 
 # link math
 target_link_libraries(yang m)
 
-#link dl
-target_link_libraries(yang ${CMAKE_DL_LIBS})
-
 # find pthreads
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
-target_link_libraries(yang ${CMAKE_THREAD_LIBS_INIT})
+if(ENABLE_STATIC)
+    target_link_libraries(yang -Wl,--whole-archive ${CMAKE_THREAD_LIBS_INIT} -Wl,--no-whole-archive)
+else()
+    target_link_libraries(yang ${CMAKE_THREAD_LIBS_INIT})
+endif(ENABLE_STATIC)
 
 # find PCRE library
+unset(PCRE_LIBRARY CACHE)
 find_package(PCRE REQUIRED)
 include_directories(${PCRE_INCLUDE_DIRS})
 target_link_libraries(yang ${PCRE_LIBRARIES})
@@ -288,10 +307,50 @@ add_custom_target(cclean
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 # YANG extensions plugins
-add_subdirectory(src/extensions)
+set(EXTENSIONS_LIST "nacm" "metadata" "yangdata")
+# if the tests are enabled, build libyang_ext_test
+if(ENABLE_BUILD_TESTS)
+    find_package(CMocka 1.0.0)
+    if(CMOCKA_FOUND AND CMAKE_BUILD_TYPE MATCHES debug)
+        list(APPEND EXTENSIONS_LIST "libyang_ext_test")
+    endif(CMOCKA_FOUND AND CMAKE_BUILD_TYPE MATCHES debug)
+endif(ENABLE_BUILD_TESTS)
+
+if(ENABLE_STATIC)
+    set(EXTENSIONS_LIST_SIZE " 0 ")
+    set(ITEM 0)
+    foreach(EXTENSION ${EXTENSIONS_LIST})
+        add_library(${EXTENSION} STATIC "src/extensions/${EXTENSION}.c")
+        target_link_libraries(yang ${EXTENSION})
+        set(EXTENSIONS_LIST_SIZE "${EXTENSIONS_LIST_SIZE} + lyext_size(${EXTENSION})")
+        set(EXTERN_EXTENSIONS_LIST "${EXTERN_EXTENSIONS_LIST}extern struct lyext_plugin_list ${EXTENSION}[];\n")
+        set(MEMCPY_EXTENSIONS_LIST "${MEMCPY_EXTENSIONS_LIST}    lyext_add(plugin, count, ${EXTENSION});\n")
+        set(STATIC_LOADED_PLUGINS "${STATIC_LOADED_PLUGINS} \"${EXTENSION}\",")
+        MATH(EXPR ITEM "${ITEM}+1")
+    endforeach()
+else()
+    add_subdirectory(src/extensions)
+endif(ENABLE_STATIC)
 
 # YANG user types plugins
-add_subdirectory(src/user_types)
+set(USER_TYPE_LIST "user_date_and_time" "user_ipv4")
+if(ENABLE_STATIC)
+    set(USER_TYPE_LIST_SIZE " 0 ")
+    foreach(USER_TYPE ${USER_TYPE_LIST})
+        add_library(${USER_TYPE} STATIC "src/user_types/${USER_TYPE}.c")
+        target_link_libraries(yang ${USER_TYPE})
+        set(USER_TYPE_LIST_SIZE "${USER_TYPE_LIST_SIZE} + lytype_size(${USER_TYPE})")
+        set(EXTERN_USER_TYPE_LIST "${EXTERN_USER_TYPE_LIST}extern struct lytype_plugin_list ${USER_TYPE}[];\n")
+        set(MEMCPY_USER_TYPE_LIST "${MEMCPY_USER_TYPE_LIST}    lytype_add(plugin, count, ${USER_TYPE});\n")
+        set(STATIC_LOADED_PLUGINS "${STATIC_LOADED_PLUGINS} \"${USER_TYPE}\",")
+        MATH(EXPR ITEM "${ITEM}+1")
+    endforeach()
+    set(STATIC_LOADED_PLUGINS_COUNT "${ITEM}")
+else()
+    add_subdirectory(src/user_types)
+endif(ENABLE_STATIC)
+
+configure_file(${PROJECT_SOURCE_DIR}/src/plugin_config.h.in ${PROJECT_BINARY_DIR}/src/plugin_config.h)
 
 # yanglint
 add_executable(yanglint ${lintsrc})
@@ -312,7 +371,6 @@ if(ENABLE_VALGRIND_TESTS)
 endif()
 
 if(ENABLE_BUILD_TESTS)
-    find_package(CMocka 1.0.0)
     if(CMOCKA_FOUND)
         enable_testing()
         add_subdirectory(tests)
@@ -325,7 +383,3 @@ endif(ENABLE_BUILD_TESTS)
 if(GEN_LANGUAGE_BINDINGS AND GEN_CPP_BINDINGS)
     add_subdirectory(swig)
 endif()
-
-if(GEN_LANGUAGE_BINDINGS AND GEN_JAVASCRIPT_BINDINGS)
-    include(swig/javascript/CMakeLists.txt)
-endif()

src/extensions/CMakeLists.txt

@@ -5,11 +5,6 @@ macro(EXTENSION_PLUGIN PLUGIN_NAME SRCS)
     install(TARGETS ${PLUGIN_NAME} DESTINATION ${EXTENSIONS_PLUGINS_DIR_MACRO})
 endmacro(EXTENSION_PLUGIN)
 
-EXTENSION_PLUGIN(nacm "nacm.c")
-EXTENSION_PLUGIN(metadata "metadata.c")
-EXTENSION_PLUGIN(yangdata "yang-data.c")
-
-# special plugin for test_extensions - only built, but not installed
-add_library(libyang_ext_test SHARED ext_test.c)
-set_target_properties(libyang_ext_test PROPERTIES PREFIX "")
-target_link_libraries(libyang_ext_test yang)
+foreach(EXTENSION ${EXTENSIONS_LIST})
+    EXTENSION_PLUGIN(${EXTENSION} "${EXTENSION}.c")
+endforeach()

src/extensions/ext_test.c renamed to src/extensions/libyang_ext_test.c

@@ -26,4 +26,102 @@
 #  define LY_PLUGIN_SUFFIX_LEN 6
 #endif
 
+#ifdef STATIC
+@EXTERN_EXTENSIONS_LIST@
+@EXTERN_USER_TYPE_LIST@
+
+int lytype_size(struct lytype_plugin_list plugin[]) {
+    struct lytype_plugin_list *tmp;
+    int i = 0;
+    while (1) {
+        tmp = &plugin[i];
+        if (!tmp) break;
+        if (!tmp->module && !tmp->revision && !tmp->name && !tmp->store_clb && !tmp->free_clb) break;
+        i++;
+    }
+
+    return i;
+}
+
+void lytype_add(struct lytype_plugin_list *type_plugins, uint16_t *type_plugins_count, struct lytype_plugin_list plugin[]) {
+    struct lytype_plugin_list *tmp;
+    int i = 0;
+    while (1) {
+        tmp = &plugin[i];
+        if (!tmp) break;
+        if (!tmp->module && !tmp->revision && !tmp->name && !tmp->store_clb && !tmp->free_clb) break;
+        i++;
+        memcpy(&type_plugins[*type_plugins_count], tmp, sizeof *tmp);
+        (*type_plugins_count)++;
+    }
+
+    return;
+}
+
+
+int lyext_size(struct lyext_plugin_list plugin[]) {
+    struct lyext_plugin_list *tmp;
+    int i = 0;
+    while (1) {
+        tmp = &plugin[i];
+        if (!tmp) break;
+        if (!tmp->module && !tmp->revision && !tmp->name && !tmp->plugin) break;
+        i++;
+    }
+
+    return i;
+}
+
+void lyext_add(struct lyext_plugin_list *ext_plugins, uint16_t *ext_plugins_count, struct lyext_plugin_list plugin[]) {
+    struct lyext_plugin_list *tmp;
+    int i = 0;
+    while (1) {
+        tmp = &plugin[i];
+        if (!tmp) break;
+        if (!tmp->module && !tmp->revision && !tmp->name && !tmp->plugin) break;
+        i++;
+        memcpy(&ext_plugins[*ext_plugins_count], tmp, sizeof *tmp);
+        (*ext_plugins_count)++;
+    }
+
+    return;
+}
+
+struct lyext_plugin_list *static_load_lyext_plugins(uint16_t *count)
+{
+    struct lyext_plugin_list *plugin;
+    uint16_t size = @EXTENSIONS_LIST_SIZE@;
+
+    plugin = malloc(size * (sizeof *plugin));
+    if (!plugin) {
+        LOGMEM(NULL);
+        return NULL;
+    }
+
+    *count = 0;
+@MEMCPY_EXTENSIONS_LIST@
+    return plugin;
+}
+
+struct lytype_plugin_list *static_load_lytype_plugins(uint16_t *count)
+{
+    struct lytype_plugin_list *plugin;
+    uint16_t size = @USER_TYPE_LIST_SIZE@;
+
+    plugin = malloc(size * (sizeof *plugin));
+    if (!plugin) {
+        LOGMEM(NULL);
+        return NULL;
+    }
+
+    *count = 0;
+@MEMCPY_USER_TYPE_LIST@
+    return plugin;
+}
+
+uint16_t static_loaded_plugins_count = @STATIC_LOADED_PLUGINS_COUNT@;
+char *static_loaded_plugins[] = {@STATIC_LOADED_PLUGINS@};
+
+#endif /* STATIC */
+
 #endif /* LY_PLUGIN_CONFIG_H_ */

src/extensions/yang-data.c renamed to src/extensions/yangdata.c

@@ -61,6 +61,34 @@ ly_clean_plugins(void)
     unsigned int u;
     int ret = EXIT_SUCCESS;
 
+#ifdef STATIC
+    /* lock the extension plugins list */
+    pthread_mutex_lock(&plugins_lock);
+
+    if(ext_plugins) {
+        free(ext_plugins);
+        ext_plugins = NULL;
+        ext_plugins_count = 0;
+    }
+
+    if(type_plugins) {
+        free(type_plugins);
+        type_plugins = NULL;
+        type_plugins_count = 0;
+    }
+
+    for (u = 0; u < loaded_plugins_count; ++u) {
+        free(loaded_plugins[u]);
+    }
+    free(loaded_plugins);
+    loaded_plugins = NULL;
+    loaded_plugins_count = 0;
+
+    /* unlock the global structures */
+    pthread_mutex_unlock(&plugins_lock);
+    return ret;
+#endif /* STATIC */
+
     /* lock the extension plugins list */
     pthread_mutex_lock(&plugins_lock);
 
@@ -114,6 +142,10 @@ lytype_load_plugin(void *dlhandler, const char *file_name)
     uint32_t u, v;
     char *str;
 
+#ifdef STATIC
+    return 0;
+#endif /* STATIC */
+
     /* get the plugin data */
     plugin = dlsym(dlhandler, file_name);
     str = dlerror();
@@ -160,6 +192,10 @@ lyext_load_plugin(void *dlhandler, const char *file_name)
     uint32_t u, v;
     char *str;
 
+#ifdef STATIC
+    return 0;
+#endif /* STATIC */
+
     /* get the plugin data */
     plugin = dlsym(dlhandler, file_name);
     str = dlerror();
@@ -242,6 +278,10 @@ ly_load_plugins_dir(DIR *dir, const char *dir_path, int ext_or_type)
     void *dlhandler;
     int ret;
 
+#ifdef STATIC
+    return;
+#endif /* STATIC */
+
     while ((file = readdir(dir))) {
         /* required format of the filename is *LY_PLUGIN_SUFFIX */
         len = strlen(file->d_name);
@@ -312,6 +352,23 @@ ly_load_plugins(void)
     DIR* dir;
     const char *pluginsdir;
 
+#ifdef STATIC
+    /* lock the extension plugins list */
+    pthread_mutex_lock(&plugins_lock);
+
+    ext_plugins = static_load_lyext_plugins(&ext_plugins_count);
+    type_plugins = static_load_lytype_plugins(&type_plugins_count);
+
+    int u;
+    for (u = 0; u < static_loaded_plugins_count; u++) {
+        ly_add_loaded_plugin(strdup(static_loaded_plugins[u]));
+    }
+
+    /* unlock the global structures */
+    pthread_mutex_unlock(&plugins_lock);
+    return;
+#endif /* STATIC */
+
     /* lock the extension plugins list */
     pthread_mutex_lock(&plugins_lock);
 

src/plugin_config.h.in

@@ -5,4 +5,6 @@ macro(USER_TYPE_PLUGIN PLUGIN_NAME SRCS)
     install(TARGETS ${PLUGIN_NAME} DESTINATION ${USER_TYPES_PLUGINS_DIR_MACRO})
 endmacro(USER_TYPE_PLUGIN)
 
-USER_TYPE_PLUGIN(user_date_and_time "user_date_and_time.c")
+foreach(USER_TYPE ${USER_TYPE_LIST})
+    USER_TYPE_PLUGIN(${USER_TYPE} "${USER_TYPE}.c")
+endforeach()

src/plugins.c

@@ -16,7 +16,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include <libyang/user_types.h>
+#include "../user_types.h"
 
 static int
 ipv4_store_clb(const char *type_name, const char *value_str, lyd_val *value, char **err_msg)