From 8cc9a11b811a1b5b92b115b6692b028c5638a98c Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 Nov 2014 14:38:54 +0800 Subject: [PATCH 1/2] for bug #194, set the server main cycle to 1s --- trunk/src/app/srs_app_server.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index e0834aae4..020670a23 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -55,7 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // for example, system-time is 3(300ms), // then rusage can be 3*x, for instance, 3*10=30(3s), // the meminfo canbe 30*x, for instance, 30*2=60(6s) -#define SRS_SYS_CYCLE_INTERVAL 100 +// for performance refine, @see: https://github.com/winlinvip/simple-rtmp-server/issues/194 +#define SRS_SYS_CYCLE_INTERVAL 1000 // update time interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_TIME_RESOLUTION_MS_TIMES From 36d12dd8ea5512583b927d1b4038cc097930afb4 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 Nov 2014 14:41:48 +0800 Subject: [PATCH 2/2] for bug #194, change server main cycle to 1s. --- trunk/src/app/srs_app_server.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 020670a23..49df43998 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -65,31 +65,31 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // update rusage interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_RUSAGE_RESOLUTION_TIMES -#define SRS_SYS_RUSAGE_RESOLUTION_TIMES 30 +#define SRS_SYS_RUSAGE_RESOLUTION_TIMES 3 // update network devices info interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES -#define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 30 +#define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 3 // update rusage interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_CPU_STAT_RESOLUTION_TIMES -#define SRS_SYS_CPU_STAT_RESOLUTION_TIMES 30 +#define SRS_SYS_CPU_STAT_RESOLUTION_TIMES 3 // update the disk iops interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_DISK_STAT_RESOLUTION_TIMES -#define SRS_SYS_DISK_STAT_RESOLUTION_TIMES 60 +#define SRS_SYS_DISK_STAT_RESOLUTION_TIMES 6 // update rusage interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_MEMINFO_RESOLUTION_TIMES -#define SRS_SYS_MEMINFO_RESOLUTION_TIMES 60 +#define SRS_SYS_MEMINFO_RESOLUTION_TIMES 6 // update platform info interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_PLATFORM_INFO_RESOLUTION_TIMES -#define SRS_SYS_PLATFORM_INFO_RESOLUTION_TIMES 90 +#define SRS_SYS_PLATFORM_INFO_RESOLUTION_TIMES 9 // update network devices info interval: // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES -#define SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES 90 +#define SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES 9 SrsListener::SrsListener(SrsServer* server, SrsListenerType type) {