- introduce the scheduler_backend API

- introduce the scheduler_ramqueue backend
- remove all occurences of ramqueue outside of the ramqueue backend
- teach runner how to use the new API

it is now possible to write custom schedulers !

ok eric@, ok chl@

1 files changed, 1 insertions, 40 deletions

diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index e4ab391b840..5b61f8fc846 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.77 2012/01/24 12:20:18 eric Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.78 2012/01/28 11:33:07 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -44,7 +44,6 @@
 
 void usage(void);
 static void setup_env(struct smtpd *);
-static void show_sizes(void);
 static int show_command_output(struct imsg *);
 static int show_stats_output(struct imsg *);
 static void show_queue(enum queue_kind, int);
@@ -127,9 +126,6 @@ main(int argc, char *argv[])
 			break;
 		case SHOW_RUNQUEUE:
 			break;
-		case SHOW_SIZES:
-			show_sizes();
-			break;
 		default:
 			goto connected;
 		}
@@ -302,30 +298,6 @@ show_command_output(struct imsg *imsg)
 	return (1);
 }
 
-void
-show_sizes(void)
-{
-	/*
-	 * size _does_ matter.
-	 *
-	 * small changes to ramqueue and diskqueue structures may cause
-	 * large changes to memory and disk usage on busy/large hosts.
-	 *
-	 * this will help developers optimize memory/disk use, and help
-	 * admins understand how the ramqueue.size / ramqueue.size.max
-	 * stats are computed (smtpctl show stats).
-	 *
-	 * -- gilles@
-	 *
-	 */
-	printf("struct ramqueue: %zu\n", sizeof (struct ramqueue));
-	printf("struct ramqueue_host: %zu\n", sizeof (struct ramqueue_host));
-	printf("struct ramqueue_message: %zu\n", sizeof (struct ramqueue_message));
-	printf("struct ramqueue_envelope: %zu\n", sizeof (struct ramqueue_envelope));
-
-	printf("struct envelope: %zu\n", sizeof (struct envelope));
-}
-
 static void
 stat_print(int stat, int what)
 {
@@ -431,17 +403,6 @@ show_stats_output(struct imsg *imsg)
 	stat_print(STATS_RAMQUEUE_MESSAGE, STAT_MAXACTIVE);
 	stat_print(STATS_RAMQUEUE_ENVELOPE, STAT_MAXACTIVE);
 
-	printf("ramqueue.size=%zd\n",
-	    s[STATS_RAMQUEUE_HOST].active * sizeof(struct ramqueue_host) +
-	    s[STATS_RAMQUEUE_BATCH].active * sizeof(struct ramqueue_batch) +
-	    s[STATS_RAMQUEUE_MESSAGE].active * sizeof(struct ramqueue_message) +
-	    s[STATS_RAMQUEUE_ENVELOPE].active * sizeof(struct ramqueue_envelope));
-	printf("ramqueue.size.max=%zd\n",
-	    s[STATS_RAMQUEUE_HOST].maxactive * sizeof(struct ramqueue_host) +
-	    s[STATS_RAMQUEUE_BATCH].maxactive * sizeof(struct ramqueue_batch) +
-	    s[STATS_RAMQUEUE_MESSAGE].maxactive * sizeof(struct ramqueue_message) +
-	    s[STATS_RAMQUEUE_ENVELOPE].maxactive * sizeof(struct ramqueue_envelope));
-
 	printf("smtp.errors.delays=%zd\n", stats->smtp.delays);
 	printf("smtp.errors.linetoolong=%zd\n", stats->smtp.linetoolong);
 	printf("smtp.errors.read_eof=%zd\n", stats->smtp.read_eof);