[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r9996: Rename a couple of confusing fields (in tor/trunk: . src/or)
Author: nickm
Date: 2007-04-21 13:30:42 -0400 (Sat, 21 Apr 2007)
New Revision: 9996
Modified:
tor/trunk/
tor/trunk/ChangeLog
tor/trunk/src/or/Makefile.am
tor/trunk/src/or/connection.c
tor/trunk/src/or/or.h
Log:
r12482@catbus: nickm | 2007-04-21 13:30:24 -0400
Rename a couple of confusing fields
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r12482] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-04-21 17:26:12 UTC (rev 9995)
+++ tor/trunk/ChangeLog 2007-04-21 17:30:42 UTC (rev 9996)
@@ -98,6 +98,7 @@
don't get full any more.
- Make dns_resolve handle attaching connections to circuits properly,
so the caller doesn't have to.
+ - Rename wants_to_read and wants_to_write to read/write_blocked_on_bw.
Changes in version 0.1.2.12-rc - 2007-03-16
o Major bugfixes:
Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am 2007-04-21 17:26:12 UTC (rev 9995)
+++ tor/trunk/src/or/Makefile.am 2007-04-21 17:30:42 UTC (rev 9996)
@@ -35,8 +35,8 @@
svn info ../.. | \
sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.i \
|| true; \
- fi; \
- if test ! -f micro-revision.i -a x`which svk` != x; then\
+ else \
+ if test x`which svk` != x; then \
location=../..; \
rev=x; \
while test x$$rev = xx; do \
@@ -59,6 +59,7 @@
echo \"$$rev\" > micro-revision.i; \
fi; \
fi; \
+ fi; \
if test ! -f micro-revision.i; then \
echo '""' > micro-revision.i; \
fi
Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c 2007-04-21 17:26:12 UTC (rev 9995)
+++ tor/trunk/src/or/connection.c 2007-04-21 17:30:42 UTC (rev 9996)
@@ -1354,7 +1354,7 @@
return; /* all good, no need to stop it */
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
- conn->wants_to_read = 1;
+ conn->read_blocked_on_bw = 1;
connection_stop_reading(conn);
}
@@ -1380,7 +1380,7 @@
return; /* all good, no need to stop it */
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
- conn->wants_to_write = 1;
+ conn->write_blocked_on_bw = 1;
connection_stop_writing(conn);
}
@@ -1468,7 +1468,7 @@
}
}
- if (conn->wants_to_read == 1 /* it's marked to turn reading back on now */
+ if (conn->read_blocked_on_bw == 1 /* marked to turn reading back on now */
&& global_read_bucket > 0 /* and we're allowed to read */
&& (!connection_counts_as_relayed_traffic(conn) ||
global_relayed_read_bucket > 0) /* even if we're relayed traffic */
@@ -1478,18 +1478,18 @@
/* and either a non-cell conn or a cell conn with non-empty bucket */
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
"waking up conn (fd %d) for read", conn->s));
- conn->wants_to_read = 0;
+ conn->read_blocked_on_bw = 0;
connection_start_reading(conn);
}
- if (conn->wants_to_write == 1
+ if (conn->write_blocked_on_bw == 1
&& global_write_bucket > 0 /* and we're allowed to write */
&& (!connection_counts_as_relayed_traffic(conn) ||
global_relayed_write_bucket > 0)) {
/* even if we're relayed traffic */
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
"waking up conn (fd %d) for write", conn->s));
- conn->wants_to_write = 0;
+ conn->write_blocked_on_bw = 0;
connection_start_writing(conn);
}
}
@@ -1893,7 +1893,7 @@
log_debug(LD_NET,"wanted read.");
if (!connection_is_reading(conn)) {
connection_stop_writing(conn);
- conn->wants_to_write = 1;
+ conn->write_blocked_on_bw = 1;
/* we'll start reading again when the next second arrives,
* and then also start writing again.
*/
@@ -2540,14 +2540,14 @@
tor_assert(conn->s < 0);
if (conn->outbuf_flushlen > 0) {
- tor_assert(connection_is_writing(conn) || conn->wants_to_write ||
+ tor_assert(connection_is_writing(conn) || conn->write_blocked_on_bw ||
conn->edge_blocked_on_circ);
}
if (conn->hold_open_until_flushed)
tor_assert(conn->marked_for_close);
- /* XXXX check: wants_to_read, wants_to_write, s, conn_array_index,
+ /* XXXX check: read_blocked_on_bw, write_blocked_on_bw, s, conn_array_index,
* marked_for_close. */
/* buffers */
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2007-04-21 17:26:12 UTC (rev 9995)
+++ tor/trunk/src/or/or.h 2007-04-21 17:30:42 UTC (rev 9996)
@@ -748,11 +748,10 @@
/* The next fields are all one-bit booleans. Some are only applicable
* to connection subtypes, but we hold them here anyway, to save space.
* (Currently, they all fit into a single byte.) */
- /*XXXX020 rename wants_to_*; the names are misleading. */
- unsigned wants_to_read:1; /**< Boolean: should we start reading again once
- * the bandwidth throttler allows it? */
- unsigned wants_to_write:1; /**< Boolean: should we start writing again once
- * the bandwidth throttler allows reads? */
+ unsigned read_blocked_on_bw:1; /**< Boolean: should we start reading again
+ * once the bandwidth throttler allows it? */
+ unsigned write_blocked_on_bw:1; /**< Boolean: should we start writing again
+ * once the bandwidth throttler allows reads? */
unsigned hold_open_until_flushed:1; /**< Despite this connection's being
* marked for close, do we flush it
* before closing it? */