cmake更新，指定代码编译，保证向前兼容取消soversion设置

Feature using env define flushnum msgsize

See merge request MESA_framework/MESA_handle_logger!8

.gitignore

@@ -11,8 +11,7 @@ build/
 core.*
 version.txt
 demo/test_handle_logger
-cmake-build-*
+cmake-build-debug
-build-*/
 GPATH
 GRTAGS
 GTAGS

.gitlab-ci.yml

@@ -3,7 +3,6 @@ variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/opt/MESA/lib/"
-  INSTALL_DEPENDENCY_LIBRARY:  ""
 
 stages:
 - build
@@ -15,8 +14,7 @@ stages:
   - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
   - chmod +x ./ci/travis.sh
   script:
-  - wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
+  - yum makecache
-  - yum makecache fast
   - ./ci/travis.sh
   - cd build
   tags:
@@ -28,8 +26,7 @@ branch_build_debug:
   variables:
     BUILD_TYPE: Debug
   except:
-    - /^dev*.*$/i
+    - /^develop.*$/i
-    - /^rel*.*$/i
     - /^master.*$/i
     - tags
 
@@ -39,8 +36,7 @@ branch_build_release:
     BUILD_TYPE: RelWithDebInfo
   extends: .build_by_travis
   except:
-    - /^dev*.*$/i
+    - /^develop.*$/i
-    - /^rel*.*$/i
     - /^master.*$/i
     - tags
 
