-
/*
- * $Id: fd.cc,v 1.61 2008/03/02 13:32:24 serassio Exp $
- *
- * DEBUG: section 51 Filedescriptor Functions
- * AUTHOR: Duane Wessels
- *
- * 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.
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
*
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
+/* DEBUG: section 51 Filedescriptor Functions */
+
#include "squid.h"
+#include "comm/Loops.h"
+#include "Debug.h"
+#include "fatal.h"
+#include "fd.h"
#include "fde.h"
+#include "globals.h"
+#include "profiler/Profiler.h"
#include "SquidTime.h"
-#include "Debug.h"
+
+// Solaris and possibly others lack MSG_NOSIGNAL optimization
+// TODO: move this into compat/? Use a dedicated compat file to avoid dragging
+// sys/socket.h into the rest of Squid??
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
int default_read_method(int, char *, int);
int default_write_method(int, const char *, int);
-#ifdef _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
int socket_read_method(int, char *, int);
int socket_write_method(int, const char *, int);
int file_read_method(int, char *, int);
int file_write_method(int, const char *, int);
+#else
+int msghdr_read_method(int, char *, int);
+int msghdr_write_method(int, const char *, int);
#endif
const char *fdTypeStr[] = {
"File",
"Socket",
"Pipe",
+ "MsgHdr",
"Unknown"
};
assert(!opening);
while (Biggest_FD >= 0 && !fd_table[Biggest_FD].flags.open)
- Biggest_FD--;
+ --Biggest_FD;
}
void
{
fde *F = &fd_table[fd];
+ assert(fd >= 0);
+ assert(F->flags.open);
+
if (F->type == FD_FILE) {
assert(F->read_handler == NULL);
assert(F->write_handler == NULL);
}
debugs(51, 3, "fd_close FD " << fd << " " << F->desc);
- commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0);
- commSetSelect(fd, COMM_SELECT_WRITE, NULL, NULL, 0);
- F->flags.open = 0;
+ Comm::SetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0);
+ Comm::SetSelect(fd, COMM_SELECT_WRITE, NULL, NULL, 0);
+ F->flags.open = false;
fdUpdateBiggest(fd, 0);
- Number_FD--;
+ --Number_FD;
*F = fde();
}
-#ifdef _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
int
socket_read_method(int fd, char *buf, int len)
return i;
}
+int
+msghdr_read_method(int fd, char *buf, int)
+{
+ PROF_start(read);
+ const int i = recvmsg(fd, reinterpret_cast<msghdr*>(buf), MSG_DONTWAIT);
+ PROF_stop(read);
+ return i;
+}
+
+int
+msghdr_write_method(int fd, const char *buf, int len)
+{
+ PROF_start(write);
+ const int i = sendmsg(fd, reinterpret_cast<const msghdr*>(buf), MSG_NOSIGNAL);
+ PROF_stop(write);
+ return i > 0 ? len : i; // len is imprecise but the caller expects a match
+}
+
#endif
void
F = &fd_table[fd];
if (F->flags.open) {
- debugs(51, 1, "WARNING: Closing open FD " << std::setw(4) << fd);
+ debugs(51, DBG_IMPORTANT, "WARNING: Closing open FD " << std::setw(4) << fd);
fd_close(fd);
}
assert(!F->flags.open);
debugs(51, 3, "fd_open() FD " << fd << " " << desc);
F->type = type;
- F->flags.open = 1;
+ F->flags.open = true;
F->epoll_state = 0;
-#ifdef _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
F->win32.handle = _get_osfhandle(fd);
}
#else
- F->read_method = &default_read_method;
+ switch (type) {
+
+ case FD_MSGHDR:
+ F->read_method = &msghdr_read_method;
+ F->write_method = &msghdr_write_method;
+ break;
- F->write_method = &default_write_method;
+ default:
+ F->read_method = &default_read_method;
+ F->write_method = &default_write_method;
+ break;
+ }
#endif
if (desc)
xstrncpy(F->desc, desc, FD_DESC_SZ);
- Number_FD++;
+ ++Number_FD;
}
void
int i;
fde *F;
- for (i = 0; i < Squid_MaxFD; i++) {
+ for (i = 0; i < Squid_MaxFD; ++i) {
F = &fd_table[i];
if (!F->flags.open)
if (i == fileno(debug_log))
continue;
- debugs(51, 1, "Open FD "<< std::left<< std::setw(10) <<
+ debugs(51, DBG_IMPORTANT, "Open FD "<< std::left<< std::setw(10) <<
(F->bytes_read && F->bytes_written ? "READ/WRITE" :
F->bytes_read ? "READING" : F->bytes_written ? "WRITING" :
"UNSTARTED") <<
/*
* Calculate a new reserve, based on current usage and a small extra
*/
- newReserve = Squid_MaxFD - Number_FD + XMIN(25, Squid_MaxFD / 16);
+ newReserve = Squid_MaxFD - Number_FD + min(25, Squid_MaxFD / 16);
if (newReserve <= RESERVED_FD)
return;
- x = Squid_MaxFD - 20 - XMIN(25, Squid_MaxFD / 16);
+ x = Squid_MaxFD - 20 - min(25, Squid_MaxFD / 16);
if (newReserve > x) {
/* perhaps this should be fatal()? -DW */
- debugs(51, 0, "WARNING: This machine has a serious shortage of filedescriptors.");
+ debugs(51, DBG_CRITICAL, "WARNING: This machine has a serious shortage of filedescriptors.");
newReserve = x;
}
- if (Squid_MaxFD - newReserve < XMIN(256, Squid_MaxFD / 2))
+ if (Squid_MaxFD - newReserve < min(256, Squid_MaxFD / 2))
fatalf("Too few filedescriptors available in the system (%d usable of %d).\n", Squid_MaxFD - newReserve, Squid_MaxFD);
- debugs(51, 0, "Reserved FD adjusted from " << RESERVED_FD << " to " << newReserve << " due to failures");
+ debugs(51, DBG_CRITICAL, "Reserved FD adjusted from " << RESERVED_FD << " to " << newReserve <<
+ " due to failures (" << (Squid_MaxFD - newReserve) << "/" << Squid_MaxFD << " file descriptors available)");
RESERVED_FD = newReserve;
}
+
projects / thirdparty / squid.git / blobdiff