Skip to content

Commit 1311b6f

Browse files
committed
fix #251, support 10k clients. 2.0.67
1 parent 55d98fc commit 1311b6f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

trunk/conf/full.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ vhost mrw.srs.com {
165165
# SRS always set mw on, so we just set the latency value.
166166
# the latency of stream >= mw_latency + mr_latency
167167
# the value recomment is [300, 1800]
168-
# default: 350
169-
mw_latency 350;
168+
# default: 450
169+
mw_latency 450;
170170
}
171171

172172
# vhost for edge, edge and origin is the same vhost

trunk/src/core/srs_core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
// current release version
3232
#define VERSION_MAJOR 2
3333
#define VERSION_MINOR 0
34-
#define VERSION_REVISION 66
34+
#define VERSION_REVISION 67
3535
// server info.
3636
#define RTMP_SIG_SRS_KEY "SRS"
3737
#define RTMP_SIG_SRS_ROLE "origin/edge server"

trunk/src/core/srs_core_performance.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9595
* 2000 150 300
9696
*/
9797
// the default config of mw.
98-
#define SRS_PERF_MW_SLEEP 350
98+
#define SRS_PERF_MW_SLEEP 450
9999
/**
100100
* use iovs cache in each msg,
101101
* for the shared ptr message, we calc once and used for every copy.
@@ -138,7 +138,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
138138
* whether enable the fast vector for qeueue.
139139
* @see https://github.com/winlinvip/simple-rtmp-server/issues/251
140140
*/
141-
#undef SRS_PERF_QUEUE_FAST_VECTOR
141+
#define SRS_PERF_QUEUE_FAST_VECTOR
142142
#if defined(SRS_PERF_QUEUE_FAST_CACHE) && defined(SRS_PERF_QUEUE_FAST_VECTOR)
143143
#error "fast cache conflict with fast vector"
144144
#endif
@@ -147,7 +147,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
147147
* @remark this improve performance for large connectios.
148148
* @see https://github.com/winlinvip/simple-rtmp-server/issues/251
149149
*/
150-
#undef SRS_PERF_QUEUE_COND_WAIT
150+
#define SRS_PERF_QUEUE_COND_WAIT
151151
#ifdef SRS_PERF_QUEUE_COND_WAIT
152152
#define SRS_PERF_MW_MIN_MSGS 8
153153
#endif

0 commit comments

Comments
 (0)