From e5461d2df96943775549db1567287ef884c3477f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 28 May 2015 07:03:38 +0800
Subject: [PATCH] refine code

---
 trunk/src/app/srs_app_log.cpp          | 7 +++++--
 trunk/src/app/srs_app_log.hpp          | 2 +-
 trunk/src/app/srs_app_server.cpp       | 2 +-
 trunk/src/app/srs_app_st.cpp           | 2 +-
 trunk/src/app/srs_app_st.hpp           | 2 +-
 trunk/src/kernel/srs_kernel_log.cpp    | 3 ++-
 trunk/src/kernel/srs_kernel_log.hpp    | 2 +-
 trunk/src/main/srs_main_ingest_hls.cpp | 2 +-
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/trunk/src/app/srs_app_log.cpp b/trunk/src/app/srs_app_log.cpp
index b6a43bac3..ba8cc0bf1 100644
--- a/trunk/src/app/srs_app_log.cpp
+++ b/trunk/src/app/srs_app_log.cpp
@@ -43,10 +43,13 @@ SrsThreadContext::~SrsThreadContext()
 {
 }
 
-void SrsThreadContext::generate_id()
+int SrsThreadContext::generate_id()
 {
     static int id = 100;
-    cache[st_thread_self()] = id++;
+    
+    int gid = id++;
+    cache[st_thread_self()] = gid;
+    return gid;
 }
 
 int SrsThreadContext::get_id()
diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp
index 9645079fa..c997df3e8 100644
--- a/trunk/src/app/srs_app_log.hpp
+++ b/trunk/src/app/srs_app_log.hpp
@@ -51,7 +51,7 @@ public:
     SrsThreadContext();
     virtual ~SrsThreadContext();
 public:
-    virtual void generate_id();
+    virtual int generate_id();
     virtual int get_id();
 };
 
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
index d4b519831..a954a8a1f 100644
--- a/trunk/src/app/srs_app_server.cpp
+++ b/trunk/src/app/srs_app_server.cpp
@@ -607,7 +607,7 @@ int SrsServer::initialize_st()
     int ret = ERROR_SUCCESS;
     
     // init st
-    if ((ret = srs_init_st()) != ERROR_SUCCESS) {
+    if ((ret = srs_st_init()) != ERROR_SUCCESS) {
         srs_error("init st failed. ret=%d", ret);
         return ret;
     }
diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp
index bf73a4bb2..453560795 100644
--- a/trunk/src/app/srs_app_st.cpp
+++ b/trunk/src/app/srs_app_st.cpp
@@ -42,7 +42,7 @@ bool srs_st_epoll_is_supported(void)
 }
 #endif
 
-int srs_init_st()
+int srs_st_init()
 {
     int ret = ERROR_SUCCESS;
     
diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp
index 545547058..37581e737 100644
--- a/trunk/src/app/srs_app_st.hpp
+++ b/trunk/src/app/srs_app_st.hpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <st.h>
 
 // initialize st, requires epoll.
-extern int srs_init_st();
+extern int srs_st_init();
 
 // close the netfd, and close the underlayer fd.
 extern void srs_close_stfd(st_netfd_t& stfd);
diff --git a/trunk/src/kernel/srs_kernel_log.cpp b/trunk/src/kernel/srs_kernel_log.cpp
index 78cf3fad0..8c6f872c8 100644
--- a/trunk/src/kernel/srs_kernel_log.cpp
+++ b/trunk/src/kernel/srs_kernel_log.cpp
@@ -66,8 +66,9 @@ ISrsThreadContext::~ISrsThreadContext()
 {
 }
 
-void ISrsThreadContext::generate_id()
+int ISrsThreadContext::generate_id()
 {
+    return 0;
 }
 
 int ISrsThreadContext::get_id()
diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp
index 93f6b1d2b..966e39fbe 100644
--- a/trunk/src/kernel/srs_kernel_log.hpp
+++ b/trunk/src/kernel/srs_kernel_log.hpp
@@ -102,7 +102,7 @@ public:
     ISrsThreadContext();
     virtual ~ISrsThreadContext();
 public:
-    virtual void generate_id();
+    virtual int generate_id();
     virtual int get_id();
 };
 
diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
index c2902f019..f9a4397f2 100644
--- a/trunk/src/main/srs_main_ingest_hls.cpp
+++ b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -1378,7 +1378,7 @@ int proxy_hls2rtmp(string hls, string rtmp)
     int ret = ERROR_SUCCESS;
     
     // init st.
-    if ((ret = srs_init_st()) != ERROR_SUCCESS) {
+    if ((ret = srs_st_init()) != ERROR_SUCCESS) {
         srs_error("init st failed. ret=%d", ret);
         return ret;
     }