From: Wenji Huang <wenji.huang@oracle.com>
Date: Tue, 8 Jun 2010 02:20:23 +0000 (+0800)
Subject: Tweak schedtime.stp example for 2.6.35
X-Git-Tag: release-1.3~276
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=519adfb587b009afc682015772858f706549af6b;p=systemtap.git

Tweak schedtime.stp example for 2.6.35

$rq is removed from tracepoint in 2.6.35. Guard access using
@defined predicate.
---

diff --git a/testsuite/systemtap.examples/process/schedtimes.stp b/testsuite/systemtap.examples/process/schedtimes.stp
index e964dd585..077ddc9fb 100755
--- a/testsuite/systemtap.examples/process/schedtimes.stp
+++ b/testsuite/systemtap.examples/process/schedtimes.stp
@@ -55,7 +55,7 @@ probe kernel.trace("sched_switch") {
       run_time[previous_pid] += (t - previous_timestamp[previous_pid]);
       previous_timestamp[previous_pid] = t;
       if ($prev->state > 0) {
-        if ((get_iowait($rq) - io_wait_count[previous_pid]) > 0)
+        if (@defined($rq) && (get_iowait($rq) - io_wait_count[previous_pid]) > 0)
           io_wait_incremented[previous_pid] = 1;  
         pid_state[previous_pid] = SLEEPING;
       } else if ($prev->state == 0) {
@@ -73,7 +73,8 @@ probe kernel.trace("sched_switch") {
     }
   }
   if (next_pid) {
-    io_wait_count[next_pid] = get_iowait($rq);
+    if (@defined($rq))
+      io_wait_count[next_pid] = get_iowait($rq);
     if (!([next_pid] in pid_state)) {
       //use this state as entry into state machine
       previous_timestamp[next_pid] =  gettimeofday_us();