From 16e8f21f336bcfc16a1174be8a8143668dbd0118 Mon Sep 17 00:00:00 2001 From: jistone Date: Fri, 8 Dec 2006 02:17:09 +0000 Subject: 2006-12-07 Josh Stone PR 3624. * tapsets.cxx (struct be_derived_probe): Add a new priority parameter for begin/end probes, and a comparison function for sorting. (be_builder::build): Parse the priority & pass it to be_derived_probe. (be_derived_probe_group::emit_module_init, emit_module_exit): Sort the probe list by priority before emitting any code. (register_standard_tapsets): Add new begin/end variants. * parse.cxx (parser::parse_literal): Allow negative numeric literals, by checking for a '-' unary operator right before a number. testsuite/ * systemtap.base/be_order.exp, systemtap.base/be_order.stp, semok/beginend.stp: New tests for begin/end priorities. * lib/stap_run.exp: Anchor OUTPUT_CHECK_STRING to the end of output. * systemtap.base/maxactive.exp: Fix to compare output to the end. * systemtap.base/probefunc.exp: Ditto. * systemtap.samples/ioblocktest.exp: Ditto. * systemtap.samples/ioblocktest.stp: Ditto. * systemtap.samples/tcptest.exp: Ditto. --- testsuite/systemtap.base/probefunc.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite/systemtap.base/probefunc.exp') diff --git a/testsuite/systemtap.base/probefunc.exp b/testsuite/systemtap.base/probefunc.exp index 10190fc9..b9c02552 100644 --- a/testsuite/systemtap.base/probefunc.exp +++ b/testsuite/systemtap.base/probefunc.exp @@ -41,7 +41,7 @@ close $symfd set prefix "probefunc:" # test probefunc() with kernel.statement() -set output_string "\\mscheduler_tick\\M" +set output_string "\\mscheduler_tick\\M\r\n" set probepoint "kernel.statement(0x$addr)" set script [format $systemtap_script $probepoint] stap_run $prefix$probepoint sleep_one_sec $output_string -e $script @@ -52,7 +52,7 @@ set script [format $systemtap_script $probepoint] stap_run $prefix$probepoint sleep_one_sec $output_string -e $script # test probefunc() with kernel.inline() -set output_string "\\mcontext_switch\\M" +set output_string "\\mcontext_switch\\M\r\n" set probepoint "kernel.inline(\"context_switch\")" set script [format $systemtap_script $probepoint] stap_run $prefix$probepoint sleep_one_sec $output_string -e $script -- cgit