]> git.ipfire.org Git - thirdparty/squid.git/commit - src/DiskIO/DiskDaemon/diskd.cc
Merge in second phase Disk IO refactoring, separating out the store and the io logic.
authorrobertc <>
Mon, 20 Dec 2004 23:30:12 +0000 (23:30 +0000)
committerrobertc <>
Mon, 20 Dec 2004 23:30:12 +0000 (23:30 +0000)
commitb9ae18aa6c61e83f0035239058127e2b4d0615b2
tree071391dc8c9eb9374fffdb926d6946ea25a91b3f
parenta0d0fd48a708ca20b2116843fb5c6fe69d6f9880
Merge in second phase Disk IO refactoring, separating out the store and the io logic.

Patches applied:

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-15
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-286

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-16
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-287

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-17
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-288

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-18
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-289

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-19
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-290

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-20
   Sync to HEAD.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-21
   More OOification.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-22
   Extraction of Disk IO modules.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-23
   Make diskd use the IO separation facility.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-24
   More diskd layering work.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-25
   Rename SwapDirOption to ConfigOption.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-26
   More diskd works.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-27
   Move diskd's IO logic to DiskIO/DiskDaemon

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-28
   Finish AUFS logic separation.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-29
   Add AIO Disk IO Module.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-30
   Fix double-free in coss.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-31
   AIO as a full IO Module.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-32
   Make IO usage flexible.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-33
   Make coss work with diskd.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-34
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-356

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-35
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-357

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-36
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-358

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-37
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-359

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-38
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-360

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-39
   Add missed files.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-40
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-361

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-41
   AIO stability work.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-42
   Coss tidyup.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-43
   Merge of robertc@squid-cache.org--squid/squid--HEAD--3.0

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-44
   Bugfix: coss aliasing error.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-45
   Merge http_version fix.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-46
   CossLog tweaks.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-47
   Remove all AIO dependencies from coss.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-48
   Merge from HEAD.

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-49
   merge from HEAD

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-50
   sync with MAIN

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-51
   merge in bugfix for auth double deletes in digest

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-52
   update from HEAD

 * robertc@squid-cache.org--squid/squid--disk-io--3.0--patch-53
   sync with HEAD
