add a host-tree and an envelope-tree in the ramqueue, they will be used to

improve scheduling and general ramqueue operations. unused yet

1 files changed, 9 insertions, 1 deletions

diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index 8c13c3b52cc..7fe2edcac83 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.61 2011/07/21 23:29:24 gilles Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.62 2011/08/16 19:02:03 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -307,14 +307,22 @@ show_stats_output(struct imsg *imsg)
 
 	printf("ramqueue.hosts=%zd\n", stats->ramqueue.hosts);
 	printf("ramqueue.batches=%zd\n", stats->ramqueue.batches);
+	printf("ramqueue.messages=%zd\n", stats->ramqueue.messages);
 	printf("ramqueue.envelopes=%zd\n", stats->ramqueue.envelopes);
 	printf("ramqueue.hosts.max=%zd\n", stats->ramqueue.hosts_max);
 	printf("ramqueue.batches.max=%zd\n", stats->ramqueue.batches_max);
+	printf("ramqueue.messages.max=%zd\n", stats->ramqueue.messages_max);
 	printf("ramqueue.envelopes.max=%zd\n", stats->ramqueue.envelopes_max);
 	printf("ramqueue.size=%zd\n",
 	    stats->ramqueue.hosts * sizeof(struct ramqueue_host) +
 	    stats->ramqueue.batches * sizeof(struct ramqueue_batch) +
+	    stats->ramqueue.messages * sizeof(struct ramqueue_message) +
 	    stats->ramqueue.envelopes * sizeof(struct ramqueue_envelope));
+	printf("ramqueue.size.max=%zd\n",
+	    stats->ramqueue.hosts_max * sizeof(struct ramqueue_host) +
+	    stats->ramqueue.batches_max * sizeof(struct ramqueue_batch) +
+	    stats->ramqueue.messages_max * sizeof(struct ramqueue_message) +
+	    stats->ramqueue.envelopes_max * sizeof(struct ramqueue_envelope));
 
 	printf("smtp.errors.delays=%zd\n", stats->smtp.delays);
 	printf("smtp.errors.linetoolong=%zd\n", stats->smtp.linetoolong);