From 9c845c5af1b28158c9047e7733b0528fb7f34394 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 7 Apr 2021 15:53:14 +0800 Subject: [PATCH] Threads-Hybrid: Support multiple hybrid threads, 5.0.3 1. Support multiple hybrid threads. 2. Update benchmark data for 1/4/8/32 CPUs. 3. Update benchmark for Janus. --- README.md | 27 ++++++++++++++------------- trunk/src/core/srs_core_version5.hpp | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c2957640c2..1f34c7ea26 100755 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ Other documents: ## V5 changes +* v5.0, 2021-04-07, Threads: Support multiple hybrid threads, [#2188](https://github.com/ossrs/srs/issues/2188). 5.0.3 * v5.0, 2021-03-31, Threads: Support multiple threads with locks, [#2188](https://github.com/ossrs/srs/issues/2188). 5.0.2 * v5.0, 2021-03-17, Live: Refine edge to follow client and HTTP/302. 5.0.1 * v5.0, 2021-03-15, Init SRS/5. 5.0.0 @@ -1100,7 +1101,6 @@ The data for publishing RTMP was benchmarked by [SB][srs-bench]: The data for playing HTTP FLV was benchmarked by [SB][srs-bench]: - | Update | SRS | Clients | Type | CPU | Memory | Commit | | ------------- | --------- | ------------- | ------------- | --------- | -------- | ------------ | | 2014-05-25 | 2.0.171 | 6.0k(6000) | players | 84% | 297MB | [code][p20] | @@ -1114,17 +1114,19 @@ The data for playing HTTP FLV was benchmarked by [SB][srs-bench]: The RTC benchmark data, by [srs-bench](https://github.com/ossrs/srs-bench/tree/feature/rtc#usage): - -| Update | Server | Clients | Type | CPU | Memory | Threads | Commit | -| ------------- | --------- | ------------- | ------------- | --------- | -------- | -------- | --------- | -| 2021-03-31 | SRS/4.0.87 | 550 | publishers | ~86% | 1.3GB | 1 | | -| 2021-03-31 | SRS/4.0.87 | 800 | players | ~94% | 444MB | 1 | | -| 2021-03-31 | SRS/5.0.2 | 1400 | publishers | ~90% | 3.1GB | 6 | [#2188](https://github.com/ossrs/srs/issues/2188) | -| 2021-03-31 | SRS/5.0.2 | 1400 | players | ~93% | 1.0GB | 6 | [#2188](https://github.com/ossrs/srs/issues/2188) | -| 2021-03-31 | Janus/0.10.10 | 700 | publishers | ~320% | 142MB | 720 | | -| 2021-03-31 | Janus/0.10.10 | 700 | players | ~325% | 283MB | 720 | | - -> Note: CentOS7, 500Kbps, 4CPU, 2.5 GHz Intel Xeon Platinum 8163/8269CY. +| Update | Server | Clients | Type | CPU | Memory | Threads | Commit | +| ------------- | ------------ | ----- | ---------- | -------- | -------- | ----- | --------- | +| 2021-04-07 | SRS/5.0.3 | 10000 | publishers | ~90% x 32 | 28GB | 33 | [#2188](https://github.com/ossrs/srs/issues/2188#issuecomment-816309097) | +| 2021-04-20 | Janus/0.11.1 | 4000 | publishers | ~90% x 32 | 790MB | 51 | [#2629](https://github.com/meetecho/janus-gateway/pull/2629#issuecomment-822914989) | +| 2021-04-07 | SRS/5.0.3 | 3400 | publishers | ~95% x 8 | 6.3GB | 12 | [#2188](https://github.com/ossrs/srs/issues/2188#issuecomment-816309097) | +| 2021-04-20 | Janus/0.11.1 | 1500 | publishers | ~95% x 8 | 276MB | 26 | [#2629](https://github.com/meetecho/janus-gateway/pull/2629#issuecomment-822914989) | +| 2021-04-07 | SRS/5.0.3 | 2000 | publishers | ~95% x 4 | 4.1GB | 8 | [#2188](https://github.com/ossrs/srs/issues/2188#issuecomment-816309097) | +| 2021-03-31 | SRS/5.0.2 | 1400 | publishers | ~90% x 4 | 3.1GB | 6 | [#2188](https://github.com/ossrs/srs/issues/2188#issuecomment-812499542) | +| 2021-03-31 | SRS/5.0.2 | 1400 | players | ~93% x 4 | 1.0GB | 6 | [#2188](https://github.com/ossrs/srs/issues/2188#issuecomment-812499542) | +| 2021-04-20 | Janus/0.11.1 | 750 | publishers | ~90% x 4 | 142MB | 23 | [#2629](https://github.com/meetecho/janus-gateway/pull/2629#issuecomment-822914989) | +| 2021-04-20 | Janus/0.11.1 | 750 | players | ~92% x 4 | 283MB | 23 | [#2629](https://github.com/meetecho/janus-gateway/pull/2629#issuecomment-822914989) | +| 2021-03-31 | SRS/4.0.87 | 550 | publishers | ~86% x 1 | 1.3GB | 1 | | +| 2021-03-31 | SRS/4.0.87 | 800 | players | ~94% x 1 | 444MB | 1 | | > Note: The benchmark tool for Janus is [srs-bench](https://github.com/ossrs/srs-bench/tree/feature/rtc#janus), and startup script by [janus-docker](https://github.com/winlinvip/janus-docker#usage). @@ -1132,7 +1134,6 @@ The RTC benchmark data, by [srs-bench](https://github.com/ossrs/srs-bench/tree/f **Latency benchmark** The latency between encoder and player with realtime config([CN][v3_CN_LowLatency], [EN][v3_EN_LowLatency]): -| | Update | SRS | Protocol | VP6 | H.264 | VP6+MP3 | H.264+MP3 | | ------------- | --------- | --------- | --------- | --------- | --------- | -------- | diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index be5ddc9e65..a089ec6254 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 2 +#define VERSION_REVISION 3 #endif