diff --git a/README.md b/README.md index 87fda461f..c114e44ec 100755 --- a/README.md +++ b/README.md @@ -155,6 +155,7 @@ For previous versions, please read: ## V4 changes +* v4.0, 2021-02-10, RTC: Refine performance about 700+ streams. 4.0.71 * v4.0, 2021-02-08, RTC: Print stat for pli and timer every 5s. 4.0.70 * v4.0, 2021-02-07, RTC: Parse PT fast and refine udp handler. 4.0.69 * v4.0, 2021-02-05, RTC: Refine UDP packet peer fast id. 4.0.68 diff --git a/trunk/.gitignore b/trunk/.gitignore index a59009bab..1cbd7b7e6 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -45,6 +45,7 @@ srs /janus *.dump bug +/research/thread-model/thread-local *.gcp *.svg diff --git a/trunk/src/app/srs_app_hybrid.cpp b/trunk/src/app/srs_app_hybrid.cpp index 528a5184f..35d1dbe70 100644 --- a/trunk/src/app/srs_app_hybrid.cpp +++ b/trunk/src/app/srs_app_hybrid.cpp @@ -226,7 +226,8 @@ srs_error_t SrsHybridServer::notify(int event, srs_utime_t interval, srs_utime_t int memory = (int)(u->rss * 4 / 1024); _srs_pps_cids_get->update(); _srs_pps_cids_set->update(); - _srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update(); _srs_pps_dispose->update(); + _srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update(); + _srs_pps_dispose->update(); srs_trace("Hybrid cpu=%.2f%%,%dMB, cid=%d,%d, timer=%d,%d,%d, free=%d", u->percent * 100, memory, diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 21c702cbb..f5ff1fd88 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 70 +#define SRS_VERSION4_REVISION 71 #endif