summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-10 15:57:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-11 16:20:47 +0100
commitf668b347a8f9563f41d454288b9d4632190f308f (patch)
tree75b166acaaa49f4cf744ea9e29c0f667deb5988c
parent6ab3945fc54b2a242292a874d78ebd8cccb99573 (diff)
downloadbitbake-f668b347a8f9563f41d454288b9d4632190f308f.tar.gz
cooker: Improve pyinotify performance
Benchmarks show that the introduction of pyinotify regressed performance. This patch ensures we only call the add_watch() function for new entries, not ones we've already processed which does improve performance as measured by "time bitbake -p". This doesn't completely remove the overhead but it does substantially reduce it. (Bitbake rev: 493361f35f6cc332d4ea359a2695622c2c91a9c2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index e965bcc44..3909dc09f 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -122,11 +122,13 @@ class BBCooker:
self.configuration = configuration
self.configwatcher = pyinotify.WatchManager()
+ self.configwatcher.bbseen = []
self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications)
self.watchmask = pyinotify.IN_CLOSE_WRITE | pyinotify.IN_CREATE | pyinotify.IN_DELETE | \
pyinotify.IN_DELETE_SELF | pyinotify.IN_MODIFY | pyinotify.IN_MOVE_SELF | \
pyinotify.IN_MOVED_FROM | pyinotify.IN_MOVED_TO
self.watcher = pyinotify.WatchManager()
+ self.watcher.bbseen = []
self.notifier = pyinotify.Notifier(self.watcher, self.notifications)
@@ -180,7 +182,7 @@ class BBCooker:
if not watcher:
watcher = self.watcher
for i in deps:
- f = os.path.dirname(i[0])
+ f = i[0]
if f in watcher.bbseen:
continue
watcher.bbseen.append(f)
@@ -194,6 +196,7 @@ class BBCooker:
except pyinotify.WatchManagerError as e:
if 'ENOENT' in str(e):
f = os.path.dirname(f)
+ watcher.bbseen.append(f)
continue
raise