summaryrefslogtreecommitdiffstats
path: root/runtime/staprun/ctl.c
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2009-10-13 19:20:05 -0700
committerJosh Stone <jistone@redhat.com>2009-10-13 19:20:05 -0700
commit1c1f1a255cd969934bb7ce1678f4a411337be6f9 (patch)
treeac6df7814bf392d96f75250e260228ff8a02a1e8 /runtime/staprun/ctl.c
parentd5e178c1d6eb0e7c1a317b925687050aa1cb6c1b (diff)
parentc4ca2da6ca875c0142a4e7ffd95e0aa0c573590b (diff)
downloadsystemtap-steved-1c1f1a255cd969934bb7ce1678f4a411337be6f9.tar.gz
systemtap-steved-1c1f1a255cd969934bb7ce1678f4a411337be6f9.tar.xz
systemtap-steved-1c1f1a255cd969934bb7ce1678f4a411337be6f9.zip
Merge branch 'master' of sourceware.org:/git/systemtap
Diffstat (limited to 'runtime/staprun/ctl.c')
-rw-r--r--runtime/staprun/ctl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/staprun/ctl.c b/runtime/staprun/ctl.c
index 4597bf72..335006ec 100644
--- a/runtime/staprun/ctl.c
+++ b/runtime/staprun/ctl.c
@@ -24,11 +24,11 @@ int init_ctl_channel(const char *name, int verb)
} else {
old_transport = 1;
if (sprintf_chk(buf, "/proc/systemtap/%s/.cmd", name))
- return -1;
+ return -2;
}
- dbug(2, "Opening %s\n", buf);
control_channel = open(buf, O_RDWR);
+ dbug(2, "Opened %s (%d)\n", buf, control_channel);
if (control_channel < 0) {
if (verb) {
if (attach_mod && errno == ENOENT)
@@ -36,10 +36,10 @@ int init_ctl_channel(const char *name, int verb)
else
perr("Couldn't open control channel '%s'", buf);
}
- return -1;
+ return -3;
}
if (set_clexec(control_channel) < 0)
- return -1;
+ return -4;
return old_transport;
}
@@ -47,6 +47,7 @@ int init_ctl_channel(const char *name, int verb)
void close_ctl_channel(void)
{
if (control_channel >= 0) {
+ dbug(2, "Closed ctl fd %d\n", control_channel);
close(control_channel);
control_channel = -1;
}