170 files changed:
Makefile.in
bootstrap.sh
configure
configure.in
contrib/Makefile.in
doc/Makefile.in
doc/release-notes/release-3.0.sgml
errors/Makefile.in
helpers/Makefile.in
helpers/basic_auth/LDAP/Makefile.in
helpers/basic_auth/MSNT/Makefile.in
helpers/basic_auth/Makefile.in
helpers/basic_auth/NCSA/Makefile.in
helpers/basic_auth/PAM/Makefile.in
helpers/basic_auth/SASL/Makefile.am
helpers/basic_auth/SASL/Makefile.in
helpers/basic_auth/SASL/sasl_auth.c
helpers/basic_auth/SMB/Makefile.in
helpers/basic_auth/YP/Makefile.in
helpers/basic_auth/getpwnam/Makefile.in
helpers/basic_auth/multi-domain-NTLM/Makefile.in
helpers/basic_auth/winbind/Makefile.in
helpers/digest_auth/Makefile.in
helpers/digest_auth/password/Makefile.in
helpers/external_acl/Makefile.in
helpers/external_acl/ip_user/Makefile.in
helpers/external_acl/ldap_group/Makefile.in
helpers/external_acl/unix_group/Makefile.in
helpers/external_acl/wbinfo_group/Makefile.in
helpers/external_acl/winbind_group/Makefile.in
helpers/ntlm_auth/Makefile.in
helpers/ntlm_auth/SMB/Makefile.in
helpers/ntlm_auth/SMB/smbval/Makefile.in
helpers/ntlm_auth/fakeauth/Makefile.in
helpers/ntlm_auth/no_check/Makefile.in
helpers/ntlm_auth/winbind/Makefile.in
icons/Makefile.in
include/Array.h
include/Stack.h
include/config.h
lib/GNUregex.c
lib/Makefile.am
lib/Makefile.in
scripts/Makefile.in
snmplib/Makefile.in
src/ACLARP.cc
src/ACLBrowser.cc
src/ACLChecklist.cc
src/ACLDomainData.cc
src/ACLReplyHeaderStrategy.h
src/ACLReplyMIMEType.h
src/ACLRequestHeaderStrategy.h
src/ACLTimeData.cc
src/ConfigOption.cc [new file with mode: 0644]
src/ConfigOption.h [new file with mode: 0644]
src/DiskIO/AIO/AIODiskFile.cc [new file with mode: 0644]
src/DiskIO/AIO/AIODiskFile.h [new file with mode: 0644]
src/DiskIO/AIO/AIODiskIOModule.cc [new file with mode: 0644]
src/DiskIO/AIO/AIODiskIOModule.h [new file with mode: 0644]
src/DiskIO/AIO/AIODiskIOStrategy.cc [new file with mode: 0644]
src/DiskIO/AIO/AIODiskIOStrategy.h [new file with mode: 0644]
src/DiskIO/AIO/async_io.h [moved from src/fs/coss/async_io.h with 61% similarity]
src/DiskIO/Blocking/BlockingDiskIOModule.cc [new file with mode: 0644]
src/DiskIO/Blocking/BlockingDiskIOModule.h [new file with mode: 0644]
src/DiskIO/Blocking/BlockingFile.cc [new file with mode: 0644]
src/DiskIO/Blocking/BlockingFile.h [new file with mode: 0644]
src/DiskIO/Blocking/BlockingIOStrategy.cc [new file with mode: 0644]
src/DiskIO/Blocking/BlockingIOStrategy.h [new file with mode: 0644]
src/DiskIO/Blocking/DiskIOBlocking.cc [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskdFile.cc [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskdFile.h [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskdIOStrategy.cc [new file with mode: 0644]
src/DiskIO/DiskDaemon/DiskdIOStrategy.h [new file with mode: 0644]
src/DiskIO/DiskDaemon/diomsg.h [moved from src/fs/diskd/dio.h with 67% similarity]
src/DiskIO/DiskDaemon/diskd.cc [moved from src/fs/diskd/diskd.cc with 94% similarity]
src/DiskIO/DiskFile.h [new file with mode: 0644]
src/DiskIO/DiskIOModule.cc [new file with mode: 0644]
src/DiskIO/DiskIOModule.h [new file with mode: 0644]
src/DiskIO/DiskIOStrategy.h [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreads.h [moved from src/fs/aufs/store_asyncufs.h with 51% similarity]
src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreadsDiskFile.h [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc [new file with mode: 0644]
src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h [new file with mode: 0644]
src/DiskIO/DiskThreads/aiops.cc [moved from src/fs/aufs/aiops.cc with 99% similarity]
src/DiskIO/DiskThreads/async_io.cc [moved from src/fs/aufs/async_io.cc with 50% similarity]
src/DiskIO/IORequestor.h [new file with mode: 0644]
src/DiskIO/ReadRequest.cc [moved from src/fs/ufs/IOModule.h with 76% similarity]
src/DiskIO/ReadRequest.h [new file with mode: 0644]
src/DiskIO/WriteRequest.cc [new file with mode: 0644]
src/DiskIO/WriteRequest.h [new file with mode: 0644]
src/ESI.cc
src/ESIParser.cc
src/Generic.h
src/HttpHeader.cc
src/HttpHeaderTools.cc
src/HttpReply.cc
src/Makefile.am
src/Makefile.in
src/SwapDir.cc
src/SwapDir.h
src/access_log.cc
src/auth/Makefile.in
src/auth/basic/auth_basic.cc
src/auth/digest/auth_digest.cc
src/auth/ntlm/auth_ntlm.cc
src/cache_cf.cc
src/cf.data.pre
src/cf_gen.cc
src/clientStream.cc
src/client_db.cc
src/client_side.cc
src/client_side_reply.cc
src/client_side_request.cc
src/comm.cc
src/comm_select.cc
src/defines.h
src/disk.cc
src/dns_internal.cc
src/dnsserver.cc
src/enums.h
src/errorpage.cc
src/forward.cc
src/fqdncache.cc
src/fs/Makefile.am
src/fs/Makefile.in
src/fs/aufs/StoreFSaufs.cc
src/fs/aufs/store_io_aufs.cc [deleted file]
src/fs/coss/CossSwapDir.h [new file with mode: 0644]
src/fs/coss/StoreFScoss.cc
src/fs/coss/StoreFScoss.h
src/fs/coss/async_io.cc [deleted file]
src/fs/coss/store_coss.h
src/fs/coss/store_dir_coss.cc
src/fs/coss/store_io_coss.cc
src/fs/diskd/StoreFSdiskd.cc
src/fs/diskd/store_diskd.h [deleted file]
src/fs/diskd/store_io_diskd.cc [deleted file]
src/fs/ufs/StoreFSufs.cc
src/fs/ufs/StoreFSufs.h
src/fs/ufs/store_dir_ufs.cc
src/fs/ufs/store_io_ufs.cc
src/fs/ufs/store_ufs.h [deleted file]
src/fs/ufs/ufscommon.cc [moved from src/ufscommon.cc with 99% similarity]
src/fs/ufs/ufscommon.cci [moved from src/ufscommon.cci with 96% similarity]
src/fs/ufs/ufscommon.h [moved from src/ufscommon.h with 69% similarity]
src/http.cc
src/ipc.cc
src/ipcache.cc
src/main.cc
src/peer_select.cc
src/protos.h
src/redirect.cc
src/refresh.cc
src/repl/Makefile.in
src/repl/heap/store_repl_heap.cc
src/squid.h
src/ssl_support.cc
src/stat.cc
src/store_client.cc
src/structs.h
src/test_cache_digest.cc
src/tools.cc
src/typedefs.h
src/win32.cc
test-suite/Makefile.in