ossrs
diff --git a/‎README.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎README.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎trunk/conf/full.conf
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎trunk/conf/full.conf
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎trunk/configure
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎trunk/configure
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎trunk/src/app/srs_app_config.cpp
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎trunk/src/app/srs_app_config.cpp
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎trunk/src/app/srs_app_config.hpp
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎trunk/src/app/srs_app_config.hpp
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎trunk/src/app/srs_app_edge.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎trunk/src/app/srs_app_edge.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎trunk/src/app/srs_app_forward.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎trunk/src/app/srs_app_forward.cpp
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎trunk/src/app/srs_app_rtmp_conn.cpp
Copy file name to clipboard
+46-36Lines changed: 46 additions & 36 deletions b/‎trunk/src/app/srs_app_rtmp_conn.cpp
Copy file name to clipboard
+46-36Lines changed: 46 additions & 36 deletions
diff --git a/‎trunk/src/app/srs_app_rtmp_conn.hpp
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎trunk/src/app/srs_app_rtmp_conn.hpp
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
@@ -241,6 +241,7 @@ Supported operating systems and hardware:
 * 2013-10-17, Created.<br/>
 
 ## History
+* v1.0, 2014-06-22, performance refine, support 3k+ connections(270kbps). 0.9.130
 * v1.0, 2014-06-21, support edge [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse), fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129
 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127
 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126
 
@@ -36,7 +36,7 @@ srs_log_level       trace;
 srs_log_file        ./objs/srs.log;
 # the max connections.
 # if exceed the max connections, server will drop the new connection.
-# default: 2000
+# default: 12345
 max_connections     1000;
 # whether start as deamon
 # @remark: donot support reload.
 
@@ -456,7 +456,7 @@ MODULE_ID="RTMP"
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot})
 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp"
-        "srs_protocol_handshake" "srs_protocol_utility")
+        "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array")
 RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
 RTMP_OBJS="${MODULE_OBJS[@]}"
 #
 
@@ -1403,7 +1403,7 @@ int SrsConfig::get_max_connections()
 
     SrsConfDirective* conf = root->get("max_connections");
     if (!conf || conf->arg0().empty()) {
-        return 2000;
+        return SRS_CONF_DEFAULT_MAX_CONNECTIONS;
     }
 
     return ::atoi(conf->arg0().c_str());
 
@@ -38,6 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SRS_CONF_DEFAULT_PID_FILE "./objs/srs.pid"
 #define SRS_DEFAULT_CONF "conf/srs.conf"
 
+#define SRS_CONF_DEFAULT_MAX_CONNECTIONS 12345
 #define SRS_CONF_DEFAULT_HLS_PATH "./objs/nginx/html"
 #define SRS_CONF_DEFAULT_HLS_FRAGMENT 10
 #define SRS_CONF_DEFAULT_HLS_WINDOW 60
 
@@ -44,6 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_app_socket.hpp>
 #include <srs_app_kbps.hpp>
 #include <srs_kernel_utility.hpp>
+#include <srs_protocol_msg_array.hpp>
 
 // when error, edge ingester sleep for a while and retry.
 #define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL)
@@ -431,13 +432,16 @@ void SrsEdgeForwarder::stop()
     kbps->set_io(NULL, NULL);
 }
 
