At the sprint the issue about our current 10ms main loop timeout came
up, and it was suggested the problem most likely have been fixed in
HEAD. And even if it hasn't been fixed it's something which should be
fixed rather than plastered over by spinning around on a short timeout
when there is no activity..

This merge request backs out the change to revert the change..

Alex commit reversing the change said:

revno: 8332
committer: rousskov
branch nick: HEAD
timestamp: Tue 2007-07-24 01:55:21 +0000
message:
  Reversed bug #2011 fix because it may slow down ICAP, BodyPipe, and other code
  using zero-delay events to implement "asynchronous" calls.
  
  The code should probably be rewritten (a) to avoid any waiting/blocking when
  there are ready events and (b) to allow waiting longer when there are no ready
  events.

Regards
Henrik
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cvs-1:rousskov-20070723225531-dndch5pildk5yoz8
# target_branch: /data/bzr/squid3/trunk/
# testament_sha1: de5c9406bcde39ebb0ace39fca7b4bd89a514b7f
# timestamp: 2008-03-20 01:23:42 +0100
# base_revision_id: cvs-1:rousskov-20070724015521-m1myb9m0zh2i7lcy
# 
# Begin patch
=== modified file 'src/EventLoop.cc'
--- src/EventLoop.cc	2007-07-24 01:55:21 +0000
+++ src/EventLoop.cc	2007-07-19 19:33:18 +0000
@@ -1,6 +1,6 @@
 
 /*
- * $Id: EventLoop.cc,v 1.5 2007/07/23 19:55:21 rousskov Exp $
+ * $Id: EventLoop.cc,v 1.4 2007/07/19 13:33:18 hno Exp $
  *
  * DEBUG: section 1     Main Loop
  * AUTHOR: Harvest Derived
@@ -107,7 +107,7 @@
 {
     runOnceResult = true;
     error = false;
-    loop_delay = 10; /* 10 ms default delay */
+    loop_delay = 1000; /* 1s default delay */
 
     for (engine_vector::iterator i = engines.begin();
             i != engines.end(); ++i) {

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYUFw0YAABHfgAAQQGFzUBIA
AACv794QIABkRR6nqaep6gZPUA9IxCjJqaBo09JpgjIMQ3m0vN/kfmJsLk0MHQ1W4qiRcX7dBKNJ
lorThQidj3YxTykvD4J5hd1FQti/6hzQ9gCghgPfGQ8nyFtaDiAA5JCZ68iW34u5IpwoSEKC4aMA

Reply via email to