external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine messages

Browse source
This commit is contained in:
winlin 2016-12-08 17:55:11 +08:00
parent dd1c769f65
commit 9e9cad1826
1 changed files with 66 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ using namespace std;
int run(SrsServer* svr);
int run_master(SrsServer* svr);
void show_macro_features();
string srs_getenv(const char* name);
// @global log and context.
ISrsLog* _srs_log = new SrsFastLog();
@ -64,7 +65,7 @@ extern const char* _srs_version;
/**
* main entrance.
*/
*/
int main(int argc, char** argv)
{
int ret = ERROR_SUCCESS;
@ -83,15 +84,15 @@ int main(int argc, char** argv)
// directly compile error when these two macro defines.
#if defined(SRS_AUTO_GPERF_MC) && defined(SRS_AUTO_GPERF_MP)
#error ("option --with-gmc confict with --with-gmp, "
"@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\n"
"Note that since the heap-checker uses the heap-profiling framework internally, "
"it is not possible to run both the heap-checker and heap profiler at the same time");
#error ("option --with-gmc confict with --with-gmp, "
"@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\n"
"Note that since the heap-checker uses the heap-profiling framework internally, "
"it is not possible to run both the heap-checker and heap profiler at the same time");
#endif
// never use gmp to check memory leak.
#ifdef SRS_AUTO_GPERF_MP
#warning "gmp is not used for memory leak, please use gmc instead."
#warning "gmp is not used for memory leak, please use gmc instead."
#endif
// never use srs log(srs_trace, srs_error, etc) before config parse the option,
@ -127,23 +128,45 @@ int main(int argc, char** argv)
#endif
srs_trace("cwd=%s, work_dir=%s", _srs_config->cwd().c_str(), cwd.c_str());
// for memory check or detect.
if (true) {
stringstream ss;
#ifdef SRS_PERF_GLIBC_MEMORY_CHECK
// ensure glibc write error to stderr.
setenv("LIBC_FATAL_STDERR_", "1", 1);
// ensure glibc to do alloc check.
setenv("MALLOC_CHECK_", "1", 1);
srs_trace("env MALLOC_CHECK_=1 LIBC_FATAL_STDERR_=1");
// ensure glibc write error to stderr.
string lfsov = srs_getenv("LIBC_FATAL_STDERR_");
setenv("LIBC_FATAL_STDERR_", "1", 1);
string lfsnv = srs_getenv("LIBC_FATAL_STDERR_");
//
// ensure glibc to do alloc check.
string mcov = srs_getenv("MALLOC_CHECK_");
setenv("MALLOC_CHECK_", "1", 1);
string mcnv = srs_getenv("MALLOC_CHECK_");
ss << "glic mem-check env MALLOC_CHECK_ " << mcov << "=>" << mcnv << ", LIBC_FATAL_STDERR_ " << lfsov << "=>" << lfsnv << ".";
#endif
#ifdef SRS_AUTO_GPERF_MC
string hcov = srs_getenv("HEAPCHECK");
if (hcov.empty()) {
string cpath = _srs_config->config();
srs_warn("gmc HEAPCHECK is required, for example: env HEAPCHECK=normal ./objs/srs -c %s", cpath.c_str());
} else {
ss << "gmc env HEAPCHECK=" << hcov << ".";
}
#endif
#ifdef SRS_AUTO_GPERF_MD
char* TCMALLOC_PAGE_FENCE = getenv("TCMALLOC_PAGE_FENCE");
if (!TCMALLOC_PAGE_FENCE || strcmp(TCMALLOC_PAGE_FENCE, "1")) {
srs_trace("gmd enabled without env TCMALLOC_PAGE_FENCE=1");
} else {
srs_trace("env TCMALLOC_PAGE_FENCE=1");
}
char* TCMALLOC_PAGE_FENCE = getenv("TCMALLOC_PAGE_FENCE");
if (!TCMALLOC_PAGE_FENCE || strcmp(TCMALLOC_PAGE_FENCE, "1")) {
srs_warn("gmd enabled without env TCMALLOC_PAGE_FENCE=1");
} else {
ss << "gmd env TCMALLOC_PAGE_FENCE=" << TCMALLOC_PAGE_FENCE << ".";
}
#endif
srs_trace(ss.str().c_str());
}
// we check the config when the log initialized.
if ((ret = _srs_config->check_config()) != ERROR_SUCCESS) {
return ret;
@ -156,10 +179,10 @@ int main(int argc, char** argv)
SrsAutoFree(SrsServer, svr);
/**
* we do nothing in the constructor of server,
* and use initialize to create members, set hooks for instance the reload handler,
* all initialize will done in this stage.
*/
* we do nothing in the constructor of server,
* and use initialize to create members, set hooks for instance the reload handler,
* all initialize will done in this stage.
*/
if ((ret = svr->initialize(NULL)) != ERROR_SUCCESS) {
return ret;
}
@ -330,6 +353,17 @@ void show_macro_features()
#endif
}
string srs_getenv(const char* name)
{
char* cv = ::getenv(name);
if (cv) {
return cv;
}
return "";
}
int run(SrsServer* svr)
{
// if not deamon, directly run master.