diff options
| author |   Patrick Ohly <patrick.ohly@intel.com> | 2016-11-29 17:47:44 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-07 10:40:56 +0000 |
| commit | 3c943e989964382c0b819d92de26a0c914ebed33 (patch) | |
| tree | 5dfc5e4d85bf05d1327559baa684613f74b73368 | |
| parent | 4547eea26803a9cd355d8b045197bcbdbb36a9ad (diff) | |
| download | openembedded-core-contrib-3c943e989964382c0b819d92de26a0c914ebed33.tar.gz | |
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.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/monitordisk.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/bb/monitordisk.py b/lib/bb/monitordisk.py index dff57ad878..d3d2106841 100644 --- a/lib/bb/monitordisk.py +++ b/lib/bb/monitordisk.py @@ -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: |