@@ -50,17 +46,12 @@ develop_build_debug:
   variables:
     BUILD_TYPE: Debug
     PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
     paths:
       - build/*.rpm
   only:
-    - /^dev*.*$/i
+    - /^develop.*$/i
-    - /^rel*.*$/i
     - /^master.*$/i
 
 develop_build_release:
@@ -69,26 +60,21 @@ develop_build_release:
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: "OFF"
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
   only:
-    - /^dev*.*$/i
+    - /^develop.*$/i
-    - /^rel*.*$/i
     - /^master.*$/i
 
 
-release_build_debug:
+release_build_release:
   stage: build
   variables:
-    BUILD_TYPE:  Debug
+    BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
-    UPLOAD_RPM: 1
+    UPLOAD: 1
     PULP3_REPO_NAME: framework-stable-x86_64.el7
     PULP3_DIST_NAME: framework-stable-x86_64.el7
   extends: .build_by_travis
@@ -98,21 +84,3 @@ release_build_debug:
       - build/*.rpm
   only:
     - tags
-
-release_build_release:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    UPLOAD_SYMBOL_FILES: 1
-    SYMBOL_TARGET: libMESA_handle_logger
-    PULP3_REPO_NAME: framework-stable-x86_64.el7
-    PULP3_DIST_NAME: framework-stable-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - tags

CMakeLists.txt

@@ -4,8 +4,8 @@ set(lib_name MESA_handle_logger)
 
 project (${lib_name})
 
-set(LIB_MAJOR_VERSION 2)
+set(LIB_MAJOR_VERSION 1)
-set(LIB_MINOR_VERSION 0)
+set(LIB_MINOR_VERSION 1)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(Version)
@@ -15,58 +15,50 @@ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
 #for ASAN
-option(ENABLE_SANITIZE_ADDRESS "Enable AddressSanitizer" FALSE)
+set(ASAN_OPTION "OFF" CACHE STRING " set asan type chosen by the user, using OFF as default")
-option(ENABLE_SANITIZE_THREAD "Enable ThreadSanitizer" FALSE)
+set_property(CACHE ASAN_OPTION  PROPERTY STRINGS OFF ADDRESS THREAD)
+message(STATUS "ASAN_OPTION='${ASAN_OPTION}'")
 
-if(ENABLE_SANITIZE_ADDRESS)
+if(ASAN_OPTION MATCHES "ADDRESS")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+    set(CMAKE_C_FLAGS "${CMAKADDRESS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-elseif(ENABLE_SANITIZE_THREAD)
+elseif(ASAN_OPTION MATCHES "THREAD")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
 endif()
 # end of for ASAN
 
 include_directories(${PROJECT_SOURCE_DIR}/inc/)
 
-add_subdirectory(zlog)
 
 # Shared Library Output
 add_library(${lib_name}_shared SHARED src/MESA_handle_logger.c)
-target_link_libraries(${lib_name}_shared  zlog_static)
-set_target_properties(${lib_name}_shared PROPERTIES LINK_FLAGS
-    "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/version.map")
-target_link_libraries(${lib_name}_shared pthread)
-
 if(DEFINED MESA_SHARED_INSTALL_DIR)
 	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
 else()
 	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name})
 endif()
 
-set_target_properties(${lib_name}_shared PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION})
+#set_target_properties(${lib_name}_shared PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION})
-set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSION})
+#set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSION})
+
 
 # static Library Output
 add_library(${lib_name}_static STATIC src/MESA_handle_logger.c)
-target_link_libraries(${lib_name}_static  zlog_static)
 set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
 
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
-install(FILES inc/MESA_handle_logger.h   DESTINATION
+install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
-    ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel)
+install(FILES inc/${lib_name}.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
-install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
-install(FILES inc/MESA_handle_logger.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
-install(FILES conf/MESA_handle_logger.conf DESTINATION /usr/lib/tmpfiles.d/ COMPONENT PROFILE)
 
 
 
 add_executable(${lib_name}_demo demo/test_handle_logger.c)
-target_link_libraries(${lib_name}_demo pthread ${lib_name}_shared)
+target_link_libraries(${lib_name}_demo  rt pthread ${lib_name}_static)
 
 include(Package)

README

@@ -14,9 +14,6 @@
 
 		2019-2-18 update by yw
 		1)性能优化，句柄中存储文件fp，定期flush至文件
-
-		2020-09-07 update to libMESA_handle_logger2 by yw
-		1)内部使用zlog实现，行为变更，更新库为libMESA_handle_logger2
 ------------------------------------------------------------------------------------- 		
  NOTICE:
 		1)compatible with g++, extern with c;

ci/travis.sh

@@ -33,14 +33,7 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 # Install dependency from YUM
-if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
+#yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel systemd-devel
-      yum install -y $INSTALL_DEPENDENCY_LIBRARY
-fi
-
-if [ $ASAN_OPTION ];then
-	source /opt/rh/devtoolset-7/enable
-fi
-
 mkdir build || true
 cd build
 
@@ -48,8 +41,6 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
       -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
       -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
       -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \
-      -DASAN_OPTION=$ASAN_OPTION \
-      -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \
       ..
 
 make
@@ -58,14 +49,13 @@ if [ -n "${PACKAGE}" ]; then
 	make package
 fi
 
-if [ -n "${UPLOAD_RPM}" ]; then	
+if [ -n "${UPLOAD}" ]; then	
 	cp ~/rpm_upload_tools.py ./
 	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi
 
-if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
+#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
-	rpm -i $SYMBOL_TARGET*debuginfo*.rpm
+#  rpm -i tfe*debuginfo*.rpm
-	_symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"`
+#  cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-	cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+#  sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-	sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+#fi
-fi

cmake/Package.cmake

@@ -14,9 +14,6 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
 execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
-execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
-SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)
-
 # RPM Build
 set(CPACK_GENERATOR "RPM")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
@@ -29,28 +26,24 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
 set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
-set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
+set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
-set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
 
-set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries")
+set(CPACK_COMPONENT_LIBRARY_GROUP "library")
-set(CPACK_COMPONENT_EXECUTABLE_GROUP "libraries")
-set(CPACK_COMPONENT_PROFILE_GROUP "libraries")
 
 set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_COMPONENT_HEADER_GROUP "header")
 
-set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
+set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 
-set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE PROFILE)
+set(CPACK_COMPONENTS_ALL LIBRARY HEADER)
 
-set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
-set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
 

cmake/PostInstall.in

@@ -1,2 +0,0 @@
-#!/bin/sh
-ldconfig

cmake/Version.cmake

@@ -3,7 +3,7 @@
 
 set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
 set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
-set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt)
+set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
 set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
 
 file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}
@@ -38,12 +38,16 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}")
 # print information
 message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
 
-option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE)
+if(NOT DEFINE_GIT_VERSION)
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
+
+set(GIT_VERSION
+    "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
+string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
 
 if(DEFINE_GIT_VERSION)
-	set(GIT_VERSION
+    add_definitions(-DGIT_VERSION=${GIT_VERSION})
-			"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
-	string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
+endif()
-
+
-	add_definitions(-DGIT_VERSION=${GIT_VERSION})
 endif()

cmake/changelog.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-work_path=$1
-branch=`git status | grep branch | awk '{print $NF}'`
-git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt

conf/MESA_handle_logger.conf

@@ -1,2 +0,0 @@
-#Type Path        Mode User Group Age Argument
-d /tmp/MESA_handle_logger/        	    0755 - -   1h -

demo/demo_zlog.conf

@@ -1,13 +0,0 @@
-[global]
-default format = "%d(%c), %V, %U, %m%n"
-[levels]
-DEBUG=10
-INFO=20
-FATAL=30
-[formats]
-other = "%d(%c), %V, %F, %U, %m%n"
-[rules]
-*.=debug    "./log/runtimelog_debug.%d(%F)"
-*.=info    "./log/runtimelog_info.%d(%F)"
-*.=fatal    "./log/runtimelog_fatal.%d(%F)"
-!.*    "./log/runtimelog_other.%d(%F)"; other

demo/test_handle_logger.c

@@ -1,10 +1,9 @@
 #include "MESA_handle_logger.h"
 
-#include <fcntl.h>
-#include <pthread.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <pthread.h>
+#include <signal.h>
 #include <time.h>
 
 void *sample_handle = NULL;
@@ -13,10 +12,8 @@ void *test_handle = NULL;
 #define LOG_NUM 100000
 #define MAX_THREAD_NUM 65535
 
-int g_mode = 0;
 int g_log_num = 0;
 int g_thread_num = 0;
-const char *g_zlog_conf = NULL;
 volatile long g_start_time = 0;
 volatile long g_end_time = 0;
 
@@ -40,11 +37,11 @@ void call_logger(int log_num, int thread_num)
 		}	
 		for(i = 0; i < log_num; i++)
 		{
-				MESA_handle_runtime_log(sample_handle, RLOG_LV_DEBUG, "sample", "sample_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
+				MESA_handle_runtime_log(sample_handle, RLOG_LV_INFO, "sample", "sample_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
 				//sleep(1);
 				MESA_handle_runtime_log(test_handle, RLOG_LV_INFO, "test", "test_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
 				//MESA_HANDLE_RUNTIME_LOG(sample_handle, RLOG_LV_FATAL, "sample", "sample_handle RUNTIEM_LOG test, i = %d, thread_num = %d", i, thread_num);
-				//sleep(1);
+				////sleep(1);
 				//MESA_HANDLE_RUNTIME_LOG(test_handle, RLOG_LV_FATAL, "test", "test_handle RUNTIEM_LOG test, i = %d, thread_num = %d", i, thread_num);
 		}
 		clock_gettime(CLOCK_MONOTONIC, &end);
@@ -75,56 +72,36 @@ void *thread_logger(void *arg)
 		return NULL;
 }
 
-void sig_int_handler(int sig)
+void sig_handler(int sig)
 {
 		printf("ctrl+c recviced!\n");
 		MESA_destroy_runtime_log_handle(sample_handle);
 		MESA_destroy_runtime_log_handle(test_handle);
 		sample_handle = NULL;
 		test_handle = NULL;
-		if (g_mode == 2)
+		printf("%d thread write %d log using %ld us, avg speed %f /s, %ld -> %ld\n", g_thread_num, g_thread_num*g_log_num, g_end_time-g_start_time, ((float)(g_thread_num*g_log_num)/(float)(g_end_time-g_start_time))*1000000, g_start_time, g_end_time);
-		{
-			MESA_handle_runtime_log_destruction();
-		}
-		printf("%d thread write %d log using %ld us, avg speed %f /s, %ld -> %ld\n", g_thread_num, g_thread_num * g_log_num, g_end_time - g_start_time, ((float)(g_thread_num * g_log_num) / (float)(g_end_time - g_start_time)) * 1000000, g_start_time, g_end_time);
 		exit(0);
 }
 
-void sig_hup_handler(int sig)
-{
-	printf("SIGHUP recviced!\n");
-	MESA_handle_runtime_log_reconstruction(g_zlog_conf);
-}
-
 int main(int argc, char ** args)
 {
 	pthread_t t[MAX_THREAD_NUM];
 	int i = 0;
 
-	if (argc != 5)
+	if(argc != 3)
 	{
-		printf("Usage: ./($app) $mode[1 or 2] $zlog_conf_path $thread_num $log_num \n");
+		printf("Usage: ./($app) $thread_num $log_num \n");
 		return -1;
 	}
-	g_mode = atoi(args[1]);
+	g_thread_num = atoi(args[1]);
-	g_zlog_conf = args[2];
+	g_log_num = atoi(args[2]);
-	g_thread_num = atoi(args[3]);
-	g_log_num = atoi(args[4]);
 
 	if(g_thread_num <= 0 || g_log_num <= 0)
 	{
 		printf("Error, wrong parameter!\n");
 		return -1;
 	}
-	if (g_mode == 2)
+	sample_handle = MESA_create_runtime_log_handle("./log/test_log", RLOG_LV_DEBUG);
-	{
-		if (0 != MESA_handle_runtime_log_creation(g_zlog_conf))
-		{
-			printf("MESA_handle_runtime_log_creation return error\n");
-			return -1;
-		}
-	}
-	sample_handle = MESA_create_runtime_log_handle("./log/sample_log", RLOG_LV_DEBUG);
 	if (sample_handle == NULL)
 	{
 		printf("get log sample_handle error\n");
@@ -142,8 +119,7 @@ int main(int argc, char ** args)
 		{	
 				pthread_create(&t[i], NULL, thread_logger, (void *)(unsigned long)(i));
 		}
-		signal(SIGINT, sig_int_handler);
+		signal(SIGINT, sig_handler);
-		signal(SIGHUP, sig_hup_handler);
 		while(1)
 		;
 		//MESA_destroy_runtime_log_handle(sample_handle);

inc/MESA_handle_logger.h

@@ -19,15 +19,11 @@ extern "C"
 #define RLOG_LV_FATAL       30
 
 
-int MESA_handle_runtime_log_creation(const char *conf_path);
-int MESA_handle_runtime_log_reconstruction(const char *conf_path);
-void MESA_handle_runtime_log_destruction();
-
 #define MESA_HANDLE_RUNTIME_LOG(handle, lv, mod, fmt, args...)   \
     MESA_handle_runtime_log((handle), (lv), (mod), "file %s, line %d, " fmt, \
                        __FILE__, __LINE__, ##args)
 
-    /*
+/*
  * name: MESA_create_runtime_log_handle
  * functionality: get runtime_log handle;
  * params:
@@ -37,7 +33,7 @@ void MESA_handle_runtime_log_destruction();
  *  not NULL, if succeeded;
  *   NULL, if file is not absolute path, or failed to create log file;
  */
