From 4cf6da107ced252be1ff7b7b769b697a170fab0a Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 8 May 2021 11:29:19 +0800
Subject: [PATCH] Refine init of global objects

---
 trunk/src/app/srs_app_threads.cpp  | 9 +++++++++
 trunk/src/main/srs_main_server.cpp | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp
index 014e7ecad..898b711ef 100644
--- a/trunk/src/app/srs_app_threads.cpp
+++ b/trunk/src/app/srs_app_threads.cpp
@@ -37,6 +37,10 @@
 #include <string>
 using namespace std;
 
+extern ISrsLog* _srs_log;
+extern ISrsContext* _srs_context;
+extern SrsConfig* _srs_config;
+
 extern SrsStageManager* _srs_stages;
 extern SrsRtcBlackhole* _srs_blackhole;
 extern SrsResourceManager* _srs_rtc_manager;
@@ -275,6 +279,11 @@ srs_error_t srs_thread_initialize()
 {
     srs_error_t err = srs_success;
 
+    // Root global objects.
+    _srs_log = new SrsFileLog();
+    _srs_context = new SrsThreadContext();
+    _srs_config = new SrsConfig();
+
     // The clock wall object.
     _srs_clock = new SrsWallClock();
 
diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
index e719a3684..b9efd927f 100644
--- a/trunk/src/main/srs_main_server.cpp
+++ b/trunk/src/main/srs_main_server.cpp
@@ -70,10 +70,10 @@ srs_error_t run_hybrid_server();
 void show_macro_features();
 
 // @global log and context.
-ISrsLog* _srs_log = new SrsFileLog();
-ISrsContext* _srs_context = new SrsThreadContext();
+ISrsLog* _srs_log = NULL;
+ISrsContext* _srs_context = NULL;
 // @global config object for app module.
-SrsConfig* _srs_config = new SrsConfig();
+SrsConfig* _srs_config = NULL;
 
 // @global version of srs, which can grep keyword "XCORE"
 extern const char* _srs_version;