diff --git a/ci/travis.sh b/ci/travis.sh index 8e93bfc..0a961f1 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -35,7 +35,7 @@ env | sort # Install dependency from YUM yum install -y mrzcpd numactl-devel zlib-devel librdkafka-devel systemd-devel yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libMESA_handle_logger-devel -yum install -y libMESA_htable-devel libMESA_prof_load-devel librulescan-devel libwiredcfg-devel libWiredLB-devel sapp-devel +yum install -y libMESA_htable-devel libMESA_prof_load-devel librulescan-devel libwiredcfg-devel libWiredLB-devel sapp-devel libbreakpad_mini-devel yum install -y libasan if [ $ASAN_OPTION ];then diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 48a4ecb..f625bad 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(tfe pthread dl MESA_htable wiredcfg MESA_field_stat gperftools-static - breakpad-client-static + breakpad_mini ${SYSTEMD_LIBRARIES}) if(ENABLE_PLUGIN_HTTP) diff --git a/platform/src/proxy.cpp b/platform/src/proxy.cpp index 9f2d018..528d5ea 100644 --- a/platform/src/proxy.cpp +++ b/platform/src/proxy.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -48,8 +49,7 @@ #include /* Breakpad */ -#include -#include +#include /* Systemd */ #include @@ -496,233 +496,6 @@ void tfe_proxy_acceptor_init(struct tfe_proxy * proxy, const char * profile) return; } -struct breakpad_instance -{ - unsigned int en_breakpad; - char minidump_dir_prefix[TFE_STRING_MAX]; - google_breakpad::ExceptionHandler * exceptionHandler; - - /* Upload to crash server */ - unsigned int en_breakpad_upload; - char minidump_sentry_upload_url[TFE_STRING_MAX]; - - /* Upload tools name */ - char upload_tools_filename[TFE_STRING_MAX]; - - /* Upload tools exec command */ - char * upload_tools_exec_argv[64]; - char * minidump_filename; -}; - -static bool tfe_breakpad_dump_to_file(const google_breakpad::MinidumpDescriptor& descriptor, - void* context, bool succeeded) -{ - fprintf(stderr, "Crash happened, minidump path: %s\n", descriptor.path()); - return succeeded; -} - -static bool tfe_breakpad_dump_and_report(const google_breakpad::MinidumpDescriptor& descriptor, - void* context, bool succeeded) -{ - struct breakpad_instance * instance = g_default_proxy->breakpad; - int ret = 0; - - strncpy(instance->minidump_filename, descriptor.path(), PATH_MAX - 1); - fprintf(stderr, "Crash happened, prepare upload the minidump file: %s\n", descriptor.path()); - - ret = access(instance->minidump_filename, F_OK | R_OK); - if (ret < 0) - { - fprintf(stderr, "minidump file is not existed, cannot upload minidump file"); - return succeeded; - } - - /* Firstly, fork an child process */ - pid_t exec_child_pid = fork(); - if (exec_child_pid == 0) - { - /* As a child, exec minidump upload tools */ - ret = execv(instance->upload_tools_filename, instance->upload_tools_exec_argv); - if (ret < 0) - { - fprintf(stderr, "Failed at exec the upload program %s: %s\n", - instance->upload_tools_filename, strerror(errno)); - /* after log, reset errno */ - errno = 0; - } - - exit(EXIT_FAILURE); - } - else if (exec_child_pid > 0) - { - fprintf(stderr, "Starting upload minidump, PID = %d. \n", exec_child_pid); - return succeeded; - } - else - { - /* failed at fork, cannot upload the minidump */ - fprintf(stderr, "Failed at fork(), cannot upload minidump file. : %s\n", strerror(errno)); - /* after log, reset errno */ - errno = 0; - return succeeded; - } -} - -/* COREDUMP GENERATE TEST */ -static void segv_generate() -{ - volatile char * _NULLPTR = nullptr; - (*_NULLPTR) = 0; -} - -static void _mkdir(const char *dir) -{ - char tmp[PATH_MAX]; - char * p = NULL; - size_t len; - - snprintf(tmp, sizeof(tmp), "%s", dir); - len = strlen(tmp); - if (tmp[len - 1] == '/') - tmp[len - 1] = 0; - for (p = tmp + 1; *p; p++) - { - if (*p == '/') - { - *p = 0; - mkdir(tmp, S_IRWXU); - *p = '/'; - } - } - mkdir(tmp, S_IRWXU); -} - -int breakpad_init_minidump_upload(struct breakpad_instance * instance, const char * profile) -{ - int ret = 0; - char execpath[PATH_MAX] = {}; - char * execdirname = NULL; - - ret = MESA_load_profile_string_nodef(profile, "system", "breakpad_upload_url", - instance->minidump_sentry_upload_url, sizeof(instance->minidump_sentry_upload_url)); - - if (unlikely(ret < 0)) - { - TFE_LOG_ERROR(g_default_logger, "breakpad_upload_url is necessary, failed. "); - goto errout; - } - - ret = readlink("/proc/self/exe", execpath, sizeof(execpath)); - if(unlikely(ret < 0)) - { - TFE_LOG_ERROR(g_default_logger, "Failed at readlink /proc/self/exec: %s", strerror(errno)); - /* after log, reset errno */ - errno = 0; - goto errout; - } - - execdirname = dirname(execpath); - snprintf(instance->upload_tools_filename, sizeof(instance->upload_tools_filename) - 1, - "%s/%s", execdirname, "minidump_upload"); - - - /* Execfile */ - instance->upload_tools_exec_argv[0] = tfe_strdup(instance->upload_tools_filename); - - /* Firstly, Product Name and Product Version */ - instance->upload_tools_exec_argv[1] = tfe_strdup("-p"); - instance->upload_tools_exec_argv[2] = tfe_strdup("tfe"); - instance->upload_tools_exec_argv[3] = tfe_strdup("-v"); - instance->upload_tools_exec_argv[4] = tfe_strdup(tfe_version()); - - /* Minidump file location, now we don't know it */ - instance->minidump_filename = (char *)ALLOC(char, PATH_MAX); - instance->upload_tools_exec_argv[5] = instance->minidump_filename; - - /* Minidup upload url */ - instance->upload_tools_exec_argv[6] = tfe_strdup(instance->minidump_sentry_upload_url); - instance->upload_tools_exec_argv[7] = NULL; - return 0; - -errout: - return -1; -} - -struct breakpad_instance * breakpad_init(const char * profile) -{ - struct breakpad_instance * instance = ALLOC(struct breakpad_instance, 1); - assert(instance != nullptr); - - int ret = 0; - unsigned int disable_coredump; - MESA_load_profile_uint_def(profile, "system", "disable_coredump", &disable_coredump, 0); - if (disable_coredump > 0) - { - const struct rlimit __rlimit_vars = {.rlim_cur = 0, .rlim_max = 0}; - ret = setrlimit(RLIMIT_CORE, &__rlimit_vars); - if (ret < 0) - { - TFE_LOG_ERROR(g_default_logger, "setrlimit(RLIMIT_CORE, 0) failed: %s", strerror(errno)); - /* after log, reset errno */ - errno = 0; - } - } - - MESA_load_profile_uint_def(profile, "system", "enable_breakpad", &instance->en_breakpad, 1); - if (instance->en_breakpad <= 0) - { - TFE_LOG_ERROR(g_default_logger, "Breakpad Crash Reporting System is disabled. "); - return instance; - } - - MESA_load_profile_string_def(profile, "system", "breakpad_minidump_dir", - instance->minidump_dir_prefix, sizeof(instance->minidump_dir_prefix), "/tmp/crashreport"); - - MESA_load_profile_uint_def(profile, "system", "enable_breakpad_upload", - &instance->en_breakpad_upload, 0); - - /* Create the minidump dir if it is not existed */ - _mkdir(instance->minidump_dir_prefix); - - if (instance->en_breakpad_upload) - { - /* Try to init the breakpad upload */ - ret = breakpad_init_minidump_upload(instance, profile); - if (ret < 0) - { - TFE_LOG_ERROR(g_default_logger, "Breakpad upload init failed, using local breakpad dumpfile"); - instance->en_breakpad_upload = 0; - } - - /* When we use breakpad, do not generate any coredump file */ - const struct rlimit __rlimit_vars = {.rlim_cur = 0, .rlim_max = 0}; - ret = setrlimit(RLIMIT_CORE, &__rlimit_vars); - if (ret < 0) - { - TFE_LOG_ERROR(g_default_logger, "setrlimit(RLIMIT_CORE, 0) failed: %s", strerror(errno)); - /* after log, reset errno */ - errno = 0; - } - } - - if (instance->en_breakpad_upload) - { - instance->exceptionHandler = new google_breakpad::ExceptionHandler( - google_breakpad::MinidumpDescriptor(instance->minidump_dir_prefix), NULL, - tfe_breakpad_dump_and_report, NULL, true, -1); - } - else - { - instance->exceptionHandler = new google_breakpad::ExceptionHandler( - google_breakpad::MinidumpDescriptor(instance->minidump_dir_prefix), NULL, - tfe_breakpad_dump_to_file, NULL, true, -1); - } - - TFE_LOG_INFO(g_default_logger, "Breakpad Crash Report is enable. "); - TFE_LOG_INFO(g_default_logger, "Minidump Dir: %s", instance->minidump_dir_prefix); - return instance; -} - int main(int argc, char * argv[]) { const char * main_profile = "./conf/tfe/tfe.conf"; @@ -774,13 +547,13 @@ int main(int argc, char * argv[]) assert(g_default_proxy); strcpy(g_default_proxy->name, "tfe3a"); - g_default_proxy->breakpad = breakpad_init(main_profile); - CHECK_OR_EXIT(g_default_proxy->breakpad, "Failed at starting breakpad. Exit."); + g_default_proxy->breakpad = breakpad_init(main_profile, "system", g_default_logger, tfe_version()); + CHECK_OR_EXIT(g_default_proxy->breakpad, "Failed at starting breakpad. Exit."); if (to_generate_a_segv) { - segv_generate(); - } + breakpad_segv_generate(); + } future_promise_library_init(future_profile); tango_cache_global_init(); diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 9afbb55..4923d2b 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -177,6 +177,10 @@ add_library(mrzcpd SHARED IMPORTED GLOBAL) set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so) set_property(TARGET mrzcpd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MRZCPD_INCLUDE_DIR}) +add_library(breakpad_mini SHARED IMPORTED GLOBAL) +set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so) +set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) + ### cJSON ExternalProject_Add(cJSON PREFIX cJSON URL ${CMAKE_CURRENT_SOURCE_DIR}/cJSON-1.7.7.tar.gz @@ -346,28 +350,4 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(gperftools-static STATIC IMPORTED GLOBAL) add_dependencies(gperftools-static gperftools) set_property(TARGET gperftools-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libtcmalloc.a) -set_property(TARGET gperftools-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) - -### Google Breakpad Binary -### Caution: This package is a pre-compiled binary package, only used in x86_64 servers. -ExternalProject_Add(breakpad - PREFIX breakpad - URL ${CMAKE_CURRENT_SOURCE_DIR}/breakpad-master-abfe08e.tar.gz - URL_MD5 96fb25a9d96cc55db71a7f374ad363b4 - CONFIGURE_COMMAND ./configure --prefix= - BUILD_IN_SOURCE 1) - -ExternalProject_Get_Property(breakpad INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include/breakpad) - -add_library(breakpad-client-static STATIC IMPORTED GLOBAL) -add_dependencies(breakpad-client-static breakpad) -set_property(TARGET breakpad-client-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libbreakpad_client.a) -set_property(TARGET breakpad-client-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include/breakpad) -target_link_libraries(breakpad-client-static INTERFACE pthread) - -# install the minidump tools to target binary dir -install(PROGRAMS ${INSTALL_DIR}/bin/minidump-2-core DESTINATION bin COMPONENT Program) -install(PROGRAMS ${INSTALL_DIR}/bin/minidump_dump DESTINATION bin COMPONENT Program) -install(PROGRAMS ${INSTALL_DIR}/bin/minidump_stackwalk DESTINATION bin COMPONENT Program) -install(PROGRAMS ${INSTALL_DIR}/bin/minidump_upload DESTINATION bin COMPONENT Program) +set_property(TARGET gperftools-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) \ No newline at end of file