summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/FileMonitor.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-03-09 18:07:34 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-03-09 18:07:34 +0000
commite271e17a4a12984381ff15a219d7ebd832c77200 (patch)
tree68f778b065db0cc84c56581e8327338bdc02f662 /src/lib/Server/FileMonitor.py
parent7e8b871b07c1afff6bcfe2e218c88ab1463ecfe5 (diff)
downloadbcfg2-e271e17a4a12984381ff15a219d7ebd832c77200.tar.gz
bcfg2-e271e17a4a12984381ff15a219d7ebd832c77200.tar.bz2
bcfg2-e271e17a4a12984381ff15a219d7ebd832c77200.zip
Remove busy-wait for coalescing altogether
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5114 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/FileMonitor.py')
-rw-r--r--src/lib/Server/FileMonitor.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/Server/FileMonitor.py b/src/lib/Server/FileMonitor.py
index 6334a1cc7..da6eb00a4 100644
--- a/src/lib/Server/FileMonitor.py
+++ b/src/lib/Server/FileMonitor.py
@@ -133,13 +133,12 @@ class GaminFam(object):
count = 0
collapsed = 0
start = time()
- now = time()
- while (time() - now) < 0.01:
- if self.mon.event_pending():
- while self.mon.event_pending():
- count += 1
- self.mon.handle_one_event()
- now = time()
+ if self.mon.event_pending():
+ while self.mon.event_pending():
+ count += 1
+ self.mon.handle_one_event()
+ else:
+ return 0
unique = []
bookkeeping = []
for event in self.events: