From owner-p4-projects@FreeBSD.ORG Mon Jun 9 02:49:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B4C2106566C; Mon, 9 Jun 2008 02:49:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DC8D106564A for ; Mon, 9 Jun 2008 02:49:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29D168FC1D for ; Mon, 9 Jun 2008 02:49:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m592n6x7048308 for ; Mon, 9 Jun 2008 02:49:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m592n6B7048306 for perforce@freebsd.org; Mon, 9 Jun 2008 02:49:06 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Jun 2008 02:49:06 GMT Message-Id: <200806090249.m592n6B7048306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 143146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2008 02:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=143146 Change 143146 by jb@freebsd3 on 2008/06/09 02:48:27 Backout some code that was replaced by an event handler based implementation. Affected files ... .. //depot/projects/dtrace6/src/sys/sys/proc.h#6 edit Differences ... ==== //depot/projects/dtrace6/src/sys/sys/proc.h#6 (text+ko) ==== @@ -158,6 +158,8 @@ struct td_sched; struct trapframe; struct turnstile; +struct kdtrace_proc; +struct kdtrace_thread; /* * Here we define the three structures used for process information. @@ -334,6 +336,8 @@ struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ + struct kdtrace_thread *td_dtrace; /* (*) DTrace-specific data. */ + int td_errno; /* Error returned by last syscall. */ } __attribute__ ((aligned (THREAD_ALIGN))); /* @@ -619,6 +623,7 @@ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ struct auditinfo_addr *p_au; /* (c) Process audit properties. */ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ + struct kdtrace_proc *p_dtrace; /* (*) DTrace-specific data. */ }; #define p_session p_pgrp->pg_session @@ -859,21 +864,6 @@ extern u_long ps_arg_cache_limit; extern int sched_quantum; /* Scheduling quantum in ticks. */ -/* - * Space to append to struct thread for DTrace specific thread - * variables. This space is after the 'struct td_sched'. - */ -#define KDTRACE_THREAD_SIZE 128 - -/* Offset from 'struct thread *' to the opaque DTrace fields. */ -extern int kdtrace_thread_offset; - -/* Overall per-thread allocation size. */ -extern int kdtrace_thread_size; - -/* DTrace data for the primary thread in proc0. */ -extern char kdtrace_thread0[]; - LIST_HEAD(proclist, proc); TAILQ_HEAD(procqueue, proc); TAILQ_HEAD(threadqueue, thread);