diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2007-11-04 14:11:15 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2007-11-04 14:11:15 -0500 |
| commit | 806b26a85d30f59af7dcb0025c68a50bf4bbb352 (patch) | |
| tree | 8b1cc9edab49eda46278199a7027d956549f6ddb /runtime/staprun | |
| parent | 24993e4fcae48ca014e6b53f3f9a011c9cfa8f06 (diff) | |
| parent | 600e72b28cc0676dc581b8fc5d54c09772979b79 (diff) | |
| download | systemtap-steved-806b26a85d30f59af7dcb0025c68a50bf4bbb352.tar.gz systemtap-steved-806b26a85d30f59af7dcb0025c68a50bf4bbb352.tar.xz systemtap-steved-806b26a85d30f59af7dcb0025c68a50bf4bbb352.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/staprun')
| -rw-r--r-- | runtime/staprun/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/staprun/stapio.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog index f03f3606..7c6b89ad 100644 --- a/runtime/staprun/ChangeLog +++ b/runtime/staprun/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Martin Hunt <hunt@redhat.com> + PR5218 + * stapio.c (main): Set initialized properly when + attached. + 2007-10-12 Martin Hunt <hunt@redhat.com> Changes to separate the symbols from the command channel. diff --git a/runtime/staprun/stapio.c b/runtime/staprun/stapio.c index 696167af..ee30a1a1 100644 --- a/runtime/staprun/stapio.c +++ b/runtime/staprun/stapio.c @@ -59,7 +59,11 @@ int main(int argc, char **argv) exit(1); initialized = 1; - + if (attach_mod) { + /* already started */ + initialized++; + } + if (stp_main_loop()) { err("ERROR: Couldn't enter main loop. Exiting.\n"); exit(1); |