/*
- * $Id$
- *
- * DEBUG: section 05 Socket Functions
- *
- * 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-2021 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 05 Socket Functions */
+
/*
* This code was originally written by Benno Rice and hacked on quite
* a bit by Adrian. Adrian then took it to the hybrid-ircd project to use
#include "squid.h"
#if USE_KQUEUE
-
-#include "squid-old.h"
#include "comm/Loops.h"
#include "fde.h"
-#include "Store.h"
+#include "globals.h"
#include "SquidTime.h"
+#include "StatCounters.h"
+#include "Store.h"
+#include <cerrno>
#if HAVE_SYS_EVENT_H
#include <sys/event.h>
#endif
kqoff = 0;
} else {
- kqoff++;
+ ++kqoff;
}
}
}
-
-
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
/* Public functions */
-
/*
* comm_select_init
*
{
fde *F = &fd_table[fd];
assert(fd >= 0);
- assert(F->flags.open);
+ assert(F->flags.open || (!handler && !client_data && !timeout));
debugs(5, 5, HERE << "FD " << fd << ", type=" << type <<
", handler=" << handler << ", client_data=" << client_data <<
", timeout=" << timeout);
if (type & COMM_SELECT_READ) {
+ if (F->flags.read_pending)
+ kq_update_events(fd, EVFILT_WRITE, handler);
+
kq_update_events(fd, EVFILT_READ, handler);
+
F->read_handler = handler;
F->read_data = client_data;
}
}
-void
-Comm::ResetSelect(int fd)
-{
- fde *F = &fd_table[fd];
- if (F->read_handler) {
- kq_update_events(fd, EVFILT_READ, (PF *)1);
- }
- if (F->write_handler) {
- kq_update_events(fd, EVFILT_WRITE, (PF *)1);
- }
-}
-
/*
* Check all connections for new connections and input data that is to be
* processed. Also check for connections with data queued and whether we can
* events.
*/
-comm_err_t
+Comm::Flag
Comm::DoSelect(int msec)
{
int num, i;
getCurrentTime();
- return COMM_ERROR;
+ return Comm::COMM_ERROR;
/* NOTREACHED */
}
getCurrentTime();
if (num == 0)
- return COMM_OK; /* No error.. */
+ return Comm::OK; /* No error.. */
- for (i = 0; i < num; i++) {
+ for (i = 0; i < num; ++i) {
int fd = (int) ke[i].ident;
PF *hdl = NULL;
fde *F = &fd_table[fd];
continue; /* XXX! */
}
- switch (ke[i].filter) {
-
- case EVFILT_READ:
-
+ if (ke[i].filter == EVFILT_READ || F->flags.read_pending) {
if ((hdl = F->read_handler) != NULL) {
F->read_handler = NULL;
- F->flags.read_pending = 0;
hdl(fd, F->read_data);
}
+ }
- break;
-
- case EVFILT_WRITE:
-
+ if (ke[i].filter == EVFILT_WRITE) {
if ((hdl = F->write_handler) != NULL) {
F->write_handler = NULL;
hdl(fd, F->write_data);
}
+ }
- break;
-
- default:
+ if (ke[i].filter != EVFILT_WRITE && ke[i].filter != EVFILT_READ) {
/* Bad! -- adrian */
- debugs(5, 1, "comm_select: kevent returned " << ke[i].filter << "!");
- break;
+ debugs(5, DBG_IMPORTANT, "comm_select: kevent returned " << ke[i].filter << "!");
}
}
- return COMM_OK;
+ return Comm::OK;
}
void
}
#endif /* USE_KQUEUE */
+