If an entry is added to the directory during a scan when another entry expires,

then that new entry will not be processed promptly, but must wait for either a
future entry to start or a current entry's retry to occur.  If no other entries
exist in the directory (other than the new entries) when a bunch expire, then
the new entries must wait until another new entry is added to be processed.
This was a rather weird race condition, really.  Fixes AST-147.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@160558 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index ba73e0d449452f9d3bd40f184261e8825fe02afe..8c8880d72bfad1873826cd66b6236d9729c0b995 100644 (file)
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -462,7 +462,7 @@ static void *scan_thread(void *unused)
 #if 0
                                printf("atime: %ld, mtime: %ld, ctime: %ld\n", st.st_atime, st.st_mtime, st.st_ctime);
                                printf("Ooh, something changed / timeout\n");
-#endif                         
+#endif
                                next = 0;
                                last = st.st_mtime;
                                dir = opendir(qdir);
@@ -478,8 +478,12 @@ static void *scan_thread(void *unused)
                                                                                if (!next || (res < next)) {
                                                                                        next = res;
                                                                                }
-                                                                       } else if (res)
+                                                                       } else if (res) {
                                                                                ast_log(LOG_WARNING, "Failed to scan service '%s'\n", fn);
+                                                                       } else if (!next) {
+                                                                               /* Expired entry: must recheck on the next go-around */
+                                                                               next = st.st_mtime;
+                                                                       }
                                                                } else {
                                                                        /* Update "next" update if necessary */
                                                                        if (!next || (st.st_mtime < next))