Compatibility: modifications to be compatible with GCC 4.8.x and CMake 2.8.x

Lukas955 · Lukas955 · commit 2defcd9aa75f · 2018-06-29T15:37:58.000+02:00
diff --git a/include/ipfixcol2/verbose.h b/include/ipfixcol2/verbose.h
@@ -146,11 +146,21 @@ enum ipx_verb_level {
 IPX_API void
 ipx_verb_ctx_print(enum ipx_verb_level level, const ipx_ctx_t *ctx, const char *fmt, ...);
 
-
-#ifndef __cplusplus
 /** Size of an error buffer message                                               */
 #define IPX_STRERROR_SIZE 128
 
+/**
+* \brief Convert standard error code to an error string (internal function)
+* \param[in] errnum      Error code
+* \param[in] buffer      Buffer for the error string
+* \param[in] buffer_size Size of the buffer
+* \return #IPX_OK on success and the \p buffer is properly filled
+* \return #IPX_ERR_ARG in case of invalid error code and the \p buffer is filled with an error
+ *   message
+*/
+IPX_API int
+ipx_strerror_fn(int errnum, char *buffer, size_t buffer_size);
+
 /**
  * \def ipx_strerror
  * \brief Re-entrant strerror wrapper
@@ -166,17 +176,10 @@ ipx_verb_ctx_print(enum ipx_verb_level level, const ipx_ctx_t *ctx, const char *
  * \param[in]  errnum An error code
  * \param[out] buffer Pointer to the local buffer
  */
-#define ipx_strerror(errnum, buffer)                                                     \
-    char ipx_strerror_buffer[IPX_STRERROR_SIZE];                                         \
-    (buffer) = _Generic((&strerror_r),                                                   \
-        char *(*)(int, char *, size_t): /* GNU-specific   */                             \
-            strerror_r((errnum), ipx_strerror_buffer, IPX_STRERROR_SIZE),                \
-        int   (*)(int, char *, size_t): /* XSI-compliant  */                             \
-            (strerror_r((errnum), ipx_strerror_buffer, IPX_STRERROR_SIZE) >= 0           \
-                ? ipx_strerror_buffer                                                    \
-                : "Unknown error (strerror_r failed!)")                                  \
-    )
-#endif
+#define ipx_strerror(errnum, buffer)                                                       \
+    char ipx_strerror_buffer[IPX_STRERROR_SIZE];                                           \
+    ipx_strerror_fn((errnum), ipx_strerror_buffer, IPX_STRERROR_SIZE);                     \
+    (buffer) = ipx_strerror_buffer;
 
 /**@}*/
 #ifdef __cplusplus
diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
@@ -13,10 +13,10 @@ set(CPACK_PACKAGE_VENDOR   "CESNET z.s.p.o.")
 # Short package description
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY  "IPFIX Collector Toolset")
 # Long package description
-set(CPACK_PACKAGE_DESCRIPTION "\
-IPFIXcol is a flexible IPFIX (RFC 7011) flow data collector designed to \
-be extensible by plugins.\
-")
+set(CPACK_PACKAGE_DESCRIPTION
+	"IPFIXcol is a flexible IPFIX (RFC 7011) flow data collector designed to "
+	"be extensible by plugins."
+)
 
 # Create a top level directory in an archive with the same name as the archive
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
@@ -53,8 +53,6 @@ if (NOT CPACK_PACKAGE_CONTACT OR CPACK_PACKAGE_CONTACT STREQUAL "")
 			"- using a name and email from the git configuration")
 		string(CONCAT CPACK_PACKAGE_CONTACT
 			${GIT_USER_NAME} " <" ${GIT_USER_EMAIL} ">")
-	else()
-		message(WARNING "Maintainer contact for packages is not specified.")
 	endif()
 endif()
 
