Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when using ktrace format version 0 or 1, don't adjust the changed fields

Browse Source 
in ktealloc(), since we do the same adjustment later in ktrwrite().
also, remove an unused variable in ktr_csw().
This commit is contained in:
chs 2010-10-18 00:09:13 +00:00
parent 7aa51b5177
commit 596908f5cf
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/kern_ktrace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_ktrace.c,v 1.153 2010/07/01 02:38:30 rmind Exp $ */
/* $NetBSD: kern_ktrace.c,v 1.154 2010/10/18 00:09:13 chs Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.153 2010/07/01 02:38:30 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.154 2010/10/18 00:09:13 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -524,7 +524,6 @@ ktealloc(struct ktrace_entry **ktep, void **bufp, lwp_t *l, int type,
struct proc *p = l->l_proc;
struct ktrace_entry *kte;
struct ktr_header *kth;
struct timespec ts;
void *buf;
if (ktrenter(l))
@ -550,27 +549,8 @@ ktealloc(struct ktrace_entry **ktep, void **bufp, lwp_t *l, int type,
kth->ktr_pid = p->p_pid;
memcpy(kth->ktr_comm, p->p_comm, MAXCOMLEN);
kth->ktr_version = KTRFAC_VERSION(p->p_traceflag);
nanotime(&ts);
switch (KTRFAC_VERSION(p->p_traceflag)) {
case 0:
/* This is the original format */
kth->ktr_otv.tv_sec = ts.tv_sec;
kth->ktr_otv.tv_usec = ts.tv_nsec / 1000;
break;
case 1:
kth->ktr_olid = l->l_lid;
kth->ktr_ots.tv_sec = ts.tv_sec;
kth->ktr_ots.tv_nsec = ts.tv_nsec;
break;
case 2:
kth->ktr_lid = l->l_lid;
kth->ktr_ts.tv_sec = ts.tv_sec;
kth->ktr_ts.tv_nsec = ts.tv_nsec;
break;
default:
break;
}
kth->ktr_lid = l->l_lid;
nanotime(&kth->ktr_ts);
*ktep = kte;
*bufp = buf;
@ -861,13 +841,11 @@ ktr_csw(int out, int user)
* from that is difficult to do.
*/
if (out) {
struct timespec ts;
if (ktrenter(l))
return;
nanotime(&l->l_ktrcsw);
l->l_pflag |= LP_KTRCSW;
nanotime(&ts);
if (user)
l->l_pflag |= LP_KTRCSWUSER;
else