-    void *MESA_create_runtime_log_handle(const char *file_path, int level);
+void *MESA_create_runtime_log_handle(const char *file_path, int level);
 
 /*
  * name: MESA_handle_runtime_log

src/MESA_handle_logger.c

@@ -1,25 +1,23 @@
 #include "MESA_handle_logger.h"
-#include "zlog.h"
 
-#include <fcntl.h>
+#include <stdio.h>
-#include <stdarg.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
-#include <unistd.h>
 #include <time.h>
+#include <unistd.h>
+#include<sys/stat.h>
 
-#define MAX_HANDLE_LOG_PATH 4096
+int LOGMSG_MAX_LEN = 4096;
-static int g_zlog_inited = 0;
+int FLUSH_LOG_NUM = 0;
-static int g_zlog_conf_fp = -1;
-static char global_conf_filepath[MAX_HANDLE_LOG_PATH] = "";
-static char tmp_conf_filepath[MAX_HANDLE_LOG_PATH] = "";
-
 typedef struct log_handle_t
 {
     int runtime_log_level;
-    zlog_category_t *zc;
+    int flush_log_count;
-    const char *global_conf_path;
+    FILE *fp;
-    char runtime_log_file[MAX_HANDLE_LOG_PATH];
+    pthread_mutex_t mutex;
+    char runtime_log_file[1200];
+    char cur_log_file[4096];
 } log_handle_t;
 
 
@@ -48,6 +46,12 @@ static __attribute__((__used__)) const char * GIT_VERSION_UNKNOWN = NULL;
 #endif
 
 
+static unsigned char weekday_str[7][4] =
+{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+
+static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr",
+	"May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
 static int create_dir(const char *dir_path, int path_len)
 {
     if(dir_path == NULL)
@@ -90,115 +94,41 @@ static int create_path(const char *path, int path_len)
     return 0;
 }
 
-static int get_filepath(int fp, char *buf, int buflen)
-{
-    if(buf == NULL || buflen <=0)return -1;
-    char proclnk[0xFFF] = "";
-    int fno = fp;
-    sprintf(proclnk, "/proc/self/fd/%d", fno);
-    int r = readlink(proclnk, buf, buflen);
-    return r;
-}
-
-//static char tmp_template[] = "/tmp/MESA_handle_loggger/handle_loggger.XXXXXX";
-
-static void escape_for_zlog(char *in_buf, int buflen)
-{
-    if(in_buf == NULL || buflen <= 0)return;
-    int i = 0;
-    for(i = 0; i < buflen; i++)
-    {
-        if ((!isalnum(in_buf[i])) && (in_buf[i] != '_') && (in_buf[i] != '-') && (in_buf[i] != '*') && (in_buf[i] != '!'))
-        {
-            in_buf[i] = '_';
-        }
-    }
-    return;
-}
-
-static const char *loglevel_to_name(int level)
-{
-    if (level <= RLOG_LV_DEBUG)
-        return "DEBUG";
-    if (level > RLOG_LV_DEBUG && level <= RLOG_LV_INFO)
-        return "INFO";
-    return "FATAL";
-}
-
-static void snapshot_handle_info(const char *handle_name, const char *log_path, int level)
-{
-    char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1] = "";
-    static char *tmp_prefix = "/tmp/MESA_handle_logger/";
-    static char *zlog_conf_init_buff = "[global]\ndefault format = \"%d(%c), %V, %F, %U, %m%n\" \n[levels]\nDEBUG=10\nINFO=20\nFATAL=30\n[rules]";
-    if (g_zlog_conf_fp == -1)
-    {
-	    if (create_path("/tmp/MESA_handle_logger/", strlen(tmp_prefix)) < 0)
-		    return;
-        char temp_filename[1024] = "";
-        sprintf(temp_filename, "/tmp/MESA_handle_logger/MESA_logger_snapshot_%d.XXXXXX", getpid());
-        g_zlog_conf_fp = mkstemp(temp_filename);
-        if (g_zlog_conf_fp == -1)
-        {
-            return ;
-        }
-        if (get_filepath(g_zlog_conf_fp, tmp_conf_filepath, sizeof(tmp_conf_filepath)) < 0)
-        {
-            return;
-        }
-        write(g_zlog_conf_fp, zlog_conf_init_buff, strlen(zlog_conf_init_buff));
-        fsync(g_zlog_conf_fp);
-    }
-    snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
-             "\n%s.%s    \"%s.%%d(%%F)\"",
-             handle_name, loglevel_to_name(level), log_path);
-    write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
-    fsync(g_zlog_conf_fp);
-
-    if(g_zlog_inited == 0)
-    {
-        fprintf(stderr,"[snapshot_handle_info], Nobody call MESA_handle_runtime_log_creation before, Using (%s) to init zlog, handle_name(%s), log_path(%s), log_level(%d)!!!\n", tmp_conf_filepath, handle_name, log_path, level);
-        zlog_init(tmp_conf_filepath);
-        zlog_reload(NULL);
-    }
-    return;
-}
-
 void *MESA_create_runtime_log_handle(const char *file_path, int level)
 {
 	if(file_path == NULL)
 		return NULL;
+    char *max_len = getenv("HLOG_MSG_SIZE");
+    char *flush_num = getenv("HLOG_FLUSH_NUM");
 
-    int rc = -1;
+    if(max_len != NULL)LOGMSG_MAX_LEN = atoi(max_len);
-    zlog_category_t *zc = NULL;
+    if(flush_num != NULL)FLUSH_LOG_NUM = atoi(flush_num);
+    
     FILE *fp  = NULL;
     log_handle_t *p_handle = NULL;
 
-    char handle_name[MAX_HANDLE_LOG_PATH];
+    //creating file_path failed, return NULL
-    char *p_path_end = rindex(file_path, '/');
+	char *p_path = rindex(file_path, '/');
-    char *p_name = p_path_end+1;
+	if(p_path != 0)
+	{
+		if(create_path(file_path, p_path - file_path) < 0)
+			return NULL;
+	}
+    if(NULL == (fp = fopen(file_path, "w")))
+		return NULL;
 
-    strcpy(handle_name, file_path);
+    //fclose(fp);
-    escape_for_zlog(handle_name, strlen(handle_name));
+    //remove(file_path);
-    p_name = handle_name;
-
-
-    if(p_path_end != NULL && p_path_end > file_path)
-    {
-	    //creating file_path failed, return NULL
-	    if (create_path(file_path, p_path_end-file_path) < 0)
-		    return NULL;
-    }
-    snapshot_handle_info(p_name, file_path, level);
-    zlog_reload(NULL);
-    zc = zlog_get_category(p_name);
-    if (!zc)
-    {
-        fprintf(stderr,"[MESA_create_runtime_log_handle], get zlog category (%s) in global_conf_filepath(%s) fail\n", p_name, global_conf_filepath);
-    }
     p_handle = (log_handle_t *)calloc(sizeof(log_handle_t), 1);
-    strncpy(p_handle->runtime_log_file, file_path, sizeof(p_handle->runtime_log_file) - 1);
+
+    if(p_handle == NULL)
+		return NULL;
+
+    strncpy(p_handle->runtime_log_file, file_path, 1024);
+    p_handle->runtime_log_file[1024] = '\0';
     p_handle->runtime_log_level = level;
-    p_handle->zc = zc;
+    pthread_mutex_init(&p_handle->mutex,NULL);
+    //p_handle->fp = fp;
     return (void *)p_handle;
 }
 
@@ -206,125 +136,132 @@ void MESA_destroy_runtime_log_handle(void *handle)
 {
     if(handle != NULL)
     {
-        free(handle);
+        log_handle_t *p_handle = (log_handle_t *)handle;
+        if (p_handle->fp != NULL)
+        {
+            fclose(p_handle->fp);
+            p_handle->fp = NULL;
+        }
+            free(handle);
         handle = NULL;
     }
 
     return;
 }
 
+static void MESA_handle_close_file(log_handle_t *p_handle)
+{
+	pthread_mutex_lock(&p_handle->mutex); 
+	if(p_handle->fp != NULL)
+	{
+		fclose(p_handle->fp);
+		p_handle->fp = NULL;
+	}
+	pthread_mutex_unlock(&p_handle->mutex); 
+	return;	
+}
+
+static int MESA_handle_open_file(char *file_name, log_handle_t *p_handle)
+{
+	FILE *fp = NULL;
+	MESA_handle_close_file(p_handle);
+	if(NULL == (fp = fopen(file_name, "a"))) 
+	{
+		return -1;
+	}
+        p_handle->fp = fp;
+        p_handle->flush_log_count = 0;
+        memcpy(p_handle->cur_log_file, file_name, strlen(file_name));
+	return 0;
+}
 
 void MESA_handle_runtime_log(void *handle, int level, const char *module, const char *fmt, ...)
 {
-    
+    char buf[LOGMSG_MAX_LEN + 1];
+    time_t t;
+    int len;
+    va_list ap;
+    FILE *fp;
+    struct tm local_time;
+    char tmp_log_file_name[1400];
     log_handle_t *p_handle = (log_handle_t *)handle;
 
     if(p_handle == NULL || p_handle->runtime_log_file == NULL)return;
 
-    if(p_handle->zc == NULL)return;
+    if(level < p_handle->runtime_log_level) return;
 
-    va_list ap;
+    time(&t);
-    va_start(ap, fmt);
+    if(NULL == (localtime_r(&t, &local_time))) return;
-    vzlog(p_handle->zc, p_handle->runtime_log_file, strlen(p_handle->runtime_log_file), module, strlen(module), __LINE__, level, fmt, ap);
+    len = snprintf(buf, sizeof(buf), "%s %s %d %02d:%02d:%02d %d", weekday_str[local_time.tm_wday],
-    va_end(ap);
+             month_str[local_time.tm_mon], local_time.tm_mday, local_time.tm_hour, local_time.tm_min, local_time.tm_sec, local_time.tm_year+1900);
-    return ;
+    //len = strlen(buf);
-}
 
-
+    switch(level)
-int MESA_handle_runtime_log_creation(const char *conf_path)
-{
-    char *env = getenv("ZLOG_CONF_PATH");
-    int rc = 0;
-    if (conf_path == NULL || (access(conf_path, R_OK) != 0))
     {
-        fprintf(stderr,"[MESA_handle_runtime_log_creation],  PATH (%s) unable to access, will output log to STDOUT or Using ZLOG_CONF_PATH (%s) !\n", conf_path, env);
+        case RLOG_LV_DEBUG:
-        rc = zlog_init(NULL);
+            len += snprintf(buf + len,
-        if (rc)
+                            LOGMSG_MAX_LEN - len, ", %s, ", "DEBUG");
-        {
+            break;
-            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
+
-            return -1;
+        case RLOG_LV_INFO:
-        }
+            len += snprintf(buf + len,
-        else
+                            LOGMSG_MAX_LEN - len, ", %s, ", "INFO");
-        {
+            break;
-            if (env != NULL)
+
-            {
+        case RLOG_LV_FATAL:
-                strcpy(global_conf_filepath, env);
+            len += snprintf(buf + len,
-            }
+                            LOGMSG_MAX_LEN - len, ", %s, ", "FATAL");
-        }
+            break;
+
+        default:
+            len += snprintf(buf + len,
+                            LOGMSG_MAX_LEN - len, ", %s, ", "UNKNOWN");
+            break;
+    }
+
+    if(0 >= LOGMSG_MAX_LEN - len) return;
+
+    len += snprintf(buf + len, LOGMSG_MAX_LEN - len, "%s, ", module);
+
+    if(0 >= LOGMSG_MAX_LEN - len) return;
+
+    va_start(ap, fmt);
+    len += vsnprintf(buf + len, LOGMSG_MAX_LEN - len, fmt, ap);
+    va_end(ap);
+
+    if(0 >= LOGMSG_MAX_LEN - len) return;
+
+    len += snprintf(buf + len, LOGMSG_MAX_LEN - len, "\n");
+
+
+    sprintf(tmp_log_file_name, "%s.%04d-%02d-%02d", p_handle->runtime_log_file,
+            local_time.tm_year + 1900, local_time.tm_mon + 1,
+            local_time.tm_mday);
+
+    if(p_handle->fp == NULL)
+    {
+	    if(0 != MESA_handle_open_file(tmp_log_file_name,p_handle))return;
     }
     else
     {
-        rc = zlog_init(conf_path);
+	    if (0 != memcmp(tmp_log_file_name, p_handle->cur_log_file, strlen(tmp_log_file_name)))
-        if (rc)
+	    {
-        {
+		    if(0 != MESA_handle_open_file(tmp_log_file_name,p_handle))return;
-            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
+	    }
-            rc = zlog_init(NULL);
-            if (rc)
-            {
-                fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
-                return -1;
-            }
-            else
-            {
-                if(env != NULL)
-                {
-                    strcpy(global_conf_filepath, env);
-                }
-            }
-            
-        }
-        else
-        {
-            strcpy(global_conf_filepath, conf_path);
-        }
-        
     }
-    fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
+    if (0 > fprintf(p_handle->fp, "%s", buf))
-    g_zlog_inited = 1;
-    zlog_profile();
-
-    return rc;
-}
-
-int MESA_handle_runtime_log_reconstruction(const char *conf_path)
-{
-    int rc = zlog_reload(conf_path);
- #ifdef DEBUG
-    char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1];
-    time_t t;
-    struct tm local_time;
-    static unsigned char weekday_str[7][4] =
-        {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-
-    static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr",
-                                             "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-    if (!rc)
     {
-        strcpy(global_conf_filepath, conf_path);
+	MESA_handle_close_file(p_handle);
-        zlog_profile();
-        if (g_zlog_conf_fp != -1)
-        {
-            time(&t);
-            if (NULL != (localtime_r(&t, &local_time)))
-            {
-                snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
-                         "\n%s %s %d %02d:%02d:%02d %d, RECONSTRUCTION to %s\n", weekday_str[local_time.tm_wday],
-                         month_str[local_time.tm_mon], local_time.tm_mday, local_time.tm_hour, local_time.tm_min, local_time.tm_sec, local_time.tm_year + 1900, conf_path);
-                write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
-                fsync(g_zlog_conf_fp);
-            }
-        }
     }
-#endif        
+    else
-        return rc;
+    {
+	    p_handle->flush_log_count+=1;
+	    if (p_handle->flush_log_count >= FLUSH_LOG_NUM)
+	    {
+		    fflush(p_handle->fp);
+		    p_handle->flush_log_count = 0;
+	    }
+    }        
+    return;
 }
 
-void MESA_handle_runtime_log_destruction()
-{
-    zlog_fini();
-    if (g_zlog_conf_fp != -1)
-    {
-        unlink(tmp_conf_filepath);
-        close(g_zlog_conf_fp);
-    }
-}

src/version.map

@@ -1,4 +0,0 @@
-{
-  global: MESA*runtime_log*;GIT_VERSION_*;
-  local: *;
-};

zlog/CMakeLists.txt

@@ -1,28 +0,0 @@
-cmake_minimum_required (VERSION 3.5)
-
-include(ExternalProject)
-
-ExternalProject_Add(zlog PREFIX zlog
-	URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz
-    URL_MD5 5e79f8d08744c7fef8528dd55a3bcd2d  
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND make
-    INSTALL_COMMAND ""
-	BUILD_IN_SOURCE 1)
-
-ExternalProject_Get_Property(zlog SOURCE_DIR)
-file(MAKE_DIRECTORY ${SOURCE_DIR}/src/)
-
-
-add_library(zlog_static STATIC IMPORTED GLOBAL)
-add_dependencies(zlog_static  zlog)
-set_property(TARGET zlog_static  PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.a)
-set_property(TARGET zlog_static  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src)
-
-add_library(zlog_shared SHARED IMPORTED GLOBAL)
-add_dependencies(zlog_shared  zlog)
-set_property(TARGET zlog_shared  PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so.1.2)
-set_property(TARGET zlog_shared  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src)
-
-install(FILES ${SOURCE_DIR}/src/libzlog.so.1.2 DESTINATION lib COMPONENT LIBRARIES)
-install(FILES ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE)