426 if ($action eq "SetIdle") { |
426 if ($action eq "SetIdle") { |
427 print "ad $actAddr\n"; |
427 print "ad $actAddr\n"; |
428 ClearActivity($actAddr); |
428 ClearActivity($actAddr); |
429 } |
429 } |
430 elsif ($action eq "Abort") { |
430 elsif ($action eq "Abort") { |
431 print "t ", objectName($activityNode{$actAddr}), " (Abort ", $activityName{$actAddr}, ")\n"; |
431 print "t ", objectName($activityNode{$actAddr}), " ($activityName{$actAddr}) Abort()\n"; |
432 } |
432 } |
433 elsif ($action eq "Next->cancel") { |
433 elsif ($action =~ m/Cancel\(\)/) { |
434 my $tuple = ""; |
434 m/iPostedToId ([0-9a-f]{8})/; |
435 if (m/\[Triple=([^]]+)\]/) { |
435 my $postedToId = $1; |
436 $tuple = $1; |
436 print "t ", objectName($activityNode{$actAddr}), " ($activityName{$actAddr}) Cancel(). Posted to ", objectName($postedToId), "\n"; |
437 print "t ", objectName($activityNode{$actAddr}), " (Cancel $activityName{$actAddr}, $tuple)\n"; |
|
438 } |
|
439 else { |
|
440 print "t ", objectName($activityNode{$actAddr}), " (Cancel ", $activityName{$actAddr}, ")\n"; |
|
441 } |
|
442 } |
437 } |
443 } |
438 } |
444 elsif (($opt_X & 4) == 0 && /UnparkState->unparked\s+\[MNode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/) |
439 elsif (($opt_X & 4) == 0 && /UnparkState->unparked\s+\[MNode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/) |
445 { |
440 { |
446 print "t ", objectName($1), " {50,200,50} (Unparked $2, $3)\n"; |
441 print "t ", objectName($1), " {50,200,50} (Unparked $2, $3)\n"; |