projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add environment information
[lttng-ust.git]
/
liblttng-ust-comm
/
lttng-ust-comm.c
diff --git
a/liblttng-ust-comm/lttng-ust-comm.c
b/liblttng-ust-comm/lttng-ust-comm.c
index f013c2cd7316e459ec21fd100c4d12d7ff92a025..b4fe11b0b0a91d1ce9916e4e19c5e1c57e58208a 100644
(file)
--- a/
liblttng-ust-comm/lttng-ust-comm.c
+++ b/
liblttng-ust-comm/lttng-ust-comm.c
@@
-30,7
+30,7
@@
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
-#include <
lttng/
ust-comm.h>
+#include <ust-comm.h>
/*
* Human readable error message.
/*
* Human readable error message.
@@
-390,8
+390,12
@@
int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur,
return -EINVAL;
}
if (lur->ret_code != USTCOMM_OK) {
return -EINVAL;
}
if (lur->ret_code != USTCOMM_OK) {
- fprintf(stderr, "remote operation failed with code %d.\n",
- lur->ret_code);
+ /*
+ * Some errors are normal.. we should put this
+ * in a debug level message...
+ * fprintf(stderr, "remote operation failed with code %d.\n",
+ * lur->ret_code);
+ */
return lur->ret_code;
}
return 0;
return lur->ret_code;
}
return 0;
@@
-455,7
+459,7
@@
int ustcomm_recv_fd(int sock)
goto end;
}
if (ret != sizeof(data_fd)) {
goto end;
}
if (ret != sizeof(data_fd)) {
- fprintf(stderr, "Received %d bytes, expected %
l
d", ret, sizeof(data_fd));
+ fprintf(stderr, "Received %d bytes, expected %
z
d", ret, sizeof(data_fd));
goto end;
}
cmsg = CMSG_FIRSTHDR(&msg);
goto end;
}
cmsg = CMSG_FIRSTHDR(&msg);
@@
-473,7
+477,10
@@
int ustcomm_recv_fd(int sock)
for (i = 0; i < sizeof(int); i++)
tmp.vc[i] = CMSG_DATA(cmsg)[i];
ret = tmp.vi;
for (i = 0; i < sizeof(int); i++)
tmp.vc[i] = CMSG_DATA(cmsg)[i];
ret = tmp.vi;
- fprintf(stderr, "received fd %d\n", ret);
+ /*
+ * Useful for fd leak debug.
+ * fprintf(stderr, "received fd %d\n", ret);
+ */
end:
return ret;
}
end:
return ret;
}
This page took
0.025004 seconds
and
4
git commands to generate.