Compare commits
57 Commits
dev-1.0
...
CI-aarch64
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b9ac69ecc | ||
|
|
7ed1582309 | ||
|
|
67ed711088 | ||
|
|
1dd9e1e0f2 | ||
|
|
7fa29b1a00 | ||
|
|
8680c2f4f5 | ||
|
|
c0620c8d25 | ||
|
|
4d64f0cf06 | ||
|
|
b677bb6c71 | ||
|
|
f76af2f036 | ||
|
|
31bd3fed9c | ||
|
|
9ecf746f0f | ||
|
|
040ce55a1b | ||
|
|
cb4ad71c50 | ||
|
|
02100e4232 | ||
|
|
63f5231e9f | ||
|
|
15fe685383 | ||
|
|
e1057e6d0c | ||
|
|
2e4e4dff17 | ||
|
|
150255033c | ||
|
|
0f0e55c877 | ||
|
|
8857f282b9 | ||
|
|
cc0912eed0 | ||
|
|
186571e823 | ||
|
|
e39e641103 | ||
|
|
f461cbbc3d | ||
|
|
05a8eded4b | ||
|
|
92815d2d1f | ||
|
|
ea4185727b | ||
|
|
7066b2b086 | ||
|
|
52db3f0001 | ||
|
|
7417fed852 | ||
|
|
0cb2236be0 | ||
|
|
332201d4b0 | ||
|
|
ce403b8ca5 | ||
|
|
f15a1fd617 | ||
|
|
d42c5eeb0f | ||
|
|
49b61b11a9 | ||
|
|
bc575233b7 | ||
|
|
b4f239ae9c | ||
|
|
90fb91cd42 | ||
|
|
9c410a1e7e | ||
|
|
8dee487439 | ||
|
|
2e4c2d3098 | ||
|
|
40512a0421 | ||
|
|
ab7f4edda1 | ||
|
|
bafd63face | ||
|
|
e6e1f8494e | ||
|
|
19911a962c | ||
|
|
c21cdcb3f0 | ||
|
|
745f908d70 | ||
|
|
23609f6f02 | ||
|
|
6ae5d5ffa9 | ||
|
|
1f9fc66152 | ||
|
|
635bb180bf | ||
|
|
117720197e | ||
|
|
49822347cb |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -11,3 +11,8 @@ build/
|
||||
core.*
|
||||
version.txt
|
||||
demo/test_handle_logger
|
||||
cmake-build-*
|
||||
build-*/
|
||||
GPATH
|
||||
GRTAGS
|
||||
GTAGS
|
||||
|
||||
194
.gitlab-ci.yml
194
.gitlab-ci.yml
@@ -1,42 +1,180 @@
|
||||
image: "git.mesalab.cn:7443/mesa_framework/framework-build-env:master"
|
||||
variables:
|
||||
GIT_STRATEGY: "clone"
|
||||
BUILD_IMAGE_X86_64_ROCKY8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
|
||||
BUILD_IMAGE_AARCH64_ROCKY9: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64"
|
||||
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
|
||||
INSTALL_DEPENDENCY_LIBRARY: libasan
|
||||
|
||||
stages:
|
||||
- build
|
||||
#- test
|
||||
#- package
|
||||
- release
|
||||
- test
|
||||
|
||||
variables:
|
||||
ARTIFACTS_JOB: "build"
|
||||
|
||||
build:
|
||||
.build_before_script:
|
||||
before_script:
|
||||
- mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
|
||||
- ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
|
||||
- cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
|
||||
- chmod +x ./ci/travis.sh
|
||||
|
||||
|
||||
###############################################################################
|
||||
# build on x86_64 Rocky8
|
||||
###############################################################################
|
||||
|
||||
.build_by_travis_for_x86_64_rocky8:
|
||||
stage: build
|
||||
image: $BUILD_IMAGE_X86_64_ROCKY8
|
||||
extends: .build_before_script
|
||||
script:
|
||||
- mkdir -p build
|
||||
- ./ci/travis.sh
|
||||
tags:
|
||||
- tsg-os-builder-el8
|
||||
|
||||
|
||||
run_test_for_x86_64_rocky8:
|
||||
stage: test
|
||||
image: $BUILD_IMAGE_X86_64_ROCKY8
|
||||
extends: .build_by_travis_for_x86_64_rocky8
|
||||
script:
|
||||
- ./ci/travis.sh
|
||||
- cd build
|
||||
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$BUILD_PREFIX
|
||||
- make
|
||||
- make package
|
||||
tags:
|
||||
- share
|
||||
- ctest --verbose
|
||||
|
||||
|
||||
branch_build_debug_for_x86_64_rocky8:
|
||||
stage: build
|
||||
extends: .build_by_travis_for_x86_64_rocky8
|
||||
variables:
|
||||
BUILD_TYPE: "Debug"
|
||||
BUILD_PREFIX: "/opt/MESA/"
|
||||
only:
|
||||
BUILD_TYPE: Debug
|
||||
except:
|
||||
- /^develop.*$/i
|
||||
- /^master.*$/i
|
||||
- /^dev*.*$/i
|
||||
- /^rel*.*$/i
|
||||
- tags
|
||||
- pushes
|
||||
- master
|
||||
|
||||
branch_build_release_for_x86_64_rocky8:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
extends: .build_by_travis_for_x86_64_rocky8
|
||||
except:
|
||||
- /^develop.*$/i
|
||||
- /^master.*$/i
|
||||
- /^dev*.*$/i
|
||||
- /^rel*.*$/i
|
||||
- tags
|
||||
|
||||
release_build_debug_for_x86_64_rocky88:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: Debug
|
||||
PACKAGE: 1
|
||||
UPLOAD_RPM: 1
|
||||
PULP3_REPO_NAME: framework-stable-x86_64.el8
|
||||
PULP3_DIST_NAME: framework-stable-x86_64.el8
|
||||
extends: .build_by_travis_for_x86_64_rocky8
|
||||
artifacts:
|
||||
name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-debug"
|
||||
name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
|
||||
paths:
|
||||
- ./build/*.rpm
|
||||
|
||||
release:
|
||||
stage: release
|
||||
tags:
|
||||
- share
|
||||
- build/*.rpm
|
||||
only:
|
||||
- tags
|
||||
- master
|
||||
|
||||
release_build_release_for_x86_64_rocky8:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
PACKAGE: 1
|
||||
UPLOAD_RPM: 1
|
||||
SYMBOL_TARGET: libMESA_handle_logger
|
||||
PULP3_REPO_NAME: framework-stable-x86_64.el8
|
||||
PULP3_DIST_NAME: framework-stable-x86_64.el8
|
||||
extends: .build_by_travis_for_x86_64_rocky8
|
||||
artifacts:
|
||||
name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
|
||||
paths:
|
||||
- build/*.rpm
|
||||
only:
|
||||
- tags
|
||||
|
||||
###############################################################################
|
||||
# build on aarch64 Rocky9
|
||||
###############################################################################
|
||||
|
||||
.build_by_travis_for_aarch64_rocky9:
|
||||
stage: build
|
||||
image: $BUILD_IMAGE_AARCH64_ROCKY9
|
||||
extends: .build_before_script
|
||||
script:
|
||||
- /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $CI_PROJECT_NAME
|
||||
- ./ci/travis.sh
|
||||
tags:
|
||||
- tsg-os-builder-aarch64
|
||||
|
||||
|
||||
run_test_for_aarch64_rocky9:
|
||||
stage: test
|
||||
image: $BUILD_IMAGE_AARCH64_ROCKY9
|
||||
extends: .build_by_travis_for_aarch64_rocky9
|
||||
script:
|
||||
- ./ci/travis.sh
|
||||
- cd build
|
||||
- ctest --verbose
|
||||
|
||||
|
||||
branch_build_debug_for_aarch64_rocky9:
|
||||
stage: build
|
||||
extends: .build_by_travis_for_aarch64_rocky9
|
||||
variables:
|
||||
BUILD_TYPE: Debug
|
||||
except:
|
||||
- /^develop.*$/i
|
||||
- /^master.*$/i
|
||||
- /^dev*.*$/i
|
||||
- /^rel*.*$/i
|
||||
- tags
|
||||
|
||||
branch_build_release_for_aarch64_rocky9:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
extends: .build_by_travis_for_aarch64_rocky9
|
||||
except:
|
||||
- /^develop.*$/i
|
||||
- /^master.*$/i
|
||||
- /^dev*.*$/i
|
||||
- /^rel*.*$/i
|
||||
- tags
|
||||
|
||||
release_build_debug_for_aarch64_rocky9:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: Debug
|
||||
PACKAGE: 1
|
||||
UPLOAD_RPM: 1
|
||||
PULP3_REPO_NAME: framework-stable-aarch64.el9
|
||||
PULP3_DIST_NAME: framework-stable-aarch64.el9
|
||||
extends: .build_by_travis_for_aarch64_rocky9
|
||||
artifacts:
|
||||
name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
|
||||
paths:
|
||||
- build/*.rpm
|
||||
only:
|
||||
- tags
|
||||
|
||||
release_build_release_for_aarch64_rocky9:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
PACKAGE: 1
|
||||
UPLOAD_RPM: 1
|
||||
SYMBOL_TARGET: libMESA_handle_logger
|
||||
PULP3_REPO_NAME: framework-stable-aarch64.el9
|
||||
PULP3_DIST_NAME: framework-stable-aarch64.el9
|
||||
extends: .build_by_travis_for_aarch64_rocky9
|
||||
artifacts:
|
||||
name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
|
||||
paths:
|
||||
- build/*.rpm
|
||||
only:
|
||||
- tags
|
||||
@@ -4,6 +4,9 @@ set(lib_name MESA_handle_logger)
|
||||
|
||||
project (${lib_name})
|
||||
|
||||
set(LIB_MAJOR_VERSION 2)
|
||||
set(LIB_MINOR_VERSION 0)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
||||
include(Version)
|
||||
|
||||
@@ -30,38 +33,45 @@ endif()
|
||||
|
||||
include_directories(${PROJECT_SOURCE_DIR}/inc/)
|
||||
|
||||
file(GLOB SRC
|
||||
"src/*.c"
|
||||
"src/*.cpp"
|
||||
)
|
||||
add_subdirectory(zlog)
|
||||
|
||||
# Shared Library Output
|
||||
add_library(${lib_name}_shared SHARED ${SRC})
|
||||
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 SOVERSION ${LIB_MAJOR_VERSION})
|
||||
|
||||
# static Library Output
|
||||
add_library(${lib_name}_static STATIC ${SRC})
|
||||
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(TARGETS ${lib_name}_shared LIBRARY DESTINATION
|
||||
${CMAKE_INSTALL_PREFIX}/lib)
|
||||
install(FILES inc/${lib_name}.h DESTINATION
|
||||
install(FILES inc/MESA_handle_logger.h DESTINATION
|
||||
${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel)
|
||||
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)
|
||||
|
||||
|
||||
|
||||
file(GLOB DEMO
|
||||
"demo/*.c"
|
||||
"demo/*.cpp"
|
||||
)
|
||||
add_executable(${lib_name}_demo demo/test_handle_logger.c)
|
||||
target_link_libraries(${lib_name}_demo pthread ${lib_name}_shared)
|
||||
|
||||
add_executable(${lib_name}_demo ${DEMO})
|
||||
target_link_libraries(${lib_name}_demo rt pthread ${lib_name}_static)
|
||||
enable_testing()
|
||||
|
||||
add_test(NAME test_compatible_mode COMMAND MESA_handle_logger_demo 1 ./demo_zlog.conf 1 100 0)
|
||||
add_test(NAME test_perf COMMAND MESA_handle_logger_demo 2 ./demo_zlog.conf 1 1000 0)
|
||||
|
||||
include(Package)
|
||||
|
||||
12
README
12
README
@@ -4,13 +4,19 @@
|
||||
*Author:yangwei@iie.ac.cn
|
||||
*History:
|
||||
2014-03-24 created by yw
|
||||
1)first version
|
||||
1)第一个动态库版本
|
||||
|
||||
2014-04-16 modified by yw
|
||||
1)strict inspection parameters, compatible with g++ 4.4.4
|
||||
1) 支持g++ 4.4.4编译
|
||||
|
||||
2014-05-29 update by yw
|
||||
1)create directory is supported
|
||||
1)支持创建用户指定的日志目录
|
||||
|
||||
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;
|
||||
|
||||
48
ci/get-nprocessors.sh
Normal file
48
ci/get-nprocessors.sh
Normal file
@@ -0,0 +1,48 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright 2017 Google Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * 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.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "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 COPYRIGHT
|
||||
# OWNER 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.
|
||||
|
||||
# This file is typically sourced by another script.
|
||||
# if possible, ask for the precise number of processors,
|
||||
# otherwise take 2 processors as reasonable default; see
|
||||
# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization
|
||||
if [ -x /usr/bin/getconf ]; then
|
||||
NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
|
||||
else
|
||||
NPROCESSORS=2
|
||||
fi
|
||||
|
||||
# as of 2017-09-04 Travis CI reports 32 processors, but GCC build
|
||||
# crashes if parallelized too much (maybe memory consumption problem),
|
||||
# so limit to 4 processors for the time being.
|
||||
if [ $NPROCESSORS -gt 4 ] ; then
|
||||
echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
|
||||
NPROCESSORS=4
|
||||
fi
|
||||
3
ci/perpare_pulp3_netrc.sh
Normal file
3
ci/perpare_pulp3_netrc.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env sh
|
||||
set -evx
|
||||
echo "machine ${PULP3_SERVER_URL}\nlogin ${PULP3_SERVER_LOGIN}\npassword ${PULP3_SERVER_PASSWORD}\n" > ~/.netrc
|
||||
60
ci/travis.sh
Normal file
60
ci/travis.sh
Normal file
@@ -0,0 +1,60 @@
|
||||
#!/usr/bin/env sh
|
||||
set -evx
|
||||
|
||||
chmod +x ci/get-nprocessors.sh
|
||||
. ci/get-nprocessors.sh
|
||||
|
||||
# if possible, ask for the precise number of processors,
|
||||
# otherwise take 2 processors as reasonable default; see
|
||||
# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization
|
||||
if [ -x /usr/bin/getconf ]; then
|
||||
NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
|
||||
else
|
||||
NPROCESSORS=2
|
||||
fi
|
||||
|
||||
# as of 2017-09-04 Travis CI reports 32 processors, but GCC build
|
||||
# crashes if parallelized too much (maybe memory consumption problem),
|
||||
# so limit to 4 processors for the time being.
|
||||
if [ $NPROCESSORS -gt 4 ] ; then
|
||||
echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
|
||||
NPROCESSORS=4
|
||||
fi
|
||||
|
||||
# Tell make to use the processors. No preceding '-' required.
|
||||
MAKEFLAGS="j${NPROCESSORS}"
|
||||
export MAKEFLAGS
|
||||
|
||||
env | sort
|
||||
|
||||
# Set default values to OFF for these variables if not specified.
|
||||
: "${NO_EXCEPTION:=OFF}"
|
||||
: "${NO_RTTI:=OFF}"
|
||||
: "${COMPILER_IS_GNUCXX:=OFF}"
|
||||
|
||||
# Install dependency from YUM
|
||||
if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
|
||||
yum install -y $INSTALL_DEPENDENCY_LIBRARY
|
||||
fi
|
||||
|
||||
mkdir build || true
|
||||
cd build
|
||||
|
||||
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
|
||||
|
||||
if [ -n "${PACKAGE}" ]; then
|
||||
make package
|
||||
fi
|
||||
|
||||
if [ -n "${UPLOAD_RPM}" ]; then
|
||||
cp ~/rpm_upload_tools.py ./
|
||||
python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
|
||||
fi
|
||||
@@ -1,36 +1,57 @@
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(CPACK_PACKAGE_NAME "${lib_name}-debug")
|
||||
set(MY_RPM_NAME_PREFIX "lib${lib_name}-debug")
|
||||
else()
|
||||
set(CPACK_PACKAGE_NAME ${lib_name})
|
||||
set(MY_RPM_NAME_PREFIX "lib${lib_name}")
|
||||
endif()
|
||||
|
||||
message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
|
||||
message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
|
||||
|
||||
set(CPACK_PACKAGE_VECDOR "MESA")
|
||||
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
|
||||
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
|
||||
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
|
||||
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
|
||||
set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
|
||||
|
||||
set(CPACK_RPM_PACKAGE_DEBUG 1)
|
||||
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_AUTO_GENERATED_FILE_NAME ON)
|
||||
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
|
||||
set(CPACK_RPM_PACKAGE_VENDOR "MESA")
|
||||
set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
|
||||
set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
|
||||
set(CPACK_RPM_DEBUGINFO_PACKAGE on)
|
||||
set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
|
||||
set(CPACK_RPM_PACKAGE_RELEASE_DIST "on")
|
||||
set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
|
||||
|
||||
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_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
|
||||
set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES")
|
||||
set(CPACK_COMPONENT_EXECUTABLE_GROUP "LIBRARIES")
|
||||
set(CPACK_COMPONENT_PROFILE_GROUP "LIBRARIES")
|
||||
|
||||
set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
|
||||
set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
|
||||
set(CPACK_COMPONENT_HEADER_GROUP "header")
|
||||
|
||||
set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
|
||||
set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
|
||||
|
||||
set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE PROFILE)
|
||||
|
||||
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}")
|
||||
|
||||
# Must uninstall the debug package before install release package
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug")
|
||||
else()
|
||||
set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name})
|
||||
# set(CPACK_STRIP_FILES TRUE)
|
||||
endif()
|
||||
set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
|
||||
|
||||
# set(CPACK_STRIP_FILES TRUE)
|
||||
include(CPack)
|
||||
|
||||
2
cmake/PostInstall.in
Normal file
2
cmake/PostInstall.in
Normal file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
ldconfig
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
|
||||
set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
|
||||
set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
|
||||
set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt)
|
||||
set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
|
||||
|
||||
file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}
|
||||
@@ -36,13 +36,14 @@ set(VERSION "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}")
|
||||
set(VERSION_BUILD "${VCS_SHORT_HASH}")
|
||||
|
||||
# print information
|
||||
message(STATUS "VERSION: ${VERSION}-${VERSION_BUILD}")
|
||||
message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
|
||||
|
||||
set(GIT_VERSION
|
||||
"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_DATE}")
|
||||
option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE)
|
||||
|
||||
string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
|
||||
if(DEFINE_GIT_VERSION)
|
||||
set(GIT_VERSION
|
||||
"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
|
||||
string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
|
||||
|
||||
add_definitions(-DGIT_VERSION=${GIT_VERSION})
|
||||
|
||||
message(STATUS "add GIT_VERSION: ${GIT_VERSION}")
|
||||
add_definitions(-DGIT_VERSION=${GIT_VERSION})
|
||||
endif()
|
||||
|
||||
4
cmake/changelog.sh
Normal file
4
cmake/changelog.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/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
|
||||
2
conf/MESA_handle_logger.conf
Normal file
2
conf/MESA_handle_logger.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
#Type Path Mode User Group Age Argument
|
||||
d /tmp/MESA_handle_logger/ 0755 - - 1h -
|
||||
13
demo/demo_zlog.conf
Normal file
13
demo/demo_zlog.conf
Normal file
@@ -0,0 +1,13 @@
|
||||
[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
|
||||
@@ -1,9 +1,10 @@
|
||||
#include "MESA_handle_logger.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <pthread.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
void *sample_handle = NULL;
|
||||
@@ -12,8 +13,11 @@ 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;
|
||||
int g_sleep_interval = 0;
|
||||
const char *g_zlog_conf = NULL;
|
||||
volatile long g_start_time = 0;
|
||||
volatile long g_end_time = 0;
|
||||
|
||||
@@ -37,11 +41,15 @@ void call_logger(int log_num, int thread_num)
|
||||
}
|
||||
for(i = 0; i < log_num; i++)
|
||||
{
|
||||
MESA_handle_runtime_log(sample_handle, RLOG_LV_INFO, "sample", "sample_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
|
||||
MESA_handle_runtime_log(sample_handle, RLOG_LV_DEBUG, "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(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);
|
||||
if(g_sleep_interval > 0)
|
||||
{
|
||||
printf("MESA_handle_runtime_log_level_enabled(%d) return %d\n", RLOG_LV_DEBUG, MESA_handle_runtime_log_level_enabled(test_handle, RLOG_LV_DEBUG));
|
||||
sleep(g_sleep_interval);
|
||||
}
|
||||
//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);
|
||||
@@ -57,8 +65,9 @@ void call_logger(int log_num, int thread_num)
|
||||
g_end_time = end_time;
|
||||
}
|
||||
}
|
||||
time_cost = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000 ;
|
||||
time_cost = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000 - g_sleep_interval * 1000000 ;
|
||||
printf("THREAD %d write %d log using %ld us, avg speed %f /s, %ld -> %ld\n", thread_num, log_num, time_cost, ((float)log_num/(float)time_cost)*1000000, start_time, end_time);
|
||||
printf("MESA_handle_runtime_log_level_enabled(%d) return %d\n", RLOG_LV_DEBUG, MESA_handle_runtime_log_level_enabled(test_handle, RLOG_LV_DEBUG));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -72,59 +81,91 @@ void *thread_logger(void *arg)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void sig_handler(int sig)
|
||||
void sig_int_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;
|
||||
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);
|
||||
if (g_mode == 2)
|
||||
{
|
||||
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;
|
||||
int ret =0;
|
||||
|
||||
if(argc != 3)
|
||||
if (argc != 6)
|
||||
{
|
||||
printf("Usage: ./($app) $thread_num $log_num \n");
|
||||
printf("Usage: ./($app) $version_mode[1 or 2] $zlog_conf_path $thread_num $log_num $sleep_interval\n");
|
||||
return -1;
|
||||
}
|
||||
g_thread_num = atoi(args[1]);
|
||||
g_log_num = atoi(args[2]);
|
||||
g_mode = atoi(args[1]);
|
||||
g_zlog_conf = args[2];
|
||||
g_thread_num = atoi(args[3]);
|
||||
g_log_num = atoi(args[4]);
|
||||
g_sleep_interval = atoi(args[5]);
|
||||
|
||||
if(g_thread_num <= 0 || g_log_num <= 0)
|
||||
{
|
||||
printf("Error, wrong parameter!\n");
|
||||
return -1;
|
||||
}
|
||||
sample_handle = MESA_create_runtime_log_handle("./log/test_log", RLOG_LV_DEBUG);
|
||||
if (g_mode == 2)
|
||||
{
|
||||
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");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
test_handle = MESA_create_runtime_log_handle("./log/test_log", RLOG_LV_DEBUG);
|
||||
if(test_handle == NULL)
|
||||
{
|
||||
printf("get log test_handle error\n");
|
||||
return -1;
|
||||
}
|
||||
test_handle = MESA_create_runtime_log_handle("./log/test_log", RLOG_LV_DEBUG);
|
||||
if (test_handle == NULL)
|
||||
{
|
||||
printf("get log test_handle error\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
for(i = 0; i < g_thread_num; i++)
|
||||
{
|
||||
pthread_create(&t[i], NULL, thread_logger, (void *)(unsigned long)(i));
|
||||
}
|
||||
signal(SIGINT, sig_handler);
|
||||
while(1)
|
||||
;
|
||||
//MESA_destroy_runtime_log_handle(sample_handle);
|
||||
//MESA_destroy_runtime_log_handle(test_handle);
|
||||
//sample_handle = NULL;
|
||||
//test_handle = NULL;
|
||||
return 0;
|
||||
for (i = 0; i < g_thread_num; i++)
|
||||
{
|
||||
pthread_create(&t[i], NULL, thread_logger, (void *)(unsigned long)(i));
|
||||
}
|
||||
signal(SIGINT, sig_int_handler);
|
||||
signal(SIGHUP, sig_hup_handler);
|
||||
|
||||
// 等待所有线程结束并回收
|
||||
for (i = 0; i < g_thread_num; ++i) {
|
||||
ret = pthread_join(t[i], NULL);
|
||||
if (ret != 0) {
|
||||
fprintf(stderr, "Failed to join thread %d\n", i);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
printf("All threads finished\n");
|
||||
// MESA_destroy_runtime_log_handle(sample_handle);
|
||||
// MESA_destroy_runtime_log_handle(test_handle);
|
||||
// sample_handle = NULL;
|
||||
// test_handle = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -19,11 +19,22 @@ extern "C"
|
||||
#define RLOG_LV_FATAL 30
|
||||
|
||||
|
||||
#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)
|
||||
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, level, module, format, ...) \
|
||||
do \
|
||||
{ \
|
||||
if (MESA_handle_runtime_log_level_enabled(handle, level)) \
|
||||
{ \
|
||||
MESA_handle_runtime_log(handle, level, module, "file %s, line %d, " format, \
|
||||
__FILE__, __LINE__, ##__VA_ARGS__); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
int MESA_handle_runtime_log_level_enabled(void *handle, const int level);
|
||||
/*
|
||||
* name: MESA_create_runtime_log_handle
|
||||
* functionality: get runtime_log handle;
|
||||
* params:
|
||||
|
||||
@@ -1,23 +1,26 @@
|
||||
#include "MESA_handle_logger.h"
|
||||
#include "zlog.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include<sys/stat.h>
|
||||
#include <time.h>
|
||||
|
||||
#define LOGMSG_MAX_LEN 4096
|
||||
#define FLUSH_LOG_NUM 4096
|
||||
typedef struct log_handle_t
|
||||
#define MAX_HANDLE_LOG_PATH 4096
|
||||
static int g_zlog_inited = 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] = "";
|
||||
|
||||
struct log_handle_t
|
||||
{
|
||||
int runtime_log_level;
|
||||
int flush_log_count;
|
||||
FILE *fp;
|
||||
char runtime_log_file[1200];
|
||||
char cur_log_file[LOGMSG_MAX_LEN];
|
||||
} log_handle_t;
|
||||
zlog_category_t *zc;
|
||||
const char *global_conf_path;
|
||||
char runtime_log_file[MAX_HANDLE_LOG_PATH];
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -45,12 +48,6 @@ 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)
|
||||
@@ -93,149 +90,259 @@ 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;
|
||||
|
||||
int rc = -1;
|
||||
zlog_category_t *zc = NULL;
|
||||
FILE *fp = NULL;
|
||||
log_handle_t *p_handle = NULL;
|
||||
struct log_handle_t *handle = NULL;
|
||||
|
||||
//creating file_path failed, return NULL
|
||||
char *p_path = rindex(file_path, '/');
|
||||
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;
|
||||
char handle_name[MAX_HANDLE_LOG_PATH];
|
||||
char *p_path_end = rindex(file_path, '/');
|
||||
char *p_name;
|
||||
|
||||
//fclose(fp);
|
||||
//remove(file_path);
|
||||
p_handle = (log_handle_t *)calloc(sizeof(log_handle_t), 1);
|
||||
strcpy(handle_name, file_path);
|
||||
escape_for_zlog(handle_name, strlen(handle_name));
|
||||
p_name = handle_name;
|
||||
|
||||
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->fp = fp;
|
||||
return (void *)p_handle;
|
||||
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);
|
||||
}
|
||||
handle = (struct log_handle_t *)calloc(sizeof(struct log_handle_t), 1);
|
||||
strncpy(handle->runtime_log_file, file_path, sizeof(handle->runtime_log_file) - 1);
|
||||
handle->runtime_log_level = level;
|
||||
handle->zc = zc;
|
||||
return (void *)handle;
|
||||
}
|
||||
|
||||
void MESA_destroy_runtime_log_handle(void *handle)
|
||||
{
|
||||
if(handle != NULL)
|
||||
{
|
||||
log_handle_t *p_handle = (log_handle_t *)handle;
|
||||
if (p_handle->fp != NULL)
|
||||
{
|
||||
fclose(p_handle->fp);
|
||||
p_handle->fp = NULL;
|
||||
}
|
||||
free(handle);
|
||||
free(handle);
|
||||
handle = NULL;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void MESA_handle_runtime_log(void *handle, int level, const char *module, const char *fmt, ...)
|
||||
|
||||
int MESA_handle_runtime_log_level_enabled(void *v_handle, const int level)
|
||||
{
|
||||
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;
|
||||
struct log_handle_t *handle = (struct log_handle_t *)v_handle;
|
||||
if(handle == NULL || handle->runtime_log_file == NULL)return;
|
||||
if(handle->zc == NULL) return;
|
||||
return zlog_level_enabled(handle->zc, level);
|
||||
}
|
||||
|
||||
if(p_handle == NULL || p_handle->runtime_log_file == NULL)return;
|
||||
void MESA_handle_runtime_log(void *v_handle, int level, const char *module, const char *fmt, ...)
|
||||
{
|
||||
struct log_handle_t *handle = (struct log_handle_t *)v_handle;
|
||||
if(handle == NULL || handle->runtime_log_file == NULL)return;
|
||||
|
||||
if(level < p_handle->runtime_log_level) return;
|
||||
if(handle->zc == NULL)return;
|
||||
|
||||
time(&t);
|
||||
if(NULL == (localtime_r(&t, &local_time))) return;
|
||||
len = snprintf(buf, sizeof(buf), "%s %s %d %02d:%02d:%02d %d", 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);
|
||||
//len = strlen(buf);
|
||||
|
||||
switch(level)
|
||||
if (zlog_level_enabled(handle->zc, level))
|
||||
{
|
||||
case RLOG_LV_DEBUG:
|
||||
len += snprintf(buf + len,
|
||||
LOGMSG_MAX_LEN - len, ", %s, ", "DEBUG");
|
||||
break;
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
vzlog(handle->zc, handle->runtime_log_file, strlen(handle->runtime_log_file), module, strlen(module), __LINE__, level, fmt, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
return ;
|
||||
}
|
||||
|
||||
case RLOG_LV_INFO:
|
||||
len += snprintf(buf + len,
|
||||
LOGMSG_MAX_LEN - len, ", %s, ", "INFO");
|
||||
break;
|
||||
|
||||
case RLOG_LV_FATAL:
|
||||
len += snprintf(buf + len,
|
||||
LOGMSG_MAX_LEN - len, ", %s, ", "FATAL");
|
||||
break;
|
||||
|
||||
default:
|
||||
len += snprintf(buf + len,
|
||||
LOGMSG_MAX_LEN - len, ", %s, ", "UNKNOWN");
|
||||
break;
|
||||
int MESA_handle_runtime_log_creation(const char *conf_path)
|
||||
{
|
||||
char *env = getenv("ZLOG_CONF_PATH");
|
||||
int rc = 0;
|
||||
|
||||
if(g_zlog_inited == 1)
|
||||
{
|
||||
rc = zlog_reload(conf_path);
|
||||
zlog_profile();
|
||||
return rc;
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
OPEN_LOG_FILE:
|
||||
if(p_handle->fp == NULL)
|
||||
if (conf_path == NULL || (access(conf_path, R_OK) != 0))
|
||||
{
|
||||
if(NULL == (fp = fopen(tmp_log_file_name, "a"))) return;
|
||||
p_handle->fp = fp;
|
||||
p_handle->flush_log_count = 0;
|
||||
memcpy(p_handle->cur_log_file, tmp_log_file_name, strlen(tmp_log_file_name));
|
||||
}
|
||||
|
||||
if (0 != memcmp(tmp_log_file_name, p_handle->cur_log_file, strlen(tmp_log_file_name)))
|
||||
{
|
||||
fclose(p_handle->fp);
|
||||
p_handle->fp = NULL;
|
||||
goto OPEN_LOG_FILE;
|
||||
}
|
||||
|
||||
if (0 > fprintf(p_handle->fp, "%s", buf))
|
||||
{
|
||||
fclose(p_handle->fp);
|
||||
p_handle->fp = NULL;
|
||||
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);
|
||||
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
|
||||
{
|
||||
p_handle->flush_log_count+=1;
|
||||
if (p_handle->flush_log_count >= FLUSH_LOG_NUM)
|
||||
rc = zlog_init(conf_path);
|
||||
if (rc)
|
||||
{
|
||||
fflush(p_handle->fp);
|
||||
p_handle->flush_log_count = 0;
|
||||
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);
|
||||
g_zlog_inited = 1;
|
||||
zlog_profile();
|
||||
|
||||
return;
|
||||
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);
|
||||
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
|
||||
return rc;
|
||||
}
|
||||
|
||||
void MESA_handle_runtime_log_destruction()
|
||||
{
|
||||
zlog_fini();
|
||||
if (g_zlog_conf_fp != -1)
|
||||
{
|
||||
unlink(tmp_conf_filepath);
|
||||
close(g_zlog_conf_fp);
|
||||
}
|
||||
g_zlog_inited=0;
|
||||
}
|
||||
|
||||
4
src/version.map
Normal file
4
src/version.map
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
global: MESA*runtime_log*;GIT_VERSION_*;
|
||||
local: *;
|
||||
};
|
||||
28
zlog/CMakeLists.txt
Normal file
28
zlog/CMakeLists.txt
Normal file
@@ -0,0 +1,28 @@
|
||||
cmake_minimum_required (VERSION 3.5)
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
ExternalProject_Add(zlog PREFIX zlog
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.16.tar.gz
|
||||
URL_MD5 4dcfe75a1acbb5c4513bbe168f935993
|
||||
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)
|
||||
BIN
zlog/zlog-1.2.16.tar.gz
Normal file
BIN
zlog/zlog-1.2.16.tar.gz
Normal file
Binary file not shown.
Reference in New Issue
Block a user