From 197a4d6270c59a00030a33735865262a157edc24 Mon Sep 17 00:00:00 2001 From: jistone Date: Thu, 28 Sep 2006 01:48:59 +0000 Subject: 2006-09-27 Josh Stone * session.h (struct systemtap_session): Add kernel_base_release to store the kernel version without the -NNN suffix. * main.cxx (main): Generate and use kernel_base_release. * parse.cxx (eval_pp_conditional): Use kernel_base_release. * tapsets.cxx (profile_derived_probe::profile_derived_probe): Use kernel_base_release. * tapsets.cxx (timer_builder::build): Support a wide variety of timer varients -- jiffies, s/sec, ms/msec, us/usec, ns/nsec, and hz. Use hrtimers automatically on kernels that have it. (timer_builder::register_patterns): Bind all of the new timer varients in one easy place. (register_standard_tapsets): Call timer_builder::register_patterns. (struct hrtimer_builder): Removed since timer_builder is generic. * stapprobes.5.in: Document new timer.* functionality. * tapsets.cxx (hrtimer_derived_probe_group::emit_probes): Add a shared global for the actual hrtimer resolution, _stp_hrtimer_res. (hrtimer_derived_probe_group::emit_module): Init _stp_hrtimer_res. (hrtimer_derived_probe::emit_interval): Limit intervals at a minimum to the hrtimer's actual resolution. (hrtimer_derived_probe::emit_probe_entries): Forward timers based on previous expiration instead of restarting relative. testsuite/ * buildok/fourteen.stp: Test new timer functionality. --- parse.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'parse.cxx') diff --git a/parse.cxx b/parse.cxx index a61edc08..2d31e334 100644 --- a/parse.cxx +++ b/parse.cxx @@ -162,11 +162,7 @@ bool eval_pp_conditional (systemtap_session& s, l->content == "kernel_vr")) { string target_kernel_vr = s.kernel_release; - string target_kernel_v = target_kernel_vr; - // cut off any release code suffix - string::size_type dr = target_kernel_vr.find ('-'); - if (dr > 0 && dr != string::npos) - target_kernel_v = target_kernel_vr.substr (0, dr); + string target_kernel_v = s.kernel_base_release; if (! (r->type == tok_string)) throw parse_error ("expected string literal", r); -- cgit