From: Alex Rousskov Date: Thu, 9 Apr 2009 22:31:13 +0000 (-0600) Subject: SourceLayout: src/base, take 1 -- moved remaining Async* files to src/base/ X-Git-Tag: SQUID_3_2_0_1~1071^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=882255af230614b7d4ce4a4003626b8f6cbfee3c;p=thirdparty%2Fsquid.git SourceLayout: src/base, take 1 -- moved remaining Async* files to src/base/ --- diff --git a/src/BodyPipe.h b/src/BodyPipe.h index bf00268b86..ee5378b594 100644 --- 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 26ca1812e8..9f3843747c 100644 --- 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 dc4a1715d7..d1861f56f4 100644 --- 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 050e57d0b7..3a2a3afd77 100644 --- 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 bf6c330096..66603e7750 100644 --- 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 eba205f7b8..5b4875b283 100644 --- 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 7be819c571..9f5dd31531 100644 --- 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 2a95feaca1..9bca17efe8 100644 --- 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 e6d1471f4c..20167fa88f 100644 --- 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 dda32b9ce5..8c135fee5d 100644 --- 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 a43614f7d2..4b4fb6ad07 100644 --- 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 287f64e05d..dd33044ca0 100644 --- 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 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 93b11be3f0..0596e0168f 100644 --- 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 006a820b60..a44938e2df 100644 --- 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 1cafcf5cc1..8825bbd502 100644 --- 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 37c87e94da..64a421bce4 100644 --- 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