diff --git a/pkg/deb/CMakeLists.txt b/pkg/deb/CMakeLists.txt
@@ -85,11 +85,11 @@ add_custom_target(deb_hierarchy
 
 # DEB hierarchy requires already prepared TGZ archive
 add_dependencies(deb_hierarchy
-	tgz_package
+	tgz
 )
 
 # New target that will pack all source codes into a source package and build DEB packages
-add_custom_target(deb_package
+add_custom_target(deb
 	COMMENT "Generating source and DEB packages..."
 	WORKING_DIRECTORY ${DEB_UNPACKED_DIR}
 
@@ -98,12 +98,12 @@ add_custom_target(deb_package
 )
 
 # The directory structure must be prepared before package building
-add_dependencies(deb_package
+add_dependencies(deb
 	deb_hierarchy
 )
 
 # Post build (show a message where DEB files are located)
-add_custom_command(TARGET deb_package POST_BUILD
+add_custom_command(TARGET deb POST_BUILD
 	WORKING_DIRECTORY "${DEB_BUILD_DIR}"
 	COMMENT "Source and DEB packages are located in ${DEB_BUILD_DIR}/"
 	COMMAND ;
diff --git a/pkg/rpm/CMakeLists.txt b/pkg/rpm/CMakeLists.txt
@@ -40,7 +40,7 @@ set(SRC_ARCHIVE
 )
 
 # New target that will pack all source codes into a SRPM package and build RPM packages
-add_custom_target(rpm_package
+add_custom_target(rpm
 	COMMENT "Generating SRPM and RPM packages..."
 	WORKING_DIRECTORY "${RPM_BUILD_DIR}"
 
@@ -52,12 +52,12 @@ add_custom_target(rpm_package
 )
 
 # RPM target must call TGZ builder first
-add_dependencies(rpm_package
-	tgz_package
+add_dependencies(rpm
+	tgz
 )
 
 # Post build (show a message where RPM files are located)
-add_custom_command(TARGET rpm_package POST_BUILD
+add_custom_command(TARGET rpm POST_BUILD
 	WORKING_DIRECTORY "${RPM_BUILD_DIR}"
 	COMMENT "SRPM and RPM packages are located in ${RPM_BUILD_DIR}/"
 	COMMAND ;
diff --git a/pkg/tgz/CMakeLists.txt b/pkg/tgz/CMakeLists.txt
@@ -19,7 +19,7 @@ if (PATH_CPACK)
 	)
 
 	# New target that will pack all source codes into a TAR.GZ archive
-	add_custom_target(tgz_package
+	add_custom_target(tgz
 		COMMENT "Generating tar.gz package..."
 		COMMAND "${PATH_CPACK}" "--config" "${FILE_CFG_OUT}"
 	)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_policy(SET CMP0063 NEW)
+if (POLICY CMP0063)
+	cmake_policy(SET CMP0063 NEW)
+endif()
 
 # Configure a header file to pass some CMake variables
 configure_file(
@@ -24,4 +26,4 @@ include_directories(
 # Project subdirectories
 add_subdirectory(core)
 add_subdirectory(plugins)
-add_subdirectory(tools)
+add_subdirectory(tools)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -35,6 +35,7 @@ set(CORE_SOURCE
 	session.c
 	verbose.c
 	verbose.h
+	utils.c
 	utils.h
 
 	"${PROJECT_BINARY_DIR}/src/build_config.h"
diff --git a/src/core/fpipe.c b/src/core/fpipe.c
@@ -39,7 +39,6 @@
  *
  */
 
-#include <stdatomic.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -61,8 +60,9 @@ struct ipx_fpipe {
     int fd_read;
     /** Pipe file descriptor for an IPFIX message parser                             */
     int fd_write;
+
     /** Control variable that will be set when a request is ready                    */
-    atomic_flag sync_flag;
+    volatile unsigned int lock;
     /** Records in the pipe                                                          */
     volatile uint32_t cnt;
 };
@@ -84,7 +84,7 @@ ipx_fpipe_create()
 
     ret->fd_write = pipefd[1];
     ret->fd_read = pipefd[0];
-    atomic_flag_clear(&ret->sync_flag);
+    ret->lock = 0; // unlocked by default
     ret->cnt = 0;
 
     return ret;
@@ -136,23 +136,23 @@ ipx_fpipe_write(ipx_fpipe_t *fpipe, ipx_msg_t *msg)
     }
 
     // Success - spin until the lock is acquired
-    while (atomic_flag_test_and_set_explicit(&fpipe->sync_flag, memory_order_acquire));
+    while (__sync_lock_test_and_set(&fpipe->lock, 1));
     fpipe->cnt++;
-    atomic_flag_clear_explicit(&fpipe->sync_flag, memory_order_release);
+    __sync_lock_release(&fpipe->lock);
     return;
 }
 
 ipx_msg_t *
 ipx_fpipe_read(ipx_fpipe_t *fpipe)
 {
     // Spin until the lock is acquired
-    while (atomic_flag_test_and_set_explicit(&fpipe->sync_flag, memory_order_acquire));
+    while (__sync_lock_test_and_set(&fpipe->lock, 1));
     uint32_t cnt = fpipe->cnt;
     if (fpipe->cnt > 0) {
         fpipe->cnt--;
     }
     // Release the lock
-    atomic_flag_clear_explicit(&fpipe->sync_flag, memory_order_release);
+    __sync_lock_release(&fpipe->lock);
 
     if (cnt == 0) {
         return NULL;
diff --git a/src/core/utils.c b/src/core/utils.c
@@ -0,0 +1,60 @@
+/**
+ * \file src/core/utils.c
+ * \author Lukas Hutak <lukas.hutak@cesnet.cz>
+ * \brief Internal core utilities (source file)
+ * \date 2018
+ */
+
+/* Copyright (C) 2018 CESNET, z.s.p.o.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of the Company nor the names of its contributors
+ *    may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this
+ * product may be distributed under the terms of the GNU General Public
+ * License (GPL) version 2 or later, in which case the provisions
+ * of the GPL apply INSTEAD OF those given above.
+ *
+ * This software is provided ``as is'', and any express or implied
+ * warranties, including, but not limited to, the implied warranties of
+ * merchantability and fitness for a particular purpose are disclaimed.
+ * In no event shall the company or contributors be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential
+ * damages (including, but not limited to, procurement of substitute
+ * goods or services; loss of use, data, or profits; or business
+ * interruption) however caused and on any theory of liability, whether
+ * in contract, strict liability, or tort (including negligence or
+ * otherwise) arising in any way out of the use of this software, even
+ * if advised of the possibility of such damage.
+ *
+ */
+
+// Make sure that XSI-version is used
+#undef _GNU_SOURCE
+#define _POSIX_C_SOURCE 200809L
+
+#include <string.h>
+#include <stdio.h>
+#include "utils.h"
+
+int
+ipx_strerror_fn(int errnum, char *buffer, size_t buffer_size)
+{
+    // Expecting XSI strerror_r version
+    if (strerror_r(errnum, buffer, buffer_size) == 0) {
+        return IPX_OK;
+    }
+
+    snprintf(buffer, buffer_size, "strerror_r() failed: Unable process error code %d!", errnum);
+    return IPX_ERR_ARG;
+}
diff --git a/src/core/utils.h b/src/core/utils.h
@@ -1,40 +1,53 @@
-//
-// Created by lukashutak on 21/03/18.
-//
+/**
+ * \file src/core/utils.h
+ * \author Lukas Hutak <lukas.hutak@cesnet.cz>
+ * \brief Internal core utilities (header file)
+ * \date 2018
+ */
 
+/* Copyright (C) 2018 CESNET, z.s.p.o.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of the Company nor the names of its contributors
+ *    may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this
+ * product may be distributed under the terms of the GNU General Public
+ * License (GPL) version 2 or later, in which case the provisions
+ * of the GPL apply INSTEAD OF those given above.
+ *
+ * This software is provided ``as is'', and any express or implied
+ * warranties, including, but not limited to, the implied warranties of
+ * merchantability and fitness for a particular purpose are disclaimed.
+ * In no event shall the company or contributors be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential
+ * damages (including, but not limited to, procurement of substitute
+ * goods or services; loss of use, data, or profits; or business
+ * interruption) however caused and on any theory of liability, whether
+ * in contract, strict liability, or tort (including negligence or
+ * otherwise) arising in any way out of the use of this software, even
+ * if advised of the possibility of such damage.
+ *
+ */
 #ifndef IPFIXCOL_UTILS_H
 #define IPFIXCOL_UTILS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include <string.h>
-
-/** Size of an error buffer message                                               */
-#define IPX_STRERROR_SIZE 128
-
-/**
- * \def ipx_strerror
- * \brief Re-entrant strerror wrapper
- *
- * Main purpose is to solve issues with different strerror_r definitions.
- * \warning The function is defined as a macro that creates a local buffer for an error message.
- *   Therefore, it cannot be called multiple times at the same scope.
- * \code{.c}
- *   const char *err_str;
- *   ipx_strerror(errno, err_str);
- *   printf("ERROR: %s\n", err_str);
- * \endcode
- * \param[in]  errnum An error code
- * \param[out] buffer Pointer to the local buffer
- */
-#define ipx_strerror(errnum, buffer)                                                     \
-    char ipx_strerror_buffer[IPX_STRERROR_SIZE];                                         \
-    (buffer) = _Generic((&strerror_r),                                                   \
-        char *(*)(int, char *, size_t): /* GNU-specific   */                             \
-            strerror_r((errnum), ipx_strerror_buffer, IPX_STRERROR_SIZE),                \
-        int   (*)(int, char *, size_t): /* XSI-compliant  */                             \
-            (strerror_r((errnum), ipx_strerror_buffer, IPX_STRERROR_SIZE) >= 0           \
-                ? ipx_strerror_buffer                                                    \
-                : "Unknown error (strerror_r failed!)")                                  \
-    )
+#include <ipfixcol2.h>
 
-#endif //IPFIXCOL_UTILS_H
+#ifdef __cplusplus
+}
+#endif
+#endif // IPFIXCOL_UTILS_H
diff --git a/src/plugins/output/dummy/dummy.c b/src/plugins/output/dummy/dummy.c
@@ -45,7 +45,6 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "../../input/dummy/config.h"
 
 /** Plugin description */
 IPX_API struct ipx_plugin_info ipx_plugin_info = {
diff --git a/src/plugins/output/json/Config.cpp b/src/plugins/output/json/Config.cpp
@@ -268,7 +268,7 @@ void
 Config::parse_send(fds_xml_ctx_t *send)
 {
     struct cfg_send output;
-    output.proto = cfg_send::proto::PROTO_UDP;
+    output.proto = cfg_send::SEND_PROTO_UDP;
     output.addr = "127.0.0.1";
     output.port = 4739;
 
@@ -294,7 +294,7 @@ Config::parse_send(fds_xml_ctx_t *send)
         case SEND_PROTO:
             assert(content->type == FDS_OPTS_T_STRING);
             output.proto = check_or("protocol", content->ptr_string, "UDP", "TCP")
-                ? cfg_send::proto::PROTO_UDP : cfg_send::proto::PROTO_TCP;
+                ? cfg_send::SEND_PROTO_UDP: cfg_send::SEND_PROTO_TCP;
             break;
         case SEND_BLOCK:
             assert(content->type == FDS_OPTS_T_BOOL);
diff --git a/src/plugins/output/json/Config.hpp b/src/plugins/output/json/Config.hpp
diff --git a/src/plugins/output/json/Sender.cpp b/src/plugins/output/json/Sender.cpp
diff --git a/src/plugins/output/json/Storage.cpp b/src/plugins/output/json/Storage.cpp
diff --git a/src/plugins/output/json/Storage.hpp b/src/plugins/output/json/Storage.hpp

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ if (PATH_CPACK)`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`# New target that will pack all source codes into a TAR.GZ archive`
`22`		`- add_custom_target(tgz_package`
	`22`	`+ add_custom_target(tgz`
`23`	`23`	`COMMENT "Generating tar.gz package..."`
`24`	`24`	`COMMAND "${PATH_CPACK}" "--config" "${FILE_CFG_OUT}"`
`25`	`25`	`)`