fix #241, add mw(merged-write) config. 2.0.53

trunk/src/app/srs_app_config.cpp

@@ -45,6 +45,7 @@ using namespace std;
 #include <srs_app_source.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_core_performance.hpp>
 
 using namespace _srs_internal;
 
@@ -829,6 +830,17 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root)
                 }
                 srs_trace("vhost %s reload mr success.", vhost.c_str());
             }
+            // mw, only one per vhost
+            if (!srs_directive_equals(new_vhost->get("mw_latency"), old_vhost->get("mw_latency"))) {
+                for (it = subscribes.begin(); it != subscribes.end(); ++it) {
+                    ISrsReloadHandler* subscribe = *it;
+                    if ((ret = subscribe->on_reload_vhost_mw(vhost)) != ERROR_SUCCESS) {
+                        srs_error("vhost %s notify subscribes mw failed. ret=%d", vhost.c_str(), ret);
+                        return ret;
+                    }
+                }
+                srs_trace("vhost %s reload mw success.", vhost.c_str());
+            }
             // http, only one per vhost.
             if (!srs_directive_equals(new_vhost->get("http"), old_vhost->get("http"))) {
                 for (it = subscribes.begin(); it != subscribes.end(); ++it) {
@@ -1327,7 +1339,7 @@ int SrsConfig::check_config()
                 && n != "time_jitter" 
                 && n != "atc" && n != "atc_auto"
                 && n != "debug_srs_upnode"
-                && n != "mr"
+                && n != "mr" && n != "mw_latency"
             ) {
                 ret = ERROR_SYSTEM_CONFIG_INVALID;
                 srs_error("unsupported vhost directive %s, ret=%d", n.c_str(), ret);
@@ -1951,7 +1963,7 @@ bool SrsConfig::get_gop_cache(string vhost)
     SrsConfDirective* conf = get_vhost(vhost);
 
     if (!conf) {
-        return true;
+        return SRS_PERF_GOP_CACHE;
     }
     
     conf = conf->get("gop_cache");
@@ -1959,7 +1971,7 @@ bool SrsConfig::get_gop_cache(string vhost)
         return false;
     }
     
-    return true;
+    return SRS_PERF_GOP_CACHE;
 }
 
 bool SrsConfig::get_debug_srs_upnode(string vhost)
@@ -2032,12 +2044,12 @@ double SrsConfig::get_queue_length(string vhost)
     SrsConfDirective* conf = get_vhost(vhost);
 
     if (!conf) {
-        return SRS_CONF_DEFAULT_QUEUE_LENGTH;
+        return SRS_PERF_PLAY_QUEUE;
     }
     
     conf = conf->get("queue_length");
     if (!conf || conf->arg0().empty()) {
-        return SRS_CONF_DEFAULT_QUEUE_LENGTH;
+        return SRS_PERF_PLAY_QUEUE;
     }
     
     return ::atoi(conf->arg0().c_str());
@@ -2106,17 +2118,17 @@ bool SrsConfig::get_mr_enabled(string vhost)
     SrsConfDirective* conf = get_vhost(vhost);
 
     if (!conf) {
-        return SRS_CONSTS_RTMP_MR;
+        return SRS_PERF_MR_ENABLED;
     }
 
     conf = conf->get("mr");
     if (!conf) {
-        return SRS_CONSTS_RTMP_MR;
+        return SRS_PERF_MR_ENABLED;
     }
 
     conf = conf->get("enabled");
     if (!conf || conf->arg0() != "on") {
-        return SRS_CONSTS_RTMP_MR;
+        return SRS_PERF_MR_ENABLED;
     }
 
     return true;
@@ -2128,17 +2140,34 @@ int SrsConfig::get_mr_sleep_ms(string vhost)
     SrsConfDirective* conf = get_vhost(vhost);
 
     if (!conf) {
-        return SRS_CONSTS_RTMP_MR_SLEEP;
+        return SRS_PERF_MR_SLEEP;
     }
 
     conf = conf->get("mr");
     if (!conf) {
-        return SRS_CONSTS_RTMP_MR_SLEEP;
+        return SRS_PERF_MR_SLEEP;
     }
 
     conf = conf->get("latency");
     if (!conf || conf->arg0().empty()) {
-        return SRS_CONSTS_RTMP_MR_SLEEP;
+        return SRS_PERF_MR_SLEEP;
+    }
+
+    return ::atoi(conf->arg0().c_str());
+}
+
+int SrsConfig::get_mw_sleep_ms(string vhost)
+{
+
+    SrsConfDirective* conf = get_vhost(vhost);
+
+    if (!conf) {
+        return SRS_PERF_MW_SLEEP;
+    }
+
+    conf = conf->get("mw_latency");
+    if (!conf || conf->arg0().empty()) {
+        return SRS_PERF_MW_SLEEP;
     }
 
     return ::atoi(conf->arg0().c_str());

trunk/src/app/srs_app_config.hpp

@@ -54,8 +54,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SRS_CONF_DEFAULT_DVR_PLAN SRS_CONF_DEFAULT_DVR_PLAN_SESSION
 #define SRS_CONF_DEFAULT_DVR_DURATION 30
 #define SRS_CONF_DEFAULT_TIME_JITTER "full"
-// in seconds, the live queue length.
-#define SRS_CONF_DEFAULT_QUEUE_LENGTH 30
 // in seconds, the paused queue length.
 #define SRS_CONF_DEFAULT_PAUSED_LENGTH 10
 // the interval in seconds for bandwidth check
@@ -541,6 +539,12 @@ public:
     */
     // TODO: FIXME: add utest for mr config.
     virtual int                 get_mr_sleep_ms(std::string vhost);
+    /**
+    * get the mw sleep time in ms for vhost.
+    * @param vhost, the vhost to get the mw sleep time.
+    */
+    // TODO: FIXME: add utest for mw config.
+    virtual int                 get_mw_sleep_ms(std::string vhost);
 private:
     /**
     * get the global chunk size.

trunk/src/app/srs_app_reload.cpp

@@ -145,6 +145,11 @@ int ISrsReloadHandler::on_reload_vhost_mr(string /*vhost*/)
     return ERROR_SUCCESS;
 }
 
