Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern use the same string for the log and uprintf.
details: https://anonhg.NetBSD.org/src/rev/3592a8ade435
branches: trunk
changeset: 355617:3592a8ade435
user: christos <christos%NetBSD.org@localhost>
date: Sun Aug 06 09:14:14 2017 +0000
description:
use the same string for the log and uprintf.
diffstat:
sys/kern/kern_synch.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (34 lines):
diff -r 33aee8a25ce0 -r 3592a8ade435 sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c Sun Aug 06 08:11:38 2017 +0000
+++ b/sys/kern/kern_synch.c Sun Aug 06 09:14:14 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.311 2016/07/03 14:24:58 christos Exp $ */
+/* $NetBSD: kern_synch.c,v 1.312 2017/08/06 09:14:14 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.311 2016/07/03 14:24:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.312 2017/08/06 09:14:14 christos Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -1208,11 +1208,11 @@
if (__predict_false(runtm >= rlim->rlim_cur)) {
if (runtm >= rlim->rlim_max) {
sig = SIGKILL;
- log(LOG_NOTICE, "pid %d is killed: %s\n",
- p->p_pid, "exceeded RLIMIT_CPU");
+ log(LOG_NOTICE,
+ "pid %d, command %s, is killed: %s\n",
+ p->p_pid, p->p_comm, "exceeded RLIMIT_CPU");
uprintf("pid %d, command %s, is killed: %s\n",
- p->p_pid, p->p_comm,
- "exceeded RLIMIT_CPU");
+ p->p_pid, p->p_comm, "exceeded RLIMIT_CPU");
} else {
sig = SIGXCPU;
if (rlim->rlim_cur < rlim->rlim_max)
Home |
Main Index |
Thread Index |
Old Index