diff options
| author | guanglei <guanglei> | 2006-10-16 03:01:05 +0000 |
|---|---|---|
| committer | guanglei <guanglei> | 2006-10-16 03:01:05 +0000 |
| commit | 46f12990f2681683ebb3f0f8f6862f842f2722ef (patch) | |
| tree | 7e7d7d959df190f34fa7438a776cdf1e7326fbbb | |
| parent | 9b2c55d00bc66ac15f7c148e2fa17f03eba466b7 (diff) | |
| download | systemtap-steved-46f12990f2681683ebb3f0f8f6862f842f2722ef.tar.gz systemtap-steved-46f12990f2681683ebb3f0f8f6862f842f2722ef.tar.xz systemtap-steved-46f12990f2681683ebb3f0f8f6862f842f2722ef.zip | |
tapset/scsi.stp:
check whether rq_disk is empty
tapset/scheduler.stp
revert changes
| -rw-r--r-- | tapset/ChangeLog | 4 | ||||
| -rw-r--r-- | tapset/scheduler.stp | 7 | ||||
| -rw-r--r-- | tapset/scsi.stp | 9 |
3 files changed, 13 insertions, 7 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 49d1ef6f..5eee8fb3 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2006-10-16 Li Guanglei <guanglei@cn.ibm.com> + * scsi.stp: check whether rq_disk is empty + * scheduler.stp: revert changes for x86_64 + 2006-10-13 Li Guanglei <guanglei@cn.ibm.com> * scsi.stp: add some variables * scheduler.stp: skip __switch_to on x86_64 diff --git a/tapset/scheduler.stp b/tapset/scheduler.stp index ddc1f192..06922146 100644 --- a/tapset/scheduler.stp +++ b/tapset/scheduler.stp @@ -121,11 +121,9 @@ probe scheduler.balance = kernel.inline("idle_balance") {} * prevtsk_state: the state of the process to be switched out */ probe scheduler.ctxswitch - = kernel.function("__switch_to")?, never + = kernel.function("__switch_to") { -%( arch == "x86_64" %? %: -%( -arch == "ppc64" %? +%( arch == "ppc64" %? prev_pid = $prev->pid next_pid = $new->pid prev_task = $prev @@ -138,5 +136,4 @@ arch == "ppc64" %? next_task = $next_p prevtsk_state = $prev_p->pid %) -%) } diff --git a/tapset/scsi.stp b/tapset/scsi.stp index f1c449fa..23256893 100644 --- a/tapset/scsi.stp +++ b/tapset/scsi.stp @@ -19,8 +19,13 @@ probe scsi.ioentry = module("*").function("scsi_prep_fn@drivers/scsi/scsi_lib.c") { - disk_major = $req->rq_disk->major - disk_minor = $req->rq_disk->first_minor + if($req->rq_disk == 0) { + disk_major = -1 + disk_minor = -1 + } else { + disk_major = $req->rq_disk->major + disk_minor = $req->rq_disk->first_minor + } device_state = get_devstate_from_req($q) req_addr = $req } |