From owner-p4-projects@FreeBSD.ORG  Sun May  7 23:12:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 09C5D16A406; Sun,  7 May 2006 23:12:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C422016A400
	for <perforce@freebsd.org>; Sun,  7 May 2006 23:12:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9003543D45
	for <perforce@freebsd.org>; Sun,  7 May 2006 23:12:22 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NCMRG082644
	for <perforce@freebsd.org>; Sun, 7 May 2006 23:12:22 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NCMDb082636
	for perforce@freebsd.org; Sun, 7 May 2006 23:12:22 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 7 May 2006 23:12:22 GMT
Message-Id: <200605072312.k47NCMDb082636@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96805 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 May 2006 23:12:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=96805

Change 96805 by jb@jb_freebsd2 on 2006/05/07 23:11:28

	Uncomment the lines which refer to cyclic timers now that we have them.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#6 (text+ko) ====

@@ -526,10 +526,8 @@
 	dtrace_optval_t *opt = state->dts_options, sz, nspec;
 	dtrace_speculation_t *spec;
 	dtrace_buffer_t *buf;
-#ifdef DOODAD
 	cyc_handler_t hdlr;
 	cyc_time_t when;
-#endif
 	int rval = 0, i, bufsize = NCPU * sizeof (dtrace_buffer_t);
 	dtrace_icookie_t cookie;
 
@@ -707,36 +705,24 @@
 	if (opt[DTRACEOPT_CLEANRATE] > dtrace_cleanrate_max)
 		opt[DTRACEOPT_CLEANRATE] = dtrace_cleanrate_max;
 
-#ifdef DOODAD
 	hdlr.cyh_func = (cyc_func_t)dtrace_state_clean;
 	hdlr.cyh_arg = state;
 	hdlr.cyh_level = CY_LOW_LEVEL;
-#endif
 
-#ifdef DOODAD
 	when.cyt_when = 0;
 	when.cyt_interval = opt[DTRACEOPT_CLEANRATE];
-#endif
 
-#ifdef DOODAD
 	state->dts_cleaner = cyclic_add(&hdlr, &when);
-#endif
 
-#ifdef DOODAD
 	hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman;
 	hdlr.cyh_arg = state;
 	hdlr.cyh_level = CY_LOW_LEVEL;
-#endif
 
-#ifdef DOODAD
 	when.cyt_when = 0;
 	when.cyt_interval = dtrace_deadman_interval;
-#endif
 
 	state->dts_alive = state->dts_laststatus = dtrace_gethrtime();
-#ifdef DOODAD
 	state->dts_deadman = cyclic_add(&hdlr, &when);
-#endif
 
 	state->dts_activity = DTRACE_ACTIVITY_WARMUP;
 
@@ -999,13 +985,11 @@
 	for (i = 0; i < nspec; i++)
 		dtrace_buffer_free(spec[i].dtsp_buffer);
 
-#ifdef DOODAD
 	if (state->dts_cleaner != CYCLIC_NONE)
 		cyclic_remove(state->dts_cleaner);
 
 	if (state->dts_deadman != CYCLIC_NONE)
 		cyclic_remove(state->dts_deadman);
-#endif
 
 	dtrace_dstate_fini(&vstate->dtvs_dynvars);
 	dtrace_vstate_fini(vstate);