+#define SYS_MAX_EDGE_SEND_MSGS 128
 int SrsEdgeForwarder::cycle()
 {
     int ret = ERROR_SUCCESS;
 
     client->set_recv_timeout(SRS_PULSE_TIMEOUT_US);
 
     SrsPithyPrint pithy_print(SRS_STAGE_EDGE);
+    
+    SrsSharedPtrMessageArray msgs(SYS_MAX_EDGE_SEND_MSGS);
 
     while (pthread->can_loop()) {
         // switch to other st-threads.
@@ -465,8 +469,7 @@ int SrsEdgeForwarder::cycle()
 
         // forward all messages.
         int count = 0;
-        SrsSharedPtrMessage** msgs = NULL;
-        if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
+        if ((ret = queue->dump_packets(msgs.size, msgs.msgs, count)) != ERROR_SUCCESS) {
             srs_error("get message to forward to origin failed. ret=%d", ret);
             return ret;
         }
@@ -488,16 +491,15 @@ int SrsEdgeForwarder::cycle()
             srs_verbose("no packets to forward.");
             continue;
         }
-        SrsAutoFreeArray(SrsSharedPtrMessage, msgs, count);
 
         // all msgs to forward to origin.
         // @remark, becareful, all msgs must be free explicitly,
         //      free by send_and_free_message or srs_freep.
         for (int i = 0; i < count; i++) {
-            SrsSharedPtrMessage* msg = msgs[i];
+            SrsSharedPtrMessage* msg = msgs.msgs[i];
 
             srs_assert(msg);
-            msgs[i] = NULL;
+            msgs.msgs[i] = NULL;
 
             if ((ret = client->send_and_free_message(msg, stream_id)) != ERROR_SUCCESS) {
                 srs_error("edge publish forwarder send message to server failed. ret=%d", ret);
 
@@ -41,6 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_protocol_rtmp.hpp>
 #include <srs_app_kbps.hpp>
 #include <srs_kernel_utility.hpp>
+#include <srs_protocol_msg_array.hpp>
 
 // when error, forwarder sleep for a while and retry.
 #define SRS_FORWARDER_SLEEP_US (int64_t)(3*1000*1000LL)
@@ -309,6 +310,7 @@ int SrsForwarder::connect_server()
     return ret;
 }
 
+#define SYS_MAX_FORWARD_SEND_MSGS 128
 int SrsForwarder::forward()
 {
     int ret = ERROR_SUCCESS;
@@ -317,6 +319,8 @@ int SrsForwarder::forward()
 
     SrsPithyPrint pithy_print(SRS_STAGE_FORWARDER);
 
+    SrsSharedPtrMessageArray msgs(SYS_MAX_FORWARD_SEND_MSGS);
+    
     while (pthread->can_loop()) {
         // switch to other st-threads.
         st_usleep(0);
@@ -339,8 +343,7 @@ int SrsForwarder::forward()
 
         // forward all messages.
         int count = 0;
-        SrsSharedPtrMessage** msgs = NULL;
-        if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
+        if ((ret = queue->dump_packets(msgs.size, msgs.msgs, count)) != ERROR_SUCCESS) {
             srs_error("get message to forward failed. ret=%d", ret);
             return ret;
         }
@@ -360,16 +363,15 @@ int SrsForwarder::forward()
             srs_verbose("no packets to forward.");
             continue;
         }
-        SrsAutoFreeArray(SrsSharedPtrMessage, msgs, count);
 
         // all msgs to forward.
         // @remark, becareful, all msgs must be free explicitly,
         //      free by send_and_free_message or srs_freep.
         for (int i = 0; i < count; i++) {
-            SrsSharedPtrMessage* msg = msgs[i];
+            SrsSharedPtrMessage* msg = msgs.msgs[i];
 
             srs_assert(msg);
-            msgs[i] = NULL;
+            msgs.msgs[i] = NULL;
 
             if ((ret = client->send_and_free_message(msg, stream_id)) != ERROR_SUCCESS) {
                 srs_error("forwarder send message to server failed. ret=%d", ret);
 
@@ -50,6 +50,7 @@ using namespace std;
 #include <srs_app_utility.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_kernel_utility.hpp>
+#include <srs_protocol_msg_array.hpp>
 
 // when stream is busy, for example, streaming is already
 // publishing, when a new client to request to publish,
@@ -382,7 +383,7 @@ int SrsRtmpConn::stream_service_cycle()
             }
 
             srs_info("start to publish stream %s success", req->stream.c_str());
-            ret = fmle_publish(source);
+            ret = fmle_publishing(source);
 
             // when edge, notice edge to change state.
             // when origin, notice all service to unpublish.
@@ -416,7 +417,7 @@ int SrsRtmpConn::stream_service_cycle()
             }
 
             srs_info("flash start to publish stream %s success", req->stream.c_str());
-            ret = flash_publish(source);
+            ret = flash_publishing(source);
 
             // when edge, notice edge to change state.
             // when origin, notice all service to unpublish.
@@ -476,6 +477,8 @@ int SrsRtmpConn::check_vhost()
     return ret;
 }
 
+#define SYS_MAX_PLAY_SEND_MSGS 128
+
 int SrsRtmpConn::playing(SrsSource* source)
 {
     int ret = ERROR_SUCCESS;
@@ -499,38 +502,43 @@ int SrsRtmpConn::playing(SrsSource* source)
     rtmp->set_recv_timeout(SRS_PULSE_TIMEOUT_US);
 
     SrsPithyPrint pithy_print(SRS_STAGE_PLAY_USER);
+    
+    SrsSharedPtrMessageArray msgs(SYS_MAX_PLAY_SEND_MSGS);
 
+    bool user_specified_duration_to_stop = (req->duration > 0);
     int64_t starttime = -1;
+    
     while (true) {
-        // switch to other st-threads.
-        st_usleep(0);
-        
+        // collect elapse for pithy print.
         pithy_print.elapse();
 
         // read from client.
         if (true) {
             SrsMessage* msg = NULL;
             ret = rtmp->recv_message(&msg);
-            
             srs_verbose("play loop recv message. ret=%d", ret);
-            if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
-                if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
+            
+            if (ret == ERROR_SOCKET_TIMEOUT) {
+                // it's ok, do nothing.
+                ret = ERROR_SUCCESS;
+            } else if (ret != ERROR_SUCCESS) {
+                if (!srs_is_client_gracefully_close(ret)) {
                     srs_error("recv client control message failed. ret=%d", ret);
                 }
                 return ret;
-            }
-            if ((ret = process_play_control_msg(consumer, msg)) != ERROR_SUCCESS) {
-                if (!srs_is_system_control_error(ret)) {
-                    srs_error("process play control message failed. ret=%d", ret);
+            } else {
+                if ((ret = process_play_control_msg(consumer, msg)) != ERROR_SUCCESS) {
+                    if (!srs_is_system_control_error(ret)) {
+                        srs_error("process play control message failed. ret=%d", ret);
+                    }
+                    return ret;
                 }
-                return ret;
             }
         }
 
         // get messages from consumer.
-        SrsSharedPtrMessage** msgs = NULL;
         int count = 0;
-        if ((ret = consumer->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
+        if ((ret = consumer->dump_packets(msgs.size, msgs.msgs, count)) != ERROR_SUCCESS) {
             srs_error("get messages from consumer failed. ret=%d", ret);
             return ret;
         }
@@ -545,32 +553,29 @@ int SrsRtmpConn::playing(SrsSource* source)
                 kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m());
         }
 
-        if (count <= 0) {
-            srs_verbose("no packets in queue.");
-            continue;
-        }
-        SrsAutoFreeArray(SrsSharedPtrMessage, msgs, count);
-        
         // sendout messages
         // @remark, becareful, all msgs must be free explicitly,
         //      free by send_and_free_message or srs_freep.
         for (int i = 0; i < count; i++) {
-            SrsSharedPtrMessage* msg = msgs[i];
+            SrsSharedPtrMessage* msg = msgs.msgs[i];
 
             // the send_message will free the msg, 
             // so set the msgs[i] to NULL.
-            msgs[i] = NULL;
-            
-            srs_assert(msg);
+            msgs.msgs[i] = NULL;
 
-            // foreach msg, collect the duration.
-            // @remark: never use msg when sent it, for the protocol sdk will free it.
-            if (starttime < 0 || starttime > msg->header.timestamp) {
+            // only when user specifies the duration, 
+            // we start to collect the durations for each message.
+            if (user_specified_duration_to_stop) {
+                // foreach msg, collect the duration.
+                // @remark: never use msg when sent it, for the protocol sdk will free it.
+                if (starttime < 0 || starttime > msg->header.timestamp) {
+                    starttime = msg->header.timestamp;
+                }
+                duration += msg->header.timestamp - starttime;
                 starttime = msg->header.timestamp;
             }
-            duration += msg->header.timestamp - starttime;
-            starttime = msg->header.timestamp;
 
+            // no need to assert msg, for the rtmp will assert it.
             if ((ret = rtmp->send_and_free_message(msg, res->stream_id)) != ERROR_SUCCESS) {
                 srs_error("send message to client failed. ret=%d", ret);
                 return ret;
@@ -579,17 +584,22 @@ int SrsRtmpConn::playing(SrsSource* source)
 
         // if duration specified, and exceed it, stop play live.
         // @see: https://github.com/winlinvip/simple-rtmp-server/issues/45
-        if (req->duration > 0 && duration >= (int64_t)req->duration) {
-            ret = ERROR_RTMP_DURATION_EXCEED;
-            srs_trace("stop live for duration exceed. ret=%d", ret);
-            return ret;
+        if (user_specified_duration_to_stop) {
+            if (duration >= (int64_t)req->duration) {
+                ret = ERROR_RTMP_DURATION_EXCEED;
+                srs_trace("stop live for duration exceed. ret=%d", ret);
+                return ret;
+            }
         }
+        
+        // switch to other threads, to anti dead loop.
+        st_usleep(0);
     }
 
     return ret;
 }
 
-int SrsRtmpConn::fmle_publish(SrsSource* source)
+int SrsRtmpConn::fmle_publishing(SrsSource* source)
 {
     int ret = ERROR_SUCCESS;
 
@@ -668,7 +678,7 @@ int SrsRtmpConn::fmle_publish(SrsSource* source)
     return ret;
 }
 
-int SrsRtmpConn::flash_publish(SrsSource* source)
+int SrsRtmpConn::flash_publishing(SrsSource* source)
 {
     int ret = ERROR_SUCCESS;
 
 
@@ -48,6 +48,7 @@ class SrsHttpHooks;
 class SrsBandwidth;
 class SrsKbps;
 class SrsRtmpClient;
+class SrsSharedPtrMessage;
 
 /**
 * the client provides the main logic control for RTMP clients.
@@ -87,8 +88,8 @@ class SrsRtmpConn : public virtual SrsConnection, public virtual ISrsReloadHandl
     virtual int stream_service_cycle();
     virtual int check_vhost();
     virtual int playing(SrsSource* source);
-    virtual int fmle_publish(SrsSource* source);
-    virtual int flash_publish(SrsSource* source);
+    virtual int fmle_publishing(SrsSource* source);
+    virtual int flash_publishing(SrsSource* source);
     virtual int process_publish_message(SrsSource* source, SrsMessage* msg, bool vhost_is_edge);
     virtual int process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg);
 private:
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ MODULE_ID="RTMP"`
`456`	`456`	`MODULE_DEPENDS=("CORE" "KERNEL")`
`457`	`457`	`ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot})`
`458`	`458`	`MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp"`
`459`		`- "srs_protocol_handshake" "srs_protocol_utility")`
	`459`	`+ "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array")`
`460`	`460`	`RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh`
`461`	`461`	`RTMP_OBJS="${MODULE_OBJS[@]}"`
`462`	`462`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1403,7 +1403,7 @@ int SrsConfig::get_max_connections()`
`1403`	`1403`
`1404`	`1404`	`SrsConfDirective* conf = root->get("max_connections");`
`1405`	`1405`	`if (!conf \|\| conf->arg0().empty()) {`
`1406`		`- return 2000;`
	`1406`	`+ return SRS_CONF_DEFAULT_MAX_CONNECTIONS;`
`1407`	`1407`	`}`
`1408`	`1408`
`1409`	`1409`	`return ::atoi(conf->arg0().c_str());`