]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Moved fd.cc-related prototypes to new fd.h
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 22 Aug 2012 10:49:28 +0000 (12:49 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 22 Aug 2012 10:49:28 +0000 (12:49 +0200)
35 files changed:
src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
src/DiskIO/DiskThreads/CommIO.cc
src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
src/DiskIO/IpcIo/IpcIoFile.cc
src/Makefile.am
src/Server.cc
src/client_side.cc
src/client_side_reply.cc
src/client_side_request.cc
src/comm.cc
src/comm/ConnOpener.cc
src/comm/ModPoll.cc
src/comm/TcpAcceptor.cc
src/comm/Write.cc
src/disk.cc
src/dns_internal.cc
src/fd.cc
src/fd.h [new file with mode: 0644]
src/forward.cc
src/ftp.cc
src/gopher.cc
src/helper.cc
src/http.cc
src/icmp/IcmpSquid.cc
src/icp_v2.cc
src/ipc.cc
src/ipc_win32.cc
src/log/ModStdio.cc
src/log/ModTcp.cc
src/log/ModUdp.cc
src/main.cc
src/pconn.cc
src/protos.h
src/send-announce.cc
src/unlinkd.cc

index 2f1b4952c72726a72eca35b459a0b76debb1f4c6..41f91ebe4c3749a2069c4ad0e5ca71a3e8648238 100644 (file)
@@ -40,6 +40,7 @@
 #include "DiskIO/DiskFile.h"
 #include "DiskdFile.h"
 #include "diomsg.h"
+#include "fd.h"
 #include "protos.h"
 #include "Store.h"
 #include "StatCounters.h"
index 9de30912b0f39201a4403cb81b752dd214444bd7..d975942c6dd65c22f96f613b21c72f6012548ed2 100644 (file)
@@ -35,6 +35,7 @@
 #include "squid.h"
 #include "comm/Loops.h"
 #include "DiskIO/DiskThreads/CommIO.h"
+#include "fd.h"
 #include "globals.h"
 #include "protos.h"
 
index 89ee7df28ca91609c8c83e2dc8a1d28277915ce5..6cb8f45331d18288dc1492ca5cc7198fecc6807a 100644 (file)
@@ -40,6 +40,7 @@
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
+#include "fd.h"
 #include "Generic.h"
 #include "globals.h"
 #include "StatCounters.h"
index cac9fc982eab52ba5736810941e7460f531b0334..fb00ba9c4ad06f28f61d1f9479dac1bd37191a4d 100644 (file)
@@ -12,6 +12,7 @@
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
 #include "disk.h"
+#include "fd.h"
 #include "globals.h"
 #include "ipc/mem/Pages.h"
 #include "ipc/Messages.h"
index 679258a4d4a59de25953a5d93a7ba8b6b1fd736b..c3fa6f7072f1f744b8ee9f37d530a6ff39875a02 100644 (file)
@@ -330,6 +330,7 @@ squid_SOURCES = \
        ExternalACLEntry.h \
        FadingCounter.h \
        FadingCounter.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        fde.h \
@@ -714,6 +715,7 @@ ufsdump_SOURCES = \
        HttpRequestMethod.cc \
        RemovalPolicy.cc \
        $(WIN32_SOURCE) \
+       fd.h \
        tests/stub_fd.cc
 ufsdump_LDADD = \
        $(AUTH_ACL_LIBS) \
@@ -1224,6 +1226,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_DelayId.cc \
        tests/stub_DiskIOModule.cc \
        tests/stub_errorpage.cc \
+       fd.h \
        tests/stub_fd.cc \
        tests/stub_HttpRequest.cc \
        tests/stub_HttpReply.cc \
@@ -1359,6 +1362,7 @@ tests_testCacheManager_SOURCES = \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
@@ -1529,6 +1533,7 @@ tests_testDiskIO_SOURCES = \
        ETag.cc \
        EventLoop.cc \
        event.cc \
+       fd.h \
        fd.cc \
        FileMap.h \
        filemap.cc \
@@ -1716,6 +1721,7 @@ tests_testEvent_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
@@ -1928,6 +1934,7 @@ tests_testEventLoop_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
@@ -2137,6 +2144,7 @@ tests_test_http_range_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
@@ -2396,6 +2404,7 @@ tests_testHttpRequest_SOURCES = \
        ETag.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        forward.cc \
@@ -2623,6 +2632,7 @@ tests_testStore_SOURCES= \
        tests/stub_debug.cc \
        tests/stub_DiskIOModule.cc \
        tests/stub_errorpage.cc \
+       fd.h \
        tests/stub_fd.cc \
        tests/stub_helper.cc \
        tests/stub_HelperChildConfig.cc \
@@ -2773,6 +2783,7 @@ tests_testUfs_SOURCES = \
        tests/stub_libformat.cc \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
+       fd.h \
        fd.cc \
        client_db.h \
        disk.h \
@@ -2921,6 +2932,7 @@ tests_testRock_SOURCES = \
        ETag.cc \
        EventLoop.cc \
        event.cc \
+       fd.h \
        fd.cc \
        FileMap.h \
        filemap.cc \
@@ -3064,6 +3076,7 @@ tests_testCoss_SOURCES = \
        tests/stub_pconn.cc \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
+       fd.h \
        fd.cc \
        disk.h \
        disk.cc \
@@ -3208,6 +3221,7 @@ tests_testNull_SOURCES = \
        tests/stub_internal.cc \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
+       fd.h \
        fd.cc \
        disk.h \
        disk.cc \
@@ -3376,6 +3390,7 @@ tests_testURL_SOURCES = \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
index 43a95ec9ed6f03c53d31256be0ebb2acce4cb60e..7ab82aa5890634710b2559540f176659115b92a1 100644 (file)
@@ -38,6 +38,7 @@
 #include "comm/Connection.h"
 #include "comm/forward.h"
 #include "comm/Write.h"
+#include "fd.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
 #include "HttpReply.h"
index a607cb357c535ef1082a57559effda35191697c3..daf94cfd579fae245b3be43bd394e4f695880bc7 100644 (file)
 #include "CommCalls.h"
 #include "errorpage.h"
 #include "eui/Config.h"
+#include "fd.h"
 #include "fde.h"
 #include "forward.h"
 #include "fqdncache.h"
index 75eff7c1ba938e306fa73bd0969d17b90696e364..9995f5feb20aba6207e55a8a4ec030db57c0beda 100644 (file)
@@ -40,6 +40,7 @@
 #include "clientStream.h"
 #include "dlink.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "fde.h"
 #include "format/Token.h"
 #include "forward.h"
index db2c6db82c5b7d21dbd228f1a0b35ceb2e47caa4..861ece467e7521d94ce2b9aeda4a902a5b769544 100644 (file)
@@ -56,6 +56,7 @@
 #include "compat/inet_pton.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "fde.h"
 #include "format/Token.h"
 #include "gopher.h"
index 34efd3c9e2e936cea8e8b7d8aede5915b3c7ab47..77cda47a137b26a918c31d0bd0188deb60966210 100644 (file)
@@ -48,6 +48,7 @@
 #include "compat/cmsg.h"
 #include "DescriptorSet.h"
 #include "event.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
index 4a5d6eb5857d70f4d189c9b587ce32fe01b66b52..7d708124fff0fbb3fd7ab894e54d9680c1f87347 100644 (file)
@@ -7,6 +7,7 @@
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "comm.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
index 6a6cbf0af806a2e74206f5f1d1eb295765c21216..a47f28d0c84c5a5d8c221254cef29e007650a390 100644 (file)
@@ -36,6 +36,7 @@
 #include "anyp/PortCfg.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "ICP.h"
index e7c362ea712c6aaf2ab97032ce07cd0098cf1eb0..371cbbc7a07e859128207ea7a5c4efa3b2f2b845 100644 (file)
@@ -41,6 +41,7 @@
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "comm/TcpAcceptor.h"
+#include "fd.h"
 #include "fde.h"
 #include "ip/Intercept.h"
 #include "profiler/Profiler.h"
index 20c2f967b28ad70ff3a98acea602dd8ca1307f88..a9db6177dd92db519708f14aec3c8db91110e48b 100644 (file)
@@ -2,6 +2,7 @@
 #include "comm/Connection.h"
 #include "comm/IoCallback.h"
 #include "comm/Write.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "MemBuf.h"
index 4dc055019004130519de74eb93432384810d5701..3b71f51deb9aea74f98315b3770f9705df96f692 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "squid.h"
 #include "comm/Loops.h"
+#include "fd.h"
 #include "fde.h"
 #include "Mem.h"
 #include "MemBuf.h"
index 4242ffd6dad4b8fb15429dec1f719ea3f73cd90b..cebfe5e33789d84896b71983f457c7f20a6b2492 100644 (file)
@@ -40,6 +40,7 @@
 #include "comm/Loops.h"
 #include "comm/Write.h"
 #include "event.h"
+#include "fd.h"
 #include "fde.h"
 #include "ip/tools.h"
 #include "Mem.h"
index 29a9164ab407d484bd4ef30f319de51ebae7bbf2..5bfdaee65d720eda0a3a87e43aa927e5fbb1d64c 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "comm/Loops.h"
 #include "Debug.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "profiler/Profiler.h"
diff --git a/src/fd.h b/src/fd.h
new file mode 100644 (file)
index 0000000..19b898d
--- /dev/null
+++ b/src/fd.h
@@ -0,0 +1,45 @@
+/*
+ * DEBUG: section 
+ * AUTHOR: 
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+
+#ifndef SQUID_FD_H_
+#define SQUID_FD_H_
+
+extern void fd_close(int fd);
+extern void fd_open(int fd, unsigned int type, const char *);
+extern void fd_note(int fd, const char *);
+extern void fd_bytes(int fd, int len, unsigned int type);
+extern void fdDumpOpen(void);
+extern int fdUsageHigh(void);
+extern void fdAdjustReserved(void);
+
+#endif /* SQUID_FD_H_ */
index 5da0ede1ab3ac93e7743c5d99847b07e0e319e77..ca1487c07fca3d8db7a10e55326cd5dceec373db 100644 (file)
@@ -44,6 +44,7 @@
 #include "CommCalls.h"
 #include "errorpage.h"
 #include "event.h"
+#include "fd.h"
 #include "fde.h"
 #include "forward.h"
 #include "globals.h"
index a1de50e8004e0cdfa48cebf556d4fa54e3466fd5..4aeaecb30c78570d6e7c8aafac7dd070c90ed855 100644 (file)
@@ -40,6 +40,7 @@
 #include "CommCalls.h"
 #include "compat/strtoll.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "fde.h"
 #include "forward.h"
 #include "html_quote.h"
index 2ca02cd46757522e4dd931efc46fd065287924e6..23bece4d825e3fc913774edf063fc9fcf71499ca 100644 (file)
@@ -37,6 +37,7 @@
 #include "comm.h"
 #include "comm/Write.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "forward.h"
 #include "html_quote.h"
 #include "HttpReply.h"
index 48eb016e9db95ebcaab1b402fc2b7ff870c54045..9ee2a8b5bf89e9ff7e21119cf5d5e52c89df57f8 100644 (file)
@@ -37,6 +37,7 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
+#include "fd.h"
 #include "format/Quoting.h"
 #include "helper.h"
 #include "Mem.h"
index a679c71c06a5ef146f0b51a3691b51520c2729a1..6b5a547663538642ade0722292129211f96aa62d 100644 (file)
@@ -48,6 +48,7 @@
 #include "comm/Write.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "fde.h"
 #include "HttpControlMsg.h"
 #include "http.h"
index 7a8b43dca4b4b7782079a50f303228a34e05ecf2..c61c07a7255d980901f1e12f0acedb601f1d88fa 100644 (file)
@@ -35,6 +35,7 @@
 #include "squid.h"
 #include "comm.h"
 #include "comm/Loops.h"
+#include "fd.h"
 #include "icmp/IcmpSquid.h"
 #include "icmp/net_db.h"
 #include "ip/tools.h"
index 07feaf38773fede41b0b90fdd8bbc41ec26fdd2b..4828ff0dd1e880a42a65116a02e2be7f35b42545 100644 (file)
@@ -44,6 +44,7 @@
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "comm/UdpOpenDialer.h"
+#include "fd.h"
 #include "HttpRequest.h"
 #include "icmp/net_db.h"
 #include "ICP.h"
index 9f0cb0cdab7bb84542192577ab0aab47a3fdd485..adb493a65ce685c45bc577d81294ff0f9da2e22e 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "squid.h"
 #include "comm/Connection.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "ip/Address.h"
index 684742e2e25069e0cf9a33692c691aef3e0660ad..bd42e38d986b06fb6f6b6c19d94cd852d69470f1 100644 (file)
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "cache_cf.h"
 #include "comm.h"
+#include "fd.h"
 #include "fde.h"
 #include "ip/Address.h"
 #include "rfc1738.h"
index abe76f073888e746c4c63535a12e9a2ea5754fb2..1a8c6206cd59e3d86c055fd950ff4741a80bc45a 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "squid.h"
 #include "disk.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "log/File.h"
index 0d460b0d8e73f92087b165a166da0679f578cde5..9b8675e3fb08f895dec3090c7039b039165d33a2 100644 (file)
@@ -35,6 +35,7 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "disk.h"
+#include "fd.h"
 #include "log/File.h"
 #include "log/ModTcp.h"
 #include "Parsing.h"
index 15b3115cd559ace7a009b7fad069ceb86be91603..29c8422ac08c45bbe180b9935b76c58fd5593a29 100644 (file)
@@ -34,6 +34,7 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "disk.h"
+#include "fd.h"
 #include "log/File.h"
 #include "log/ModUdp.h"
 #include "Parsing.h"
index 502da17b9590e37f97eec7318469894cb46fbb68..eb0a33060344fa5d6d8aa15003cd3cfa1d50cc3e 100644 (file)
@@ -52,6 +52,7 @@
 #include "event.h"
 #include "EventLoop.h"
 #include "ExternalACL.h"
+#include "fd.h"
 #include "format/Token.h"
 #include "forward.h"
 #include "fs/Module.h"
index a987c4b31d0a4d80db741fb64194eb0846ca56e1..a57f6c3ffce6483db6cf0a350c929272dbe23e7f 100644 (file)
@@ -35,6 +35,7 @@
 #include "squid.h"
 #include "comm.h"
 #include "comm/Connection.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "mgr/Registration.h"
index 8c92295947a49d516de150bb581da467b1760436..6f318fd1ba4e163099809f6dde5a0e52ad57ca6a 100644 (file)
@@ -52,14 +52,6 @@ class ClientInfo;
 #endif
 
 
-extern void fd_close(int fd);
-extern void fd_open(int fd, unsigned int type, const char *);
-extern void fd_note(int fd, const char *);
-extern void fd_bytes(int fd, int len, unsigned int type);
-extern void fdDumpOpen(void);
-extern int fdUsageHigh(void);
-extern void fdAdjustReserved(void);
-
 class FwdState;
 
 /**
index 4560e89d27523fd1d3e5494ce34b7bca908bd5e1..ea2a6570c465bd1d8936df5904e51842109b6ca7 100644 (file)
@@ -37,6 +37,7 @@
 #include "comm/Connection.h"
 #include "disk.h"
 #include "event.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "ICP.h"
index 8428bf04bb263b129f9673889b35b4beadcddb02..c36a1655eab3edd6ff52d4ee00375426e721b615 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "disk.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "xusleep.h"