SourceFormat

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index e444791c9769876f216580534b365edbd22071e1..888c94d15916822eae98564be1e14ec70fc460a1 100644 (file)
--- 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 3086bdcd5754fe7ff1f5a5392e896dfec6156c87..57ae9c83df096df1fc9c03e9e82a32a7eae55542 100644 (file)
--- 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 <cerrno>

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index c838a48956ca4a6ea7149c82dc3d081035c507ae..ff6a5accc5c2ebcc052e81b59147da384810559b 100644 (file)
--- 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 <cerrno>

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index a8373c53a6ec4a0c40d4d4a4e5e8dc616fc9ddb3..e61646b25bab7d13d1bd93b9182658e94fa75632 100644 (file)
--- 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 d366b2d9e05eeb801f0d4f258cabb7d1f19ac1a3..32495a88af5bfd6120f658ad919e85076276da27 100644 (file)
--- 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 d5612a4e21d1aa3e14255f09240cddd0a683ca55..2fde2ed773fafa9ab980f86651fa398457ffc7bf 100644 (file)
--- 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 <cerrno>

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 5a9f8be73a9ba6ddf52b51d56f2e393565458913..6587619e99e04b556b23a1dc6ca2a464516a3f0d 100644 (file)
--- 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 05e4849c9440d1c01b1759fd78ac98bae47697fa..58689868da548bf012fc6d2279977225a4fbdc19 100644 (file)
--- 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 <cerrno>

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index a40fab21a637adb2042729184a015d2e58533c6f..5c5a15398292f66db9007590aa72be2e9406c693 100644 (file)
--- 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 57cd7829af7803d627c2491cf12d2d1ced74b493..327e12c239475cf04af1eb360a2618a5526c2b23 100644 (file)
--- 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 8c74e0f2e7ca4bb408759f331fbd0543bd6824dc..6d24a8586b6f324f8af1c4912de5de3ff6b5f17c 100644 (file)
--- 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 e41117201fcda93c14d84f430152e8b9edbd1d6a..f14f01a5794dbc35d5ce7c2b97bcad7d1bc5d25e 100644 (file)
--- 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 aa1e0fc2f6e2ab0de6f45ce6d06eda2d929cd3db..fa4048cd5d6bdf6f95518d01b83dd96e006b6643 100644 (file)
--- 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 578ddc7276b43de22ed4f79ccce48cd4b7ae6dbe..995cb2841aa551f0f5222577ca7caf529af87e5a 100644 (file)
--- 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 1cd22c7573796feee496eb3b57e52eeb5c10f604..40a05755a5888a5900f733532b1a365dd0336856 100644 (file)
--- 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 7af281cd4e949eeed44087116cd5b157dcfaae49..983e2206b24089e1fd32f300ed1985e8837a0465 100644 (file)
--- 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 8adbc19039d7f7c81640d31adc1fffed3fbab419..272c6883ee1d2faa0969dd181adb0a2bc0fae91e 100644 (file)
--- 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 536a32994dc776c7e174abffa563d3c9472c5c3a..2a7f7a99223dd27922e9859953064dc6b16935ff 100644 (file)
--- 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::CertValidationResponse> *Ssl::CertValidationHelper::HelperCache = NULL;

diff --git a/src/store.cc b/src/store.cc
index b23b22c50a47cf53c028acae4be204fe0baeaa64..b5e42419cb8f28529fba5265c26b6ba780a27976 100644 (file)
--- 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 fd96d046e76312d77b4bba8453909cfbb45bb450..b745ec64f0f37444476ed4dfdcbb503728525fd4 100644 (file)
--- 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 52a2ba03acdcc3cac6c114f79e92fa37d9d618de..f1f179b99704732cb6c7fba42b0ba9d955894c9e 100644 (file)
--- 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 31f44a948907f271d8e1dcb37ac0e4b9ca73d5af..2bfb75babc45f238c4bd878d50dd97d54cb14320 100644 (file)
--- 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 0b4aab97954d1da64b4660ec37633932e0a8d25b..fa4c3ceb111ae3bb072ec6c5387e2e237c54bc05 100644 (file)
--- 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 3f88d986fd017895e33be17279ffb088a0fc0530..e8da82424c01cbafe51bcedd81a0cbaa4d355418 100644 (file)
--- 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 <cstring>
 

diff --git a/src/tests/stub_store_search.cc b/src/tests/stub_store_search.cc
index 745e857baf9ff717aa4c473493ffeead63e1f680..fd9d1b0c1860470fc81eaee87403bca6daade6cd 100644 (file)
--- 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 b4883e3dd63286e217e0004a578732f1be682732..fc088ebb85847ce9220a87cc09e5db7a5adcfd99 100644 (file)
--- 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 06c462cb1ea886d030ae3f51e28e18126eb570ee..dd3427931041aa1664386134a5390a5c586d9d9c 100644 (file)
--- 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"