PERFORCE change 96805 for review
John Birrell
jb at FreeBSD.org
Sun May 7 23:12:23 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=96805
Change 96805 by jb at 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);
More information about the p4-projects
mailing list