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

fix the global static instance error, use function to get server

Browse source
This commit is contained in:
winlin 2013-11-20 10:08:52 +08:00
parent c79372417d
commit d1e20dc866
4 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/core/srs_core_server.cpp
View file

@ -171,6 +171,7 @@ SrsServer::SrsServer()
{
signal_reload = false;
srs_assert(config);
config->subscribe(this);
}
@ -328,5 +329,8 @@ int SrsServer::on_reload_listen()
return listen();
}
SrsServer server;
SrsServer* _server()
{
static SrsServer server;
return &server;
}

2
trunk/src/core/srs_core_server.hpp
View file

@ -89,6 +89,6 @@ public:
virtual int on_reload_listen();
};
extern SrsServer server;
SrsServer* _server();
#endif

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

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
void handler(int signo)
{
srs_trace("get a signal, signo=%d", signo);
server.on_signal(signo);
_server()->on_signal(signo);
}
int main(int argc, char** argv){
@ -44,15 +44,15 @@ int main(int argc, char** argv){
return ret;
}
if ((ret = server.initialize()) != ERROR_SUCCESS) {
if ((ret = _server()->initialize()) != ERROR_SUCCESS) {
return ret;
}
if ((ret = server.listen()) != ERROR_SUCCESS) {
if ((ret = _server()->listen()) != ERROR_SUCCESS) {
return ret;
}
if ((ret = server.cycle()) != ERROR_SUCCESS) {
if ((ret = _server()->cycle()) != ERROR_SUCCESS) {
return ret;
}