SourceLayout: src/base, take 1 -- moved remaining Async* files to src/base/

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index bf00268b865a06e53f398b74496990ac03ff7c25..ee5378b59487807386d26d6037dd2717146d3f62 100644 (file)
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -3,7 +3,7 @@
 #define SQUID_BODY_PIPE_H
 
 #include "MemBuf.h"
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "base/AsyncJob.h"
 
 class BodyPipe;

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 26ca1812e839c6444db2d204f099ddc6b96da284..9f3843747cb04f6476e0d0017bb4d3435c1fcaf4 100644 (file)
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -8,8 +8,8 @@
 
 #include "comm.h"
 #include "ConnectionDetail.h"
-#include "AsyncCall.h"
-#include "AsyncJobCalls.h"
+#include "base/AsyncCall.h"
+#include "base/AsyncJobCalls.h"
 
 /* CommCalls implement AsyncCall interface for comm_* callbacks.
  * The classes cover two call dialer kinds:

diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index dc4a1715d70b1bfec94ed8a989808da26858631b..d1861f56f414fdc77c0b458806a1a15140e25d4c 100644 (file)
--- a/src/EventLoop.cc
+++ b/src/EventLoop.cc
@@ -34,7 +34,7 @@
  */
 
 #include "EventLoop.h"
-#include "AsyncCallQueue.h"
+#include "base/AsyncCallQueue.h"
 
 EventLoop::EventLoop() : errcount(0), last_loop(false), timeService(NULL),
         primaryEngine(NULL)

diff --git a/src/Makefile.am b/src/Makefile.am
index 050e57d0b76ab8e4e9712b83396fba3e8832fa97..3a2a3afd77fbc32814cc4fb26e5d1602177882ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -294,11 +294,6 @@ squid_SOURCES = \
        access_log.cc \
        AccessLogEntry.h \
        asn.cc \
-       AsyncCallQueue.cc \
-       AsyncCallQueue.h \
-       AsyncCall.cc \
-       AsyncCall.h \
-       AsyncJobCalls.h \
        AsyncEngine.cc \
        AsyncEngine.h \
        cache_cf.cc \
@@ -829,9 +824,7 @@ TESTSOURCES= \
 
 # sources needed by those tests that need event.cc; incomplete
 TEST_CALL_SOURCES = \
-       event.cc \
-       AsyncCallQueue.cc \
-       AsyncCall.cc
+       event.cc
 
 
 check_PROGRAMS+= tests/testAuth \

diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h
index bf6c3300964cd03c9043f20c236186d685f2a442..66603e77501210ba74e79a2686288254d6d708f1 100644 (file)
--- a/src/adaptation/Config.h
+++ b/src/adaptation/Config.h
@@ -2,7 +2,7 @@
 #define SQUID_ADAPTATION__CONFIG_H
 
 #include "event.h"
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "adaptation/Elements.h"
 
 class acl_access;

diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h
index eba205f7b8b93431b5b198274d97dd67546c8196..5b4875b2836899dcf8334786511c765cdf2ef419 100644 (file)
--- a/src/adaptation/Initiate.h
+++ b/src/adaptation/Initiate.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ADAPTATION__INITIATE_H
 #define SQUID_ADAPTATION__INITIATE_H
 
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "base/AsyncJob.h"
 #include "adaptation/forward.h"
 

diff --git a/src/adaptation/icap/Config.h b/src/adaptation/icap/Config.h
index 7be819c57174599636e2bb0352c9562e8653359b..9f5dd31531c3abf074ff59d3a44833b1bc87de01 100644 (file)
--- a/src/adaptation/icap/Config.h
+++ b/src/adaptation/icap/Config.h
@@ -37,7 +37,7 @@
 #define SQUID_ICAPCONFIG_H
 
 #include "event.h"
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "adaptation/Config.h"
 #include "adaptation/icap/ServiceRep.h"
 

diff --git a/src/AsyncCall.cc b/src/base/AsyncCall.cc
similarity index 96%
rename from src/AsyncCall.cc
rename to src/base/AsyncCall.cc
index 2a95feaca1bcbdf9d58177b7d13067f170ad6d23..9bca17efe87bc72c149fd1fedda0d2c14ceaf472 100644 (file)
--- a/src/AsyncCall.cc
+++ b/src/base/AsyncCall.cc
@@ -3,8 +3,8 @@
  */
 
 #include "squid.h"
-#include "AsyncCall.h"
-#include "AsyncCallQueue.h"
+#include "base/AsyncCall.h"
+#include "base/AsyncCallQueue.h"
 #include "cbdata.h"
 
 unsigned int AsyncCall::TheLastId = 0;

diff --git a/src/AsyncCall.h b/src/base/AsyncCall.h
similarity index 100%
rename from src/AsyncCall.h
rename to src/base/AsyncCall.h

