external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Asan: Refine asan warning message for macOS.

Browse source
This commit is contained in:
winlin 2022-12-31 19:27:21 +08:00
parent 7750bdae10
commit 7bdb7270cf
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/auto/auto_headers.sh
View file

@ -149,6 +149,11 @@ if [[ $SRS_GPERF_CP == YES ]]; then
else else
srs_undefine_macro "SRS_GPERF_CP" $SRS_AUTO_HEADERS_H srs_undefine_macro "SRS_GPERF_CP" $SRS_AUTO_HEADERS_H
fi fi
if [ $SRS_SANITIZER == YES ]; then
srs_define_macro "SRS_SANITIZER" $SRS_AUTO_HEADERS_H
else
srs_undefine_macro "SRS_SANITIZER" $SRS_AUTO_HEADERS_H
fi
if [ $SRS_SANITIZER_LOG == YES ]; then if [ $SRS_SANITIZER_LOG == YES ]; then
srs_define_macro "SRS_SANITIZER_LOG" $SRS_AUTO_HEADERS_H srs_define_macro "SRS_SANITIZER_LOG" $SRS_AUTO_HEADERS_H
else else

2
trunk/configure vendored
View file

@ -586,6 +586,7 @@ ffmpeg:
END END
# Generate Makefile entry for srs-server.
cat << END >> ${SRS_MAKEFILE} cat << END >> ${SRS_MAKEFILE}
server: _prepare_dir server: _prepare_dir
@echo "Build the SRS server, JOBS=\${JOBS}, FORCE_MAKE_JOBS=${SRS_FORCE_MAKE_JOBS}" @echo "Build the SRS server, JOBS=\${JOBS}, FORCE_MAKE_JOBS=${SRS_FORCE_MAKE_JOBS}"
@ -593,6 +594,7 @@ server: _prepare_dir
@bash objs/_srs_build_summary.sh @bash objs/_srs_build_summary.sh
END END
# generate all modules entry # generate all modules entry
for SRS_MODULE in ${SRS_MODULES[*]}; do for SRS_MODULE in ${SRS_MODULES[*]}; do
. $SRS_WORKDIR/auto/reset_module.sh && . $SRS_MODULE/config . $SRS_WORKDIR/auto/reset_module.sh && . $SRS_MODULE/config

7
trunk/src/main/srs_main_server.cpp
View file

@ -96,6 +96,13 @@ srs_error_t do_main(int argc, char** argv, char** envp)
// TODO: Might fail if change working directory. // TODO: Might fail if change working directory.
_srs_binary = argv[0]; _srs_binary = argv[0];
// For sanitizer on macOS, to avoid the warning on startup.
#if defined(SRS_OSX) && defined(SRS_SANITIZER)
if (!getenv("MallocNanoZone")) {
fprintf(stderr, "Asan: Please setup the env MallocNanoZone=0 to disable the warning, see https://stackoverflow.com/a/70209891/17679565\n");
}
#endif
// Initialize global and thread-local variables. // Initialize global and thread-local variables.
if ((err = srs_global_initialize()) != srs_success) { if ((err = srs_global_initialize()) != srs_success) {
return srs_error_wrap(err, "global init"); return srs_error_wrap(err, "global init");