diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-07-23 12:43:03 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-07-23 12:43:03 -0400 |
| commit | c04c525de43003fb00612df635a7c819b5a1d645 (patch) | |
| tree | 22cd1e41f84a66d7eaece8e17138bf83427f4bab /runtime/itrace.c | |
| parent | 6c456acd35009630facd95cca91483a92aa50e9f (diff) | |
| parent | 4a8636a307a9a532dcc60b5ad8bf809a20dc24c3 (diff) | |
| download | systemtap-steved-c04c525de43003fb00612df635a7c819b5a1d645.tar.gz systemtap-steved-c04c525de43003fb00612df635a7c819b5a1d645.tar.xz systemtap-steved-c04c525de43003fb00612df635a7c819b5a1d645.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/itrace.c')
| -rw-r--r-- | runtime/itrace.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/runtime/itrace.c b/runtime/itrace.c index 3014f9e5..6fe39db4 100644 --- a/runtime/itrace.c +++ b/runtime/itrace.c @@ -324,20 +324,14 @@ done: } -static int usr_itrace_init(int single_step, pid_t tid, struct stap_itrace_probe *p) +static int usr_itrace_init(int single_step, struct task_struct *tsk, struct stap_itrace_probe *p) { struct itrace_info *ui; - struct task_struct *tsk; spin_lock_init(&itrace_lock); rcu_read_lock(); -#ifdef STAPCONF_FIND_TASK_PID - tsk = find_task_by_pid(tid); -#else - tsk = find_task_by_vpid(tid); -#endif - if (!tsk) { - printk(KERN_ERR "usr_itrace_init: Cannot find process %d\n", tid); + if (tsk == NULL) { + printk(KERN_ERR "usr_itrace_init: Invalid task\n"); rcu_read_unlock(); return 1; } @@ -353,7 +347,8 @@ static int usr_itrace_init(int single_step, pid_t tid, struct stap_itrace_probe rcu_read_unlock(); if (debug) - printk(KERN_INFO "usr_itrace_init: completed for tid = %d\n", tid); + printk(KERN_INFO "usr_itrace_init: completed for tid = %d\n", + tsk->pid); return 0; } |