Merge branch 'srs.master'

@@ -55,7 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // for example, system-time is 3(300ms),
 // for example, system-time is 3(300ms),
 // then rusage can be 3*x, for instance, 3*10=30(3s),
 // then rusage can be 3*x, for instance, 3*10=30(3s),
 // the meminfo canbe 30*x, for instance, 30*2=60(6s)
 // 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:
 // update time interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_TIME_RESOLUTION_MS_TIMES
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_TIME_RESOLUTION_MS_TIMES
@@ -64,31 +65,31 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 // update rusage interval:
 // update rusage interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_RUSAGE_RESOLUTION_TIMES
 //      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:
 // update network devices info interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES
 //      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:
 // update rusage interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_CPU_STAT_RESOLUTION_TIMES
 //      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:
 // update the disk iops interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_DISK_STAT_RESOLUTION_TIMES
 //      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:
 // update rusage interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_MEMINFO_RESOLUTION_TIMES
 //      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:
 // update platform info interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_PLATFORM_INFO_RESOLUTION_TIMES
 //      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:
 // update network devices info interval:
 //      SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES
 //      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)
 SrsListener::SrsListener(SrsServer* server, SrsListenerType type)
 {
 {