happyz
/
mobile-offloading
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up debug flag

This commit is contained in:
HappyZ 2017-02-04 19:41:46 -08:00
parent ddb6e215b2
commit 25265e554e
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
energy_model/modules/model.py
View File

@ -40,7 +40,6 @@ class Model():
self.unit = unit self.unit = unit
self.DEBUG = isDebugging self.DEBUG = isDebugging
if self.DEBUG:
self.logger = EmptyLogger( self.logger = EmptyLogger(
"Model", isDebugging=self.DEBUG, printout=True) "Model", isDebugging=self.DEBUG, printout=True)
@ -53,9 +52,6 @@ class Model():
self.using_power = True self.using_power = True
else: else:
self.using_power = False self.using_power = False
self.logger.info(
"{0} will cause some loss of info like instant power".format(
self.unit))
def load(self, productname, dir="./models/"): def load(self, productname, dir="./models/"):
self.voltage = getVoltage(productname) self.voltage = getVoltage(productname)
@ -114,8 +110,6 @@ class Model():
int(tst.attrib['tailpwr']), int(tst.attrib['tailpwr']),
int(tst.attrib['taillen'])] int(tst.attrib['taillen'])]
# print net_node
def parseCPUMultiCore(self, node): def parseCPUMultiCore(self, node):
for core in node.findall("core"): for core in node.findall("core"):
if core.attrib['mode'] == 'multicore': if core.attrib['mode'] == 'multicore':
@ -130,7 +124,6 @@ class Model():
{int(core.attrib['freq']): {int(core.attrib['freq']):
[int(core.attrib['active']), [int(core.attrib['active']),
int(core.attrib['idle'])]} int(core.attrib['idle'])]}
# print self.cpu_multi_core
def parseCPUSingleCore(self, node): def parseCPUSingleCore(self, node):
for core in node.findall("core"): for core in node.findall("core"):
@ -146,13 +139,10 @@ class Model():
{int(core.attrib['freq']): {int(core.attrib['freq']):
[int(core.attrib['active']), [int(core.attrib['active']),
int(core.attrib['idle'])]} int(core.attrib['idle'])]}
# print self.cpu_single_core
def parseFreqs(self, node): def parseFreqs(self, node):
for freq in node.findall("freq"): for freq in node.findall("freq"):
self.freqs.append(int(freq.attrib['val'])) self.freqs.append(int(freq.attrib['val']))
# if self.DEBUG:
# self.logger.debug(self.freqs)
def get_final_energy(self, current, time): def get_final_energy(self, current, time):
''' '''
@ -207,7 +197,6 @@ class Model():
current += util[i] * active_current + (1 - util[i]) * idle_current current += util[i] * active_current + (1 - util[i]) * idle_current
# derive energy # derive energy
energy = self.get_final_energy(current, time_diff) energy = self.get_final_energy(current, time_diff)
if self.DEBUG:
self.logger.debug( self.logger.debug(
"duration: {0:.4f}s, cpu_energy: {1:.4f}{2}".format( "duration: {0:.4f}s, cpu_energy: {1:.4f}{2}".format(
time_diff, energy, self.unit)) time_diff, energy, self.unit))
@ -251,7 +240,6 @@ class Model():
sys.exit(-1) sys.exit(-1)
# derive energy # derive energy
energy = self.get_final_energy(current, time_diff) energy = self.get_final_energy(current, time_diff)
if self.DEBUG:
self.logger.debug( self.logger.debug(
"wifi_active_energy: {0:.4f}{1}".format(energy, self.unit)) "wifi_active_energy: {0:.4f}{1}".format(energy, self.unit))
return energy return energy
@ -259,7 +247,6 @@ class Model():
def get_wifi_tail_energy(self, time_diff): def get_wifi_tail_energy(self, time_diff):
current = self.net_wifi['tail']['0'][1] current = self.net_wifi['tail']['0'][1]
energy = self.get_final_energy(current, time_diff) energy = self.get_final_energy(current, time_diff)
if self.DEBUG:
self.logger.debug( self.logger.debug(
"wifi_active_energy: {0:.4f}{1}".format(energy, self.unit)) "wifi_active_energy: {0:.4f}{1}".format(energy, self.unit))
return energy return energy