sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: monitordisk.py: minor code and comment cleanup 

There's no need to encode and decode the hash key as a single string,
a tuple works just fine. Iterating over entries can be written more
concisely.

Entries in the stat results are integers, not floating point values.

(Bitbake rev: 3c943e989964382c0b819d92de26a0c914ebed33)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2016-11-29 17:47:44 +01:00 committed by Richard Purdie
parent ad20ee9feb
commit 091ebb8665
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitbake/lib/bb/monitordisk.py
View File

@ -129,7 +129,7 @@ def getDiskData(BBDirs, configuration):
bb.utils.mkdirhier(path)
dev = getMountedDev(path)
# Use path/action as the key
devDict[os.path.join(path, action)] = [dev, minSpace, minInode]
devDict[(path, action)] = [dev, minSpace, minInode]
return devDict
@ -205,16 +205,13 @@ class diskMonitor:
""" Take action for the monitor """
if self.enableMonitor:
for k in self.devDict:
path = os.path.dirname(k)
action = os.path.basename(k)
dev = self.devDict[k][0]
minSpace = self.devDict[k][1]
minInode = self.devDict[k][2]
for k, attributes in self.devDict.items():
path, action = k
dev, minSpace, minInode = attributes
st = os.statvfs(path)
# The free space, float point number
# The available free space, integer number
freeSpace = st.f_bavail * st.f_frsize
if minSpace and freeSpace < minSpace:
@ -235,7 +232,7 @@ class diskMonitor:
rq.finish_runqueue(True)
bb.event.fire(bb.event.DiskFull(dev, 'disk', freeSpace, path), self.configuration)
# The free inodes, float point number
# The free inodes, integer number
freeInode = st.f_favail
if minInode and freeInode < minInode: