Commit 7108957e authored by Devaev Maxim's avatar Devaev Maxim

Changed return value type of meminfo API from float to int

parent 1bf3cc02
...@@ -51,19 +51,19 @@ class Memory(service.FunctionObject) : ...@@ -51,19 +51,19 @@ class Memory(service.FunctionObject) :
### DBus methods ### ### DBus methods ###
@service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="d") @service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="i")
def memoryFull(self) : def memoryFull(self) :
return self.meminfoSum("MemTotal") return self.meminfoSum("MemTotal")
@service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="d") @service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="i")
def memoryFree(self) : def memoryFree(self) :
return self.meminfoSum("MemFree", "Buffers", "Cached") return self.meminfoSum("MemFree", "Buffers", "Cached")
@service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="d") @service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="i")
def swapFull(self) : def swapFull(self) :
return self.meminfoSum("SwapTotal") return self.meminfoSum("SwapTotal")
@service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="d") @service.functionMethod(MEMORY_METHODS_NAMESPACE, out_signature="i")
def swapFree(self) : def swapFree(self) :
return self.meminfoSum("SwapFree", "SwapCached") return self.meminfoSum("SwapFree", "SwapCached")
...@@ -77,14 +77,14 @@ class Memory(service.FunctionObject) : ...@@ -77,14 +77,14 @@ class Memory(service.FunctionObject) :
meminfo_file.close() meminfo_file.close()
except : pass except : pass
sum = 0.0 sum = 0
for meminfo_records_list_item in meminfo_records_list : for meminfo_records_list_item in meminfo_records_list :
value_list = re.split(r"[\s:]+", meminfo_records_list_item) value_list = re.split(r"[\s:]+", meminfo_records_list_item)
if len(value_list) != 3 : if len(value_list) != 3 :
continue continue
if value_list[0] in args_list : if value_list[0] in args_list :
sum += float(value_list[1]) sum += int(value_list[1])
return sum return sum
...@@ -218,7 +218,8 @@ class Service(service.Service) : ...@@ -218,7 +218,8 @@ class Service(service.Service) :
shared.Functions.shared(STATISTICS_SHARED_NAME).addShared(CPU_SHARED_NAME) shared.Functions.shared(STATISTICS_SHARED_NAME).addShared(CPU_SHARED_NAME)
stat_file = open("/proc/stat") stat_file = open("/proc/stat")
cpu_names_list = [ re.split(r"\s+", stat_record)[0] for stat_record in stat_file.read().split("\n") if re.match(r"cpu\d+", stat_record)!=None ] cpu_names_list = [ re.split(r"\s+", stat_record)[0] for stat_record in stat_file.read().split("\n")
if re.match(r"cpu\d+", stat_record)!=None ]
try : try :
stat_file.close() stat_file.close()
except : pass except : pass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment