diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tapsets.cxx | 4 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/badkprobe.exp | 1 |
4 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2009-01-11 Wenji Huang <wenji.huang@oracle.com> + + * tapsets.cxx (dwarf_derived_probe_group::emit_module_decls): Fix too + large number on 32-bits machines. + (uprobe_derived_probe_group::emit_module_decls): Ditto. + 2009-01-11 Mark Wielaard <mjw@redhat.com> * configure.ac: Add prefix as STAP_PREFIX for config.h. diff --git a/tapsets.cxx b/tapsets.cxx index 20bea45d..148cc99d 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -5039,7 +5039,7 @@ dwarf_derived_probe_group::emit_module_decls (systemtap_session& s) assert (p->maxactive_val >= 0 && p->maxactive_val <= USHRT_MAX); s.op->line() << " .maxactive_val=" << p->maxactive_val << ","; } - s.op->line() << " .address=0x" << hex << p->addr << dec << "UL,"; + s.op->line() << " .address=(unsigned long)0x" << hex << p->addr << dec << "ULL,"; s.op->line() << " .module=\"" << p->module << "\","; s.op->line() << " .section=\"" << p->section << "\","; s.op->line() << " .pp=" << lex_cast_qstring (*p->sole_location()) << ","; @@ -7104,7 +7104,7 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->line() << "},"; if (p->section != ".absolute") s.op->line() << " .pathname=" << lex_cast_qstring(p->module) << ", "; - s.op->line() << " .address=0x" << hex << p->address << dec << "UL,"; + s.op->line() << " .address=(unsigned long)0x" << hex << p->address << dec << "ULL,"; s.op->line() << " .pp=" << lex_cast_qstring (*p->sole_location()) << ","; s.op->line() << " .ph=&" << p->name << ","; if (p->return_p) s.op->line() << " .return_p=1,"; diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 27cd27b5..fe40eb67 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-01-11 Wenji Huang <wenji.huang@oracle.com> + + * systemtap.base/badkprobe.exp: Add explicit timeout. + 2009-01-09 Dave Brolley <brolley@redhat.com> * lib/systemtap.exp: Remove ssl_server_path and ssl_client_path. diff --git a/testsuite/systemtap.base/badkprobe.exp b/testsuite/systemtap.base/badkprobe.exp index 1a1dbad5..efc06695 100644 --- a/testsuite/systemtap.base/badkprobe.exp +++ b/testsuite/systemtap.base/badkprobe.exp @@ -5,6 +5,7 @@ if {! [installtest_p]} { untested $test; return } spawn stap -g -w -e "$script" expect { + -timeout 60 -re "^WARNING: probe .*registration error.*" { pass $test } eof { fail "$test (eof)" } timeout { fail "$test (timeout)" } |