diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2014-07-07 09:11:25 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2014-07-07 09:11:25 +0000 |
| commit | 5c370d639c6167e7752bf3d335f203e69207fbae (patch) | |
| tree | 6a28d1a41f2cdf16efd5a3d8665d59ccb870dde2 /usr.sbin | |
| parent | fdde723f789a176d8eb50f810fc60ba359c50e04 (diff) | |
Allow to enable profiling at runtime and fix timings output.
ok gilles@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/queue_backend.c | 7 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c index a57e4d1b419..27a0ea56537 100644 --- a/usr.sbin/smtpd/queue_backend.c +++ b/usr.sbin/smtpd/queue_backend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_backend.c,v 1.50 2014/04/11 02:58:08 jsg Exp $ */ +/* $OpenBSD: queue_backend.c,v 1.51 2014/07/07 09:11:24 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org> @@ -93,9 +93,8 @@ static inline void profile_leave(void) clock_gettime(CLOCK_MONOTONIC, &t1); timespecsub(&t1, &profile.t0, &dt); - log_debug("profile-queue: %s %lld.%06ld", profile.name, - (long long)dt.tv_sec * 1000000 + dt.tv_nsec / 1000000, - dt.tv_nsec % 1000000); + log_debug("profile-queue: %s %lld.%09ld", profile.name, + (long long)dt.tv_sec, dt.tv_nsec); } #else #define profile_enter(x) do {} while (0) diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index f3c5cca8657..6abdf61b655 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.121 2014/05/23 13:28:32 espie Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.122 2014/07/07 09:11:24 eric Exp $ */ /* * Copyright (c) 2013 Eric Faurot <eric@openbsd.org> @@ -500,7 +500,7 @@ do_profile(int argc, struct parameter *argv) v = str_to_profile(argv[0].u.u_str); - srv_send(IMSG_CTL_PROFILE, &v, sizeof(v)); + srv_send(IMSG_CTL_PROFILE_ENABLE, &v, sizeof(v)); return srv_check_result(1); } diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 8844bedd945..b7c1d6cf263 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.226 2014/05/01 15:50:20 reyk Exp $ */ +/* $OpenBSD: smtpd.c,v 1.227 2014/07/07 09:11:24 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1181,13 +1181,13 @@ imsg_dispatch(struct mproc *p, struct imsg *imsg) clock_gettime(CLOCK_MONOTONIC, &t1); timespecsub(&t1, &t0, &dt); - log_debug("profile-imsg: %s %s %s %d %lld.%06ld", + log_debug("profile-imsg: %s %s %s %d %lld.%09ld", proc_name(smtpd_process), proc_name(p->proc), imsg_to_str(msg), (int)imsg->hdr.len, - (long long)dt.tv_sec * 1000000 + dt.tv_nsec / 1000000, - dt.tv_nsec % 1000000); + (long long)dt.tv_sec, + dt.tv_nsec); if (profiling & PROFILE_TOSTAT) { char key[STAT_KEY_SIZE]; |