diff --git a/common/global_parameter.py b/common/global_parameter.py index 48367f025356da4d756bd7b16d3557da2fe00544..80380f8bdb1f2ef620d9e9c75b218c7b91776a15 100644 --- a/common/global_parameter.py +++ b/common/global_parameter.py @@ -21,6 +21,11 @@ class GlobalParameter: # 默认执行5次 self.g_cpu_times = GlobalCall.get_json_value("Getting.Common.CPU.times", 5, Config.get_json_dict()) + # *-----------------------get memory info------------------- + # 默认时间间隔为1s + self.g_mem_interval = GlobalCall.get_json_value("Getting.Common.Memory.interval", 1, Config.get_json_dict()) + # 默认执行5次 + self.g_mem_times = GlobalCall.get_json_value("Getting.Common.Memory.times" , 5, Config.get_json_dict()) # -------------------cpu parameters----------------------- @property @@ -31,5 +36,12 @@ class GlobalParameter: def get_cpu_times(self): return self.g_cpu_times + # -------------------memory parameters----------------------- + @property + def get_mem_interval(self): + return self.g_mem_interval + + @property + def get_mem_times(self): + return self.g_mem_times - \ No newline at end of file diff --git a/extuner.conf b/extuner.conf index ecd4a3f446b01ea36708381be6e50991ea3acf3d..55b1787dba495e3ef0804b939d63de8666faad8f 100644 --- a/extuner.conf +++ b/extuner.conf @@ -9,6 +9,11 @@ "interval" : 3, //采集间隔,单位为秒 "times" : 5 //采集次数 }, + "Memory" : + { + "interval" : 3, + "times" : 5 + }, "Net" : { "interval" : 3,