diff --git a/src/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc
similarity index 95%
rename from src/AsyncCallQueue.cc
rename to src/base/AsyncCallQueue.cc
index e6d1471f4cb4fff9c3f7aa713a6ed7db1dfe8a15..20167fa88feba640afae1a1ceed9767e907a5ce7 100644 (file)
--- a/src/AsyncCallQueue.cc
+++ b/src/base/AsyncCallQueue.cc
@@ -6,8 +6,8 @@
  *
  */
 
-#include "AsyncCallQueue.h"
-#include "AsyncCall.h"
+#include "base/AsyncCallQueue.h"
+#include "base/AsyncCall.h"
 
 AsyncCallQueue *AsyncCallQueue::TheInstance = 0;
 

diff --git a/src/AsyncCallQueue.h b/src/base/AsyncCallQueue.h
similarity index 96%
rename from src/AsyncCallQueue.h
rename to src/base/AsyncCallQueue.h
index dda32b9ce5f41acf2c6f0cb31bf31f31498ee147..8c135fee5dab0bc0cb0530d959dc20099db3a97d 100644 (file)
--- a/src/AsyncCallQueue.h
+++ b/src/base/AsyncCallQueue.h
@@ -8,7 +8,7 @@
 #define SQUID_ASYNCCALLQUEUE_H
 
 #include "squid.h"
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 
 //class AsyncCall;
 

diff --git a/src/AsyncCalls.dox b/src/base/AsyncCalls.dox
similarity index 100%
rename from src/AsyncCalls.dox
rename to src/base/AsyncCalls.dox

diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc
index a43614f7d23b748f44b49b14d45305c5e260f802..4b4fb6ad074d941f56b158aa5abe9f25029cfedd 100644 (file)
--- a/src/base/AsyncJob.cc
+++ b/src/base/AsyncJob.cc
@@ -6,8 +6,8 @@
 #include "cbdata.h"
 #include "MemBuf.h"
 #include "TextException.h"
-#include "AsyncJob.h"
-#include "AsyncCall.h"
+#include "base/AsyncJob.h"
+#include "base/AsyncCall.h"
 
 
 unsigned int AsyncJob::TheLastId = 0;

diff --git a/src/base/AsyncJob.h b/src/base/AsyncJob.h
index 287f64e05d4dcd03be69e448407712076aef49cf..dd33044ca08bcc75f93c301235b35d3e03d95899 100644 (file)
--- a/src/base/AsyncJob.h
+++ b/src/base/AsyncJob.h
@@ -5,7 +5,7 @@
 #ifndef SQUID_ASYNC_JOB_H
 #define SQUID_ASYNC_JOB_H
 
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "TextException.h"
 
 /**
@@ -103,7 +103,7 @@ private:
     JobDialer &operator =(const JobDialer &);
 };
 
-#include "AsyncJobCalls.h"
+#include "base/AsyncJobCalls.h"
 
 template <class Dialer>
 bool

diff --git a/src/AsyncJobCalls.h b/src/base/AsyncJobCalls.h
similarity index 100%
rename from src/AsyncJobCalls.h
rename to src/base/AsyncJobCalls.h

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 93b11be3f06ffeccd407bd4bf459c51e6737501f..0596e0168f813df601d0a328b32a8f13cad5162a 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -5,5 +5,10 @@ include $(top_srcdir)/src/TestHeaders.am
 noinst_LTLIBRARIES = libbase.la
 
 libbase_la_SOURCES = \
+       AsyncCall.cc \
+       AsyncCall.h \
        AsyncJob.h \
-       AsyncJob.cc
+       AsyncJob.cc \
+       AsyncJobCalls.h \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h

diff --git a/src/comm.h b/src/comm.h
index 006a820b60d67d8b4fc1ece4057307feb9e2f860..a44938e2df2e659a4b3845745b15cff5d02e58bf 100644 (file)
--- a/src/comm.h
+++ b/src/comm.h
@@ -3,7 +3,7 @@
 
 #include "squid.h"
 #include "AsyncEngine.h"
-#include "AsyncCall.h"
+#include "base/AsyncCall.h"
 #include "StoreIOBuffer.h"
 #include "Array.h"
 #include "ip/IpAddress.h"

diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index 1cafcf5cc1511cd697596d672eae57c67fe8ba0b..8825bbd502c11f3ba187a39ce9f382abdbb1833d 100644 (file)
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -4,7 +4,7 @@
 
 #include "testEvent.h"
 #include "event.h"
-#include "AsyncCallQueue.h"
+#include "base/AsyncCallQueue.h"
 #include "CapturingStoreEntry.h"
 #include "Mem.h"
 

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 37c87e94daecb1cb1440dba5fad6bb7b9c5a1098..64a421bce44b64b39ecd49c39cea1030a32d845e 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -8,7 +8,7 @@
 
 #if 0
 #include "AsyncEngine.h"
-#include "AsyncCallQueue.h"
+#include "base/AsyncCallQueue.h"
 #include "event.h"
 #endif