1 |
Author: zmedico |
2 |
Date: 2008-07-30 03:33:46 +0000 (Wed, 30 Jul 2008) |
3 |
New Revision: 11277 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Put a 5 second cap on the delay produced by Scheduler._job_delay(). |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-30 03:17:11 UTC (rev 11276) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-30 03:33:46 UTC (rev 11277) |
15 |
@@ -8862,6 +8862,7 @@ |
16 |
# The load average takes some time to respond when new |
17 |
# jobs are added, so we need to limit the rate of adding |
18 |
# new jobs. |
19 |
+ self._job_delay_max = 5 |
20 |
self._job_delay_factor = 0.5 |
21 |
self._previous_job_start_time = None |
22 |
|
23 |
@@ -9690,8 +9691,10 @@ |
24 |
|
25 |
current_time = time.time() |
26 |
|
27 |
- if current_time - self._previous_job_start_time < \ |
28 |
- self._job_delay_factor * self._jobs: |
29 |
+ delay = self._job_delay_factor * self._jobs |
30 |
+ if delay > self._job_delay_max: |
31 |
+ delay = self._job_delay_max |
32 |
+ if (current_time - self._previous_job_start_time) < delay: |
33 |
return True |
34 |
|
35 |
return False |