summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/control.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2012-07-09 09:57:54 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2012-07-09 09:57:54 +0000
commit8376ba1aa378f25b77149196ef2518e8c1a8620c (patch)
treedb875efbc41a3f1d307047c5921897b4d8173e66 /usr.sbin/smtpd/control.c
parent921a10fc6d6b3c123ef9f147c5e3ecc14b82cfdd (diff)
- runner is the terminology we used back when we had runqueues, we no
longer have them and runner is actually a scheduler so rename. - introduce scheduler_backend which does the same to scheduler than queue_backend does to queue and map_backend does to maps - remove all occurences of RUNNER and runner, replace them with SCHEDULER and scheduler ok eric@, ok chl@
Diffstat (limited to 'usr.sbin/smtpd/control.c')
-rw-r--r--usr.sbin/smtpd/control.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index ace689b4e11..875bf2a081e 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.64 2012/01/12 18:06:18 eric Exp $ */
+/* $OpenBSD: control.c,v 1.65 2012/07/09 09:57:53 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -109,7 +109,7 @@ control(void)
struct event ev_sigint;
struct event ev_sigterm;
struct peer peers [] = {
- { PROC_RUNNER, imsg_dispatch },
+ { PROC_SCHEDULER, imsg_dispatch },
{ PROC_QUEUE, imsg_dispatch },
{ PROC_SMTP, imsg_dispatch },
{ PROC_MFA, imsg_dispatch },
@@ -470,7 +470,7 @@ control_dispatch_ext(int fd, short event, void *arg)
imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0);
break;
- case IMSG_RUNNER_SCHEDULE: {
+ case IMSG_SCHEDULER_SCHEDULE: {
u_int64_t ullval;
if (euid)
@@ -478,14 +478,14 @@ control_dispatch_ext(int fd, short event, void *arg)
ullval = *(u_int64_t *)imsg.data;
- imsg_compose_event(env->sc_ievs[PROC_RUNNER], IMSG_RUNNER_SCHEDULE,
+ imsg_compose_event(env->sc_ievs[PROC_SCHEDULER], IMSG_SCHEDULER_SCHEDULE,
0, 0, -1, &ullval, sizeof(ullval));
imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0);
break;
}
- case IMSG_RUNNER_REMOVE: {
+ case IMSG_SCHEDULER_REMOVE: {
u_int64_t ullval;
if (euid)
@@ -493,7 +493,7 @@ control_dispatch_ext(int fd, short event, void *arg)
ullval = *(u_int64_t *)imsg.data;
- imsg_compose_event(env->sc_ievs[PROC_RUNNER], IMSG_RUNNER_REMOVE,
+ imsg_compose_event(env->sc_ievs[PROC_SCHEDULER], IMSG_SCHEDULER_REMOVE,
0, 0, -1, &ullval, sizeof(ullval));
imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1, NULL, 0);