aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-04 10:33:01 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-24 10:26:14 -0400
commite3af72647db51e99186b9f284066dedcdc8c10d6 (patch)
tree070853d6de71b2c3abb0fb0a2a321e084eefa82a /src
parent17ecd04fde2fd98b0cca3afb251b7173e22d3f42 (diff)
downloadtor-e3af72647db51e99186b9f284066dedcdc8c10d6.tar
tor-e3af72647db51e99186b9f284066dedcdc8c10d6.tar.gz
Expose the real maxmeminqueues via a GETINFO
That is, GETINFO limits/max-mem-in-queues
Diffstat (limited to 'src')
-rw-r--r--src/or/control.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 23e2054f9..4d41e10a9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1504,6 +1504,9 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
int max_fds=-1;
set_max_file_descriptors(0, &max_fds);
tor_asprintf(answer, "%d", max_fds);
+ } else if (!strcmp(question, "limits/max-mem-in-queues")) {
+ tor_asprintf(answer, U64_FORMAT,
+ U64_PRINTF_ARG(get_options()->MaxMemInQueues));
} else if (!strcmp(question, "dir-usage")) {
*answer = directory_dump_request_log();
} else if (!strcmp(question, "fingerprint")) {
@@ -2184,6 +2187,7 @@ static const getinfo_item_t getinfo_items[] = {
ITEM("process/user", misc,
"Username under which the tor process is running."),
ITEM("process/descriptor-limit", misc, "File descriptor limit."),
+ ITEM("limits/max-mem-in-queues", misc, "Actual limit on memory in queues"),
ITEM("dir-usage", misc, "Breakdown of bytes transferred over DirPort."),
PREFIX("desc-annotations/id/", dir, "Router annotations by hexdigest."),
PREFIX("dir/server/", dir,"Router descriptors as retrieved from a DirPort."),