[or-cvs] r9994: Track the number of connection_t separately from the number (in tor/trunk: . doc src/common src/or src/tools)
nickm at seul.org
nickm at seul.org
Sat Apr 21 17:24:34 UTC 2007
Author: nickm
Date: 2007-04-21 13:24:18 -0400 (Sat, 21 Apr 2007)
New Revision: 9994
Modified:
tor/trunk/
tor/trunk/ChangeLog
tor/trunk/doc/TODO
tor/trunk/src/common/compat.c
tor/trunk/src/common/compat.h
tor/trunk/src/common/util.c
tor/trunk/src/or/connection.c
tor/trunk/src/or/main.c
tor/trunk/src/tools/tor-resolve.c
Log:
r12759 at Kushana: nickm | 2007-04-20 08:47:20 -0400
Track the number of connection_t separately from the number of open sockets. It is already possible to have connections that do not count: resolving conns, for one. Once we move from socketpairs to linked conns, and once we do dns proxying, there will be lots of such connections.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/branches/socketpair [r12759] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/ChangeLog 2007-04-21 17:24:18 UTC (rev 9994)
@@ -17,6 +17,11 @@
in the network. Implements proposal 107, suggested by Kevin Bauer
and Damon McCoy.
+ o Minor fixes (resource management):
+ - Count the number of open sockets separately from the number of active
+ connection_t objects. This will let us avoid underusing our
+ allocated connection limit.
+
o Minor features (build):
- Make autoconf search for libevent, openssl, and zlib consistently.
- Update deprecated macros in configure.in
Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/doc/TODO 2007-04-21 17:24:18 UTC (rev 9994)
@@ -100,8 +100,22 @@
"who can change what" in local_routerstatus explicit. Make
local_routerstatus (or equivalent) subsume all places to go for "what
router is this?"
- - Remove socketpair-based bridges conns, and the word "bridge". (Use
+ . Remove socketpair-based bridges conns, and the word "bridge". (Use
shared (or connected) buffers for communication, rather than sockets.)
+ o Design
+ o Pick a term. The term is now "linked connection."
+ o Figure out how to ensure that handle_read is always called.
+ (Use event_active; keep active events in a list; use event_once
+ to make sure that we call the event base dispatch function enough.)
+ . Implement
+ o Count connections and sockets separately
+ - Allow connections with s == -1
+ - Add a linked_conn field; it should get marked when we're marked.
+ - Add a function to move bytes from buffer to buffer.
+ - Have handle_read dtrt for linked connections
+ - Have an activate/deactivate_linked_connection function.
+ - Have activated functions added to a list on first activation, and
+ that list made active before calls to event_loop.
- Generate torrc.{complete|sample}.in, tor.1.in, the HTML manual, and the
online config documentation from a single source.
- Have clients do TLS connection rotation less often than "every 10
Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/common/compat.c 2007-04-21 17:24:18 UTC (rev 9994)
@@ -468,6 +468,48 @@
return 0;
}
+/** Count of number of sockets currently open. (Undercounts sockets opened by
+ * eventdns and libevent.) */
+static int n_sockets_open = 0;
+
+/** As close(), but guaranteed to work for sockets across platforms (including
+ * Windows, where close()ing a socket doesn't work. */
+void
+tor_close_socket(int s)
+{
+ /* On Windows, you have to call close() on fds returned by open(),
+ * and closesocket() on fds returned by socket(). On Unix, everything
+ * gets close()'d. We abstract this difference by always using
+ * tor_close_socket to close sockets, and always using close() on
+ * files.
+ */
+#ifdef USE_BSOCKETS
+ bclose(s);
+#elif defined(MS_WINDOWS)
+ closesocket(s);
+#else
+ close(s);
+#endif
+ --n_sockets_open;
+}
+
+/** As socket(), but counts the number of open sockets. */
+int
+tor_open_socket(int domain, int type, int protocol)
+{
+ int s = socket(domain, type, protocol);
+ if (s >= 0)
+ ++n_sockets_open;
+ return s;
+}
+
+/** Return the number of sockets we currently have opened. */
+int
+get_n_open_sockets(void)
+{
+ return n_sockets_open;
+}
+
/** Turn <b>socket</b> into a nonblocking socket.
*/
void
@@ -537,7 +579,7 @@
return -EINVAL;
}
- listener = socket(AF_INET, type, 0);
+ listener = tor_open_socket(AF_INET, type, 0);
if (listener < 0)
return -tor_socket_errno(-1);
memset(&listen_addr, 0, sizeof(listen_addr));
@@ -550,7 +592,7 @@
if (listen(listener, 1) == -1)
goto tidy_up_and_fail;
- connector = socket(AF_INET, type, 0);
+ connector = tor_open_socket(AF_INET, type, 0);
if (connector < 0)
goto tidy_up_and_fail;
/* We want to find out the port number to connect to. */
Modified: tor/trunk/src/common/compat.h
===================================================================
--- tor/trunk/src/common/compat.h 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/common/compat.h 2007-04-21 17:24:18 UTC (rev 9994)
@@ -213,20 +213,11 @@
#endif
/* ===== Net compatibility */
-#ifdef USE_BSOCKETS
-#define tor_close_socket(s) bclose(s)
-#elif defined(MS_WINDOWS)
-/** On Windows, you have to call close() on fds returned by open(),
- * and closesocket() on fds returned by socket(). On Unix, everything
- * gets close()'d. We abstract this difference by always using
- * tor_close_socket to close sockets, and always using close() on
- * files.
- */
-#define tor_close_socket(s) closesocket(s)
-#else
-#define tor_close_socket(s) close(s)
-#endif
+void tor_close_socket(int s);
+int tor_open_socket(int domain, int type, int protocol);
+int get_n_open_sockets(void);
+
#ifdef USE_BSOCKETS
#define tor_socket_send(s, buf, len, flags) bsend(s, buf, len, flags)
#define tor_socket_recv(s, buf, len, flags) brecv(s, buf, len, flags)
Modified: tor/trunk/src/common/util.c
===================================================================
--- tor/trunk/src/common/util.c 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/common/util.c 2007-04-21 17:24:18 UTC (rev 9994)
@@ -1914,7 +1914,7 @@
tor_assert(addr);
*addr = 0;
- sock = socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP);
+ sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP);
if (sock < 0) {
int e = tor_socket_errno(-1);
log_fn(severity, LD_NET, "unable to create socket: %s",
Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/or/connection.c 2007-04-21 17:24:18 UTC (rev 9994)
@@ -613,7 +613,16 @@
log_notice(LD_NET, "Opening %s on %s:%d",
conn_type_to_string(type), address, usePort);
- s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (get_n_open_sockets() >= get_options()->_ConnLimit-1) {
+ int n_conns = get_n_open_sockets();
+ log_warn(LD_NET,"Failing because we have %d connections already. Please "
+ "raise your ulimit -n.", n_conns);
+ control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
+ n_conns);
+ return NULL;
+ }
+
+ s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
if (s < 0) {
log_warn(LD_NET,"Socket creation failed.");
goto err;
@@ -853,7 +862,16 @@
struct sockaddr_in dest_addr;
or_options_t *options = get_options();
- s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (get_n_open_sockets() >= get_options()->_ConnLimit-1) {
+ int n_conns = get_n_open_sockets();
+ log_warn(LD_NET,"Failing because we have %d connections already. Please "
+ "raise your ulimit -n.", n_conns);
+ control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
+ n_conns);
+ return -1;
+ }
+
+ s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
if (s < 0) {
log_warn(LD_NET,"Error creating network socket: %s",
tor_socket_strerror(tor_socket_errno(-1)));
Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/or/main.c 2007-04-21 17:24:18 UTC (rev 9994)
@@ -68,6 +68,7 @@
static int signewnym_is_pending = 0;
/** Array of all open connections. The first n_conns elements are valid. */
+/*XXXX020 Should we just use a smartlist here? */
static connection_t *connection_array[MAXCONNECTIONS+1] =
{ NULL };
/** List of connections that have been marked for close and need to be freed
@@ -156,15 +157,12 @@
tor_assert(conn);
tor_assert(conn->s >= 0);
- if (n_conns >= get_options()->_ConnLimit-1) {
- log_warn(LD_NET,"Failing because we have %d connections already. Please "
- "raise your ulimit -n.", n_conns);
- control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
- n_conns);
+ tor_assert(conn->conn_array_index == -1); /* can only connection_add once */
+ if (n_conns == MAXCONNECTIONS) {
+ log_warn(LD_BUG, "Unable to add a connection; MAXCONNECTIONS is set too "
+ "low. This is a bug; tell the developers.");
return -1;
}
-
- tor_assert(conn->conn_array_index == -1); /* can only connection_add once */
conn->conn_array_index = n_conns;
connection_array[n_conns] = conn;
Modified: tor/trunk/src/tools/tor-resolve.c
===================================================================
--- tor/trunk/src/tools/tor-resolve.c 2007-04-20 17:17:13 UTC (rev 9993)
+++ tor/trunk/src/tools/tor-resolve.c 2007-04-21 17:24:18 UTC (rev 9994)
@@ -153,7 +153,7 @@
*result_addr = 0;
*result_hostname = NULL;
- s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
if (s<0) {
log_sock_error("creating_socket", -1);
return -1;
More information about the tor-commits
mailing list