+int ISrsReloadHandler::on_reload_vhost_mw(string /*vhost*/)
+{
+    return ERROR_SUCCESS;
+}
+
 int ISrsReloadHandler::on_reload_vhost_transcode(string /*vhost*/)
 {
     return ERROR_SUCCESS;

trunk/src/app/srs_app_reload.hpp

@@ -66,6 +66,7 @@ public:
     virtual int on_reload_vhost_hls(std::string vhost);
     virtual int on_reload_vhost_dvr(std::string vhost);
     virtual int on_reload_vhost_mr(std::string vhost);
+    virtual int on_reload_vhost_mw(std::string vhost);
     virtual int on_reload_vhost_transcode(std::string vhost);
     virtual int on_reload_ingest_removed(std::string vhost, std::string ingest_id);
     virtual int on_reload_ingest_added(std::string vhost, std::string ingest_id);

trunk/src/app/srs_app_rtmp_conn.cpp

@@ -83,6 +83,7 @@ SrsRtmpConn::SrsRtmpConn(SrsServer* srs_server, st_netfd_t client_stfd)
     duration = 0;
     kbps = new SrsKbps();
     kbps->set_io(skt, skt);
+    mw_sleep = SRS_PERF_MW_SLEEP;
     
     _srs_config->subscribe(this);
 }
@@ -209,6 +210,13 @@ int SrsRtmpConn::on_reload_vhost_removed(string vhost)
     return ret;
 }
 
+int SrsRtmpConn::on_reload_vhost_mw(string /*vhost*/)
+{
+    mw_sleep = _srs_config->get_mw_sleep_ms(req->vhost);
+
+    return ERROR_SUCCESS;
+}
+
 int64_t SrsRtmpConn::get_send_bytes_delta()
 {
     return kbps->get_send_bytes_delta();
@@ -361,7 +369,7 @@ int SrsRtmpConn::stream_service_cycle()
     }
     
     bool enabled_cache = _srs_config->get_gop_cache(req->vhost);
-    srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, source_id=%d[%d]", 
+    srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, source_id=%d[%d]",
         req->get_stream_url().c_str(), ip.c_str(), enabled_cache, vhost_is_edge, 
         source->source_id(), source->source_id());
     source->set_cache(enabled_cache);
@@ -592,17 +600,18 @@ int SrsRtmpConn::do_playing(SrsSource* source, SrsQueueRecvThread* trd)
         // no message to send, sleep a while.
         if (count <= 0) {
             srs_verbose("sleep for no messages to send");
-            st_usleep(SRS_PERF_SEND_MSGS_CACHE * 1000);
+            st_usleep(mw_sleep * 1000);
         }
 
         // reportable
         if (pithy_print.can_print()) {
             kbps->sample();
             srs_trace("-> "SRS_CONSTS_LOG_PLAY
-                " time=%"PRId64", msgs=%d, okbps=%d,%d,%d, ikbps=%d,%d,%d", 
+                " time=%"PRId64", msgs=%d, okbps=%d,%d,%d, ikbps=%d,%d,%d, mw=%d",
                 pithy_print.age(), count,
                 kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),
-                kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m()
+                kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m(),
+                mw_sleep
             );
         }
         
@@ -774,10 +783,14 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
         // reportable
         if (pithy_print.can_print()) {
             kbps->sample();
+            bool mr = _srs_config->get_mr_enabled(req->vhost);
+            int mr_sleep = _srs_config->get_mr_sleep_ms(req->vhost);
             srs_trace("<- "SRS_CONSTS_LOG_CLIENT_PUBLISH
-                " time=%"PRId64", okbps=%d,%d,%d, ikbps=%d,%d,%d", pithy_print.age(),
+                " time=%"PRId64", okbps=%d,%d,%d, ikbps=%d,%d,%d, mr=%d/%d", pithy_print.age(),
                 kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),
-                kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m());
+                kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m(),
+                mr, mr_sleep
+            );
         }
     }
 

trunk/src/app/srs_app_rtmp_conn.hpp

@@ -71,6 +71,8 @@ private:
     // @see https://github.com/winlinvip/simple-rtmp-server/issues/47
     int64_t duration;
     SrsKbps* kbps;
+    // the MR(merged-write) sleep time in ms.
+    int mw_sleep;
 public:
     SrsRtmpConn(SrsServer* srs_server, st_netfd_t client_stfd);
     virtual ~SrsRtmpConn();
@@ -81,6 +83,7 @@ protected:
 // interface ISrsReloadHandler
 public:
     virtual int on_reload_vhost_removed(std::string vhost);
+    virtual int on_reload_vhost_mw(std::string vhost);
 // interface IKbpsDelta
 public:
     virtual int64_t get_send_bytes_delta();