diff options
| author | hunt <hunt> | 2007-03-26 16:15:11 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-03-26 16:15:11 +0000 |
| commit | 5d65678dde08d0b2e34ee79c2e0f6c26ff3e4592 (patch) | |
| tree | 05cdd33db206b646c424dd8b207221413cbb2455 /runtime/staprun/relay_old.c | |
| parent | 98f0ea565abd496f7f4f065f652456101370751e (diff) | |
| download | systemtap-steved-5d65678dde08d0b2e34ee79c2e0f6c26ff3e4592.tar.gz systemtap-steved-5d65678dde08d0b2e34ee79c2e0f6c26ff3e4592.tar.xz systemtap-steved-5d65678dde08d0b2e34ee79c2e0f6c26ff3e4592.zip | |
2007-03-26 Martin Hunt <hunt@redhat.com>
* mainloop.c (run_stp_check): Just use system() call.
(init_staprun): Remove _stp_pid module parameter.
(cleanup_and_exit): If closed==2, just exit without removing module.
(driver_poll): Remove. We no longer require stap running.
(_stp_main_loop): Remove call to driver_poll.
* ctl.c (init_ctl_channel): Don't put files in systemtap_pid,
revert back to systemtap/modulename.
* relay.c: Revert back to systemtap/modulename paths.
* relay_old.c: Ditto.
* staprun.c: Add -L and -A args.
Diffstat (limited to 'runtime/staprun/relay_old.c')
| -rw-r--r-- | runtime/staprun/relay_old.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/runtime/staprun/relay_old.c b/runtime/staprun/relay_old.c index 049d193a..80c38a6c 100644 --- a/runtime/staprun/relay_old.c +++ b/runtime/staprun/relay_old.c @@ -210,7 +210,7 @@ static void *reader_thread(void *data) * * Returns 0 if successful, negative otherwise */ -int init_oldrelayfs(struct _stp_msg_trans *t) +int init_oldrelayfs(void) { int i, j; struct statfs st; @@ -221,7 +221,8 @@ int init_oldrelayfs(struct _stp_msg_trans *t) relay_fd[i] = 0; } - bulkmode = t->bulk_mode; +// t->bulk_mode; + bulkmode = 0; if (!bulkmode) { if (outfile_name) { out_fd[0] = open (outfile_name, O_CREAT|O_TRUNC|O_WRONLY, 0666); @@ -234,16 +235,16 @@ int init_oldrelayfs(struct _stp_msg_trans *t) return 0; } - n_subbufs = t->n_subbufs; - subbuf_size = t->subbuf_size; + n_subbufs = 0; /* t->n_subbufs;*/ + subbuf_size = 0; /* t->subbuf_size; */ dbug("initializing relayfs. n_subbufs=%d subbuf_size=%d\n",n_subbufs, subbuf_size); if (statfs("/sys/kernel/debug", &st) == 0 && (int) st.f_type == (int) DEBUGFS_MAGIC) { - sprintf(relay_filebase, "/sys/kernel/debug/systemtap_%d/trace", getpid()); - sprintf(proc_filebase, "/sys/kernel/debug/systemtap_%d/", getpid()); + sprintf(relay_filebase, "/sys/kernel/debug/systemtap/%s/trace", modname); + sprintf(proc_filebase, "/sys/kernel/debug/systemtap/%s/", modname); } else if (statfs("/mnt/relay", &st) == 0 && (int) st.f_type == (int) RELAYFS_MAGIC) { - sprintf(relay_filebase, "/mnt/relay/systemtap_%d/trace", getpid()); - sprintf(proc_filebase, "/proc/systemtap_%d/", getpid()); + sprintf(relay_filebase, "/mnt/relay/systemtap/%s/trace", modname); + sprintf(proc_filebase, "/proc/systemtap/%s/", modname); } else { fprintf(stderr,"Cannot find relayfs or debugfs mount point.\n"); return -1; |