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

add comments for main

Browse source
This commit is contained in:
winlin 2014-04-12 20:37:16 +08:00
parent b38df9cd1a
commit 0a016e58bf
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_server.cpp
View file

@ -205,7 +205,7 @@ int SrsServer::initialize()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// for the main objects(server, config, log), // for the main objects(server, config, log, context),
// never subscribe handler in constructor, // never subscribe handler in constructor,
// instead, subscribe handler in initialize method. // instead, subscribe handler in initialize method.
srs_assert(_srs_config); srs_assert(_srs_config);

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

@ -42,6 +42,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_log.hpp> #include <srs_app_log.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
// pre-declare
int run();
int run_master();
// for the main objects(server, config, log, context),
// never subscribe handler in constructor,
// instead, subscribe handler in initialize method.
// kernel module. // kernel module.
ISrsLog* _srs_log = new SrsFastLog(); ISrsLog* _srs_log = new SrsFastLog();
ISrsThreadContext* _srs_context = new SrsThreadContext(); ISrsThreadContext* _srs_context = new SrsThreadContext();
@ -49,15 +56,14 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = new SrsConfig();
SrsServer* _srs_server = new SrsServer(); SrsServer* _srs_server = new SrsServer();
// signal handler
void handler(int signo) void handler(int signo)
{ {
srs_trace("get a signal, signo=%d", signo); srs_trace("get a signal, signo=%d", signo);
_srs_server->on_signal(signo); _srs_server->on_signal(signo);
} }
int run(); // main entrance.
int run_master();
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;