move the storeDirCallback() call out into main.cc where it

probably belongs.

diff --git a/src/comm_poll.cc b/src/comm_poll.cc
index 7ff8be268674b8a10f91eae9e6cbca37fbfeba12..e18d30d0bc4596f64a8e812cc897b696ca961dc6 100644 (file)
--- a/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_poll.cc,v 1.7 2002/10/13 20:35:00 robertc Exp $
+ * $Id: comm_poll.cc,v 1.8 2002/10/28 01:12:28 adrian Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -335,8 +335,6 @@ comm_select(int msec)
        double start;
        getCurrentTime();
        start = current_dtime;
-       /* Handle any fs callbacks that need doing */
-       storeDirCallback();
 #if DELAY_POOLS
        FD_ZERO(&slowfds);
 #endif

diff --git a/src/comm_select.cc b/src/comm_select.cc
index c1441eba0a14d75ded45c2ad63e9ff4526f86687..7b2dd1623411bb889569c5677455df9d6b048ce1 100644 (file)
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select.cc,v 1.62 2002/10/14 11:06:53 adrian Exp $
+ * $Id: comm_select.cc,v 1.63 2002/10/28 01:12:28 adrian Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -348,8 +348,6 @@ comm_select(int msec)
 #if DELAY_POOLS
        FD_ZERO(&slowfds);
 #endif
-       /* Handle any fs callbacks that need doing */
-       storeDirCallback();
        if (commCheckICPIncoming)
            comm_select_icp_incoming();
        if (commCheckDNSIncoming)

diff --git a/src/main.cc b/src/main.cc
index a1a01bab6fff229714c63b9dd6cd5360ca50c28e..c3af68c3847fcaf1be44d2aeb8cc9d48e3b8ba10 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.357 2002/10/18 22:43:23 hno Exp $
+ * $Id: main.cc,v 1.358 2002/10/28 01:12:27 adrian Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -718,6 +718,8 @@ main(int argc, char **argv)
        eventRun();
        if ((loop_delay = eventNextTime()) < 0)
            loop_delay = 0;
+        /* Attempt any pending storedir IO */
+        storeDirCallback();
        comm_calliocallback();
        switch (comm_select(loop_delay)) {
        case COMM_OK: