From: Alex Rousskov Date: Wed, 18 Nov 2015 06:07:42 +0000 (-0700) Subject: SourceFormat X-Git-Tag: SQUID_4_0_3~12^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3f7fd880541f82a53f12476a000faf52f06c55b;p=thirdparty%2Fsquid.git SourceFormat --- diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index e444791c97..888c94d159 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -49,6 +49,7 @@ section 20 Storage Manager Swapfile Metadata section 20 Storage Manager Swapfile Unpacker section 20 Storage Manager Swapin Functions section 20 Storage Manager Swapout Functions +section 20 Store Controller section 20 Store Rebuild Routines section 20 Swap Dir base object section 21 Integer functions @@ -92,6 +93,7 @@ section 46 Access Log - Squid ICAP Logging section 46 Access Log - Squid referer format section 46 Access Log - Squid useragent format section 47 Store Directory Routines +section 47 Store Search section 48 Persistent Connections section 49 SNMP Interface section 49 SNMP support diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index 3086bdcd57..57ae9c83df 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -22,12 +22,12 @@ #include "squid.h" #include "Debug.h" -#include "fs_io.h" #include "DiskIO/AIO/AIODiskFile.h" #include "DiskIO/AIO/AIODiskIOStrategy.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "fs_io.h" #include "globals.h" #include diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc index c838a48956..ff6a5accc5 100644 --- a/src/DiskIO/Blocking/BlockingFile.cc +++ b/src/DiskIO/Blocking/BlockingFile.cc @@ -12,10 +12,10 @@ #include "BlockingFile.h" #include "Debug.h" #include "defines.h" -#include "fs_io.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "fs_io.h" #include "globals.h" #include diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc index a8373c53a6..e61646b25b 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc @@ -9,12 +9,12 @@ /* DEBUG: section 79 Disk IO Routines */ #include "squid.h" -#include "fs_io.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" #include "DiskThreadsDiskFile.h" #include "fd.h" +#include "fs_io.h" #include "Generic.h" #include "globals.h" #include "StatCounters.h" diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index d366b2d9e0..32495a88af 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -11,12 +11,12 @@ #include "squid.h" #include "base/RunnersRegistry.h" #include "base/TextException.h" -#include "fs_io.h" #include "DiskIO/IORequestor.h" #include "DiskIO/IpcIo/IpcIoFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" #include "fd.h" +#include "fs_io.h" #include "globals.h" #include "ipc/mem/Pages.h" #include "ipc/Messages.h" diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc index d5612a4e21..2fde2ed773 100644 --- a/src/DiskIO/Mmapped/MmappedFile.cc +++ b/src/DiskIO/Mmapped/MmappedFile.cc @@ -10,11 +10,11 @@ #include "squid.h" #include "Debug.h" -#include "fs_io.h" #include "DiskIO/IORequestor.h" #include "DiskIO/Mmapped/MmappedFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "fs_io.h" #include "globals.h" #include diff --git a/src/errorpage.cc b/src/errorpage.cc index 5a9f8be73a..6587619e99 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -13,10 +13,10 @@ #include "clients/forward.h" #include "comm/Connection.h" #include "comm/Write.h" -#include "fs_io.h" #include "err_detail_type.h" #include "errorpage.h" #include "fde.h" +#include "fs_io.h" #include "html_quote.h" #include "HttpHeaderTools.h" #include "HttpReply.h" diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 05e4849c94..58689868da 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -9,17 +9,17 @@ /* DEBUG: section 79 Disk IO Routines */ #include "squid.h" -#include "fs_io.h" #include "base/AsyncJobCalls.h" #include "fs/rock/RockDbCell.h" #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" +#include "fs_io.h" #include "globals.h" #include "ipc/StoreMap.h" #include "md5.h" #include "SquidTime.h" -#include "store_rebuild.h" #include "Store.h" +#include "store_rebuild.h" #include "tools.h" #include diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index a40fab21a6..5c5a153982 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -13,11 +13,11 @@ #include "squid.h" #include "cache_cf.h" #include "ConfigOption.h" -#include "fs_io.h" #include "DiskIO/DiskIOModule.h" #include "DiskIO/DiskIOStrategy.h" #include "fde.h" #include "FileMap.h" +#include "fs_io.h" #include "globals.h" #include "Parsing.h" #include "RebuildState.h" diff --git a/src/fs_io.cc b/src/fs_io.cc index 57cd7829af..327e12c239 100644 --- a/src/fs_io.cc +++ b/src/fs_io.cc @@ -10,9 +10,9 @@ #include "squid.h" #include "comm/Loops.h" -#include "fs_io.h" #include "fd.h" #include "fde.h" +#include "fs_io.h" #include "globals.h" #include "MemBuf.h" #include "profiler/Profiler.h" diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 8c74e0f2e7..6d24a8586b 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -19,9 +19,9 @@ #include "squid.h" #include "CachePeer.h" #include "cbdata.h" -#include "fs_io.h" #include "event.h" #include "fde.h" +#include "fs_io.h" #include "FwdState.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index e41117201f..f14f01a579 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -9,10 +9,10 @@ /* DEBUG: section 50 Log file handling */ #include "squid.h" -#include "fs_io.h" #include "fatal.h" #include "fd.h" #include "fde.h" +#include "fs_io.h" #include "globals.h" #include "log/File.h" #include "log/ModStdio.h" diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index aa1e0fc2f6..fa4048cd5d 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -11,9 +11,9 @@ #include "squid.h" #include "comm.h" #include "comm/Connection.h" -#include "fs_io.h" #include "fatal.h" #include "fd.h" +#include "fs_io.h" #include "log/File.h" #include "log/ModUdp.h" #include "Parsing.h" diff --git a/src/main.cc b/src/main.cc index 578ddc7276..995cb2841a 100644 --- a/src/main.cc +++ b/src/main.cc @@ -23,7 +23,6 @@ #include "comm.h" #include "ConfigParser.h" #include "CpuAffinity.h" -#include "fs_io.h" #include "DiskIO/DiskIOModule.h" #include "dns/forward.h" #include "errorpage.h" @@ -34,6 +33,7 @@ #include "format/Token.h" #include "fqdncache.h" #include "fs/Module.h" +#include "fs_io.h" #include "FwdState.h" #include "globals.h" #include "htcp.h" diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc index 1cd22c7573..40a05755a5 100644 --- a/src/mem/old_api.cc +++ b/src/mem/old_api.cc @@ -14,9 +14,9 @@ #include "base/PackableStream.h" #include "CacheDigest.h" #include "ClientInfo.h" -#include "fs_io.h" #include "dlink.h" #include "event.h" +#include "fs_io.h" #include "icmp/net_db.h" #include "md5.h" #include "mem/forward.h" diff --git a/src/mime.cc b/src/mime.cc index 7af281cd4e..983e2206b2 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -9,8 +9,8 @@ /* DEBUG: section 25 MIME Parsing and Internal Icons */ #include "squid.h" -#include "fs_io.h" #include "fde.h" +#include "fs_io.h" #include "globals.h" #include "HttpHdrCc.h" #include "HttpReply.h" diff --git a/src/send-announce.cc b/src/send-announce.cc index 8adbc19039..272c6883ee 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -11,10 +11,10 @@ #include "squid.h" #include "anyp/PortCfg.h" #include "comm/Connection.h" -#include "fs_io.h" #include "event.h" #include "fd.h" #include "fde.h" +#include "fs_io.h" #include "globals.h" #include "ICP.h" #include "ipcache.h" diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index 536a32994d..2a7f7a9922 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -9,6 +9,7 @@ #include "squid.h" #include "../helper.h" #include "anyp/PortCfg.h" +#include "fs_io.h" #include "helper/Reply.h" #include "SquidConfig.h" #include "SquidString.h" @@ -16,7 +17,6 @@ #include "ssl/cert_validate_message.h" #include "ssl/Config.h" #include "ssl/helper.h" -#include "fs_io.h" #include "wordlist.h" LruMap *Ssl::CertValidationHelper::HelperCache = NULL; diff --git a/src/store.cc b/src/store.cc index b23b22c50a..b5e42419cb 100644 --- a/src/store.cc +++ b/src/store.cc @@ -32,14 +32,14 @@ #include "StatCounters.h" #include "stmem.h" #include "Store.h" +#include "store/Controller.h" +#include "store/Disk.h" +#include "store/Disks.h" #include "store_digest.h" #include "store_key_md5.h" #include "store_key_md5.h" #include "store_log.h" #include "store_rebuild.h" -#include "store/Controller.h" -#include "store/Disk.h" -#include "store/Disks.h" #include "StoreClient.h" #include "StoreIOState.h" #include "StoreMeta.h" diff --git a/src/store/Disk.cc b/src/store/Disk.cc index fd96d046e7..b745ec64f0 100644 --- a/src/store/Disk.cc +++ b/src/store/Disk.cc @@ -16,9 +16,9 @@ #include "globals.h" #include "Parsing.h" #include "SquidConfig.h" -#include "StoreFileSystem.h" #include "Store.h" #include "store/Disk.h" +#include "StoreFileSystem.h" #include "tools.h" Store::Disk::Disk(char const *aType): theType(aType), diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index 52a2ba03ac..f1f179b997 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -16,11 +16,11 @@ #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" +#include "store/Disk.h" #include "store_digest.h" #include "store_key_md5.h" #include "store_rebuild.h" #include "StoreSearch.h" -#include "store/Disk.h" // for tvSubDsec() which should be in SquidTime.h #include "util.h" diff --git a/src/store_swapout.cc b/src/store_swapout.cc index 31f44a9489..2bfb75babc 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -18,10 +18,10 @@ #include "MemObject.h" #include "SquidConfig.h" #include "StatCounters.h" -#include "store_log.h" -#include "swap_log_op.h" #include "store/Disk.h" #include "store/Disks.h" +#include "store_log.h" +#include "swap_log_op.h" static void storeSwapOutStart(StoreEntry * e); static StoreIOState::STIOCB storeSwapOutFileClosed; diff --git a/src/tests/Stub.list b/src/tests/Stub.list index 0b4aab9795..fa4c3ceb11 100644 --- a/src/tests/Stub.list +++ b/src/tests/Stub.list @@ -71,6 +71,7 @@ STUB_SOURCE= tests/STUB.h \ tests/stub_store_digest.cc \ tests/stub_StoreMeta.cc \ tests/stub_store_rebuild.cc \ + tests/stub_store_search.cc \ tests/stub_store_stats.cc \ tests/stub_store_swapout.cc \ tests/stub_SwapDir.cc \ diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc index 3f88d986fd..e8da82424c 100644 --- a/src/tests/stub_store_rebuild.cc +++ b/src/tests/stub_store_rebuild.cc @@ -10,8 +10,8 @@ #include "squid.h" #include "MemBuf.h" -#include "store_rebuild.h" #include "store/Controller.h" +#include "store_rebuild.h" #include diff --git a/src/tests/stub_store_search.cc b/src/tests/stub_store_search.cc index 745e857baf..fd9d1b0c18 100644 --- a/src/tests/stub_store_search.cc +++ b/src/tests/stub_store_search.cc @@ -11,7 +11,7 @@ #define STUB_API "StoreSearch.cc" #include "tests/STUB.h" -#include "StoreSearch.h" #include "store/LocalSearch.h" +#include "StoreSearch.h" StoreSearch *Store::NewLocalSearch() STUB_RETVAL(NULL) diff --git a/src/tools.cc b/src/tools.cc index b4883e3dd6..fc088ebb85 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -13,9 +13,9 @@ #include "base/Subscription.h" #include "client_side.h" #include "fatal.h" -#include "fs_io.h" #include "fde.h" #include "fqdncache.h" +#include "fs_io.h" #include "htcp.h" #include "ICP.h" #include "ip/Intercept.h" diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 06c462cb1e..dd34279310 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -11,9 +11,9 @@ #include "squid.h" #if USE_UNLINKD -#include "fs_io.h" #include "fd.h" #include "fde.h" +#include "fs_io.h" #include "globals.h" #include "SquidConfig.h" #include "SquidIpc.h"