fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88

trunk/src/app/srs_app_server.cpp

@@ -533,54 +533,7 @@ int SrsServer::cycle()
 {
     int ret = ERROR_SUCCESS;
 
-    // find the max loop
+    ret = do_cycle();
-    int max = srs_max(0, SRS_SYS_TIME_RESOLUTION_MS_TIMES);
-    max = srs_max(max, SRS_SYS_RUSAGE_RESOLUTION_TIMES);
-    max = srs_max(max, SRS_SYS_CPU_STAT_RESOLUTION_TIMES);
-    max = srs_max(max, SRS_SYS_MEMINFO_RESOLUTION_TIMES);
-    
-    // the deamon thread, update the time cache
-    while (true) {
-        for (int i = 1; i < max + 1; i++) {
-            st_usleep(SRS_SYS_CYCLE_INTERVAL * 1000);
-        
-// for gperf heap checker,
-// @see: research/gperftools/heap-checker/heap_checker.cc
-// if user interrupt the program, exit to check mem leak.
-// but, if gperf, use reload to ensure main return normally,
-// because directly exit will cause core-dump.
-#ifdef SRS_AUTO_GPERF_MC
-            if (signal_gmc_stop) {
-                break;
-            }
-#endif
-        
-            if (signal_reload) {
-                signal_reload = false;
-                srs_info("get signal reload, to reload the config.");
-                
-                if ((ret = _srs_config->reload()) != ERROR_SUCCESS) {
-                    srs_error("reload config failed. ret=%d", ret);
-                    return ret;
-                }
-                srs_trace("reload config success.");
-            }
-            
-            // update the cache time or rusage.
-            if ((i % SRS_SYS_TIME_RESOLUTION_MS_TIMES) == 0) {
-                srs_update_system_time_ms();
-            }
-            if ((i % SRS_SYS_RUSAGE_RESOLUTION_TIMES) == 0) {
-                srs_update_system_rusage();
-            }
-            if ((i % SRS_SYS_CPU_STAT_RESOLUTION_TIMES) == 0) {
-                srs_update_proc_stat();
-            }
-            if ((i % SRS_SYS_MEMINFO_RESOLUTION_TIMES) == 0) {
-                srs_update_meminfo();
-            }
-        }
-    }
 
 #ifdef SRS_AUTO_INGEST
     ingester->stop();
@@ -629,6 +582,62 @@ void SrsServer::on_signal(int signo)
     }
 }
 
+int SrsServer::do_cycle()
+{
+    int ret = ERROR_SUCCESS;
+    
+    // find the max loop
+    int max = srs_max(0, SRS_SYS_TIME_RESOLUTION_MS_TIMES);
+    max = srs_max(max, SRS_SYS_RUSAGE_RESOLUTION_TIMES);
+    max = srs_max(max, SRS_SYS_CPU_STAT_RESOLUTION_TIMES);
+    max = srs_max(max, SRS_SYS_MEMINFO_RESOLUTION_TIMES);
+    
+    // the deamon thread, update the time cache
+    while (true) {
+        for (int i = 1; i < max + 1; i++) {
+            st_usleep(SRS_SYS_CYCLE_INTERVAL * 1000);
+        
+// for gperf heap checker,
+// @see: research/gperftools/heap-checker/heap_checker.cc
+// if user interrupt the program, exit to check mem leak.
+// but, if gperf, use reload to ensure main return normally,
+// because directly exit will cause core-dump.
+#ifdef SRS_AUTO_GPERF_MC
+            if (signal_gmc_stop) {
+                return ret;
+            }
+#endif
+        
+            if (signal_reload) {
+                signal_reload = false;
+                srs_info("get signal reload, to reload the config.");
+                
+                if ((ret = _srs_config->reload()) != ERROR_SUCCESS) {
+                    srs_error("reload config failed. ret=%d", ret);
+                    return ret;
+                }
+                srs_trace("reload config success.");
+            }
+            
+            // update the cache time or rusage.
+            if ((i % SRS_SYS_TIME_RESOLUTION_MS_TIMES) == 0) {
+                srs_update_system_time_ms();
+            }
+            if ((i % SRS_SYS_RUSAGE_RESOLUTION_TIMES) == 0) {
+                srs_update_system_rusage();
+            }
+            if ((i % SRS_SYS_CPU_STAT_RESOLUTION_TIMES) == 0) {
+                srs_update_proc_stat();
+            }
+            if ((i % SRS_SYS_MEMINFO_RESOLUTION_TIMES) == 0) {
+                srs_update_meminfo();
+            }
+        }
+    }
+
+    return ret;
+}
+
 int SrsServer::listen_rtmp()
 {
     int ret = ERROR_SUCCESS;

trunk/src/app/srs_app_server.hpp

@@ -140,6 +140,7 @@ public:
     virtual void remove(SrsConnection* conn);
     virtual void on_signal(int signo);
 private:
+    virtual int do_cycle();
     virtual int listen_rtmp();
     virtual int listen_http_api();
     virtual int listen_http_stream();

trunk/src/core/srs_core.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "87"
+#define VERSION_REVISION "88"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"

trunk/src/rtmp/srs_protocol_rtmp_stack.cpp

@@ -759,7 +759,7 @@ int SrsProtocol::send_and_free_packet(SrsPacket* packet, int stream_id)
     }
     
     // to message
-    SrsMessage* msg = new SrsMessage();
+    SrsMessage* msg = new SrsCommonMessage();
     
     msg->payload = (int8_t*)payload;
     msg->size = (int32_t)size;
@@ -975,7 +975,7 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz
     bool is_first_chunk_of_msg = false;
     if (!chunk->msg) {
         is_first_chunk_of_msg = true;
-        chunk->msg = new SrsMessage();
+        chunk->msg = new SrsCommonMessage();
         srs_verbose("create message for new chunk, fmt=%d, cid=%d", fmt, chunk->cid);
     }
 
@@ -1535,6 +1535,15 @@ SrsMessage::~SrsMessage()
 {
 }
 
+SrsCommonMessage::SrsCommonMessage()
+{
+}
+
+SrsCommonMessage::~SrsCommonMessage()
+{
+    srs_freepa(payload);
+}
+
 SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr()
 {
     payload = NULL;

trunk/src/rtmp/srs_protocol_rtmp_stack.hpp

@@ -325,6 +325,12 @@ public:
 * message is raw data RTMP message, bytes oriented,
 * protcol always recv RTMP message, and can send RTMP message or RTMP packet.
 * the shared-ptr message is a special RTMP message, use ref-count for performance issue.
+* 
+* @remark, never directly new SrsMessage, the constructor is protected,
+* for in the SrsMessage, we never know whether we should free the message,
+* for SrsCommonMessage, we should free the payload,
+* while for SrsSharedPtrMessage, we should use ref-count to free it.
+* so, use these two concrete message, SrsCommonMessage or SrsSharedPtrMessage instread.
 */
 class SrsMessage
 {
@@ -341,11 +347,22 @@ public:
     */
     int32_t size;
     int8_t* payload;
-public:
+protected:
     SrsMessage();
+public:
     virtual ~SrsMessage();
 };
 
+/**
+* the common message used free the payload in common way.
+*/
+class SrsCommonMessage : public SrsMessage
+{
+public:
+    SrsCommonMessage();
+    virtual ~SrsCommonMessage();
+};
+
 /**
 * shared ptr message.
 * for audio/video/data message that need less memory copy.