projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: make ust consumer posix compliant for poll flags
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index c1ba1405ea478931a9cd3dee4ed57399ec2c5cd7..608265f9627af4291148fe4444e2dbd036883277 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-45,12
+45,12
@@
extern volatile int consumer_quit;
*
* Returns the number of bytes written
*/
*
* Returns the number of bytes written
*/
-
in
t lttng_kconsumer_on_read_subbuffer_mmap(
+
ssize_
t lttng_kconsumer_on_read_subbuffer_mmap(
struct lttng_consumer_local_data *ctx,
struct lttng_consumer_stream *stream, unsigned long len)
{
unsigned long mmap_offset;
struct lttng_consumer_local_data *ctx,
struct lttng_consumer_stream *stream, unsigned long len)
{
unsigned long mmap_offset;
-
long
ret = 0;
+
ssize_t
ret = 0;
off_t orig_offset = stream->out_fd_offset;
int fd = stream->wait_fd;
int outfd = stream->out_fd;
off_t orig_offset = stream->out_fd_offset;
int fd = stream->wait_fd;
int outfd = stream->out_fd;
@@
-91,11
+91,11
@@
end:
*
* Returns the number of bytes spliced.
*/
*
* Returns the number of bytes spliced.
*/
-
in
t lttng_kconsumer_on_read_subbuffer_splice(
+
ssize_
t lttng_kconsumer_on_read_subbuffer_splice(
struct lttng_consumer_local_data *ctx,
struct lttng_consumer_stream *stream, unsigned long len)
{
struct lttng_consumer_local_data *ctx,
struct lttng_consumer_stream *stream, unsigned long len)
{
-
long
ret = 0;
+
ssize_t
ret = 0;
loff_t offset = 0;
off_t orig_offset = stream->out_fd_offset;
int fd = stream->wait_fd;
loff_t offset = 0;
off_t orig_offset = stream->out_fd_offset;
int fd = stream->wait_fd;
@@
-308,12
+308,12
@@
end_nosignal:
/*
* Consume data on a file descriptor and write it on a trace file.
*/
/*
* Consume data on a file descriptor and write it on a trace file.
*/
-
in
t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
+
ssize_
t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx)
{
unsigned long len;
int err;
struct lttng_consumer_local_data *ctx)
{
unsigned long len;
int err;
-
long
ret = 0;
+
ssize_t
ret = 0;
int infd = stream->wait_fd;
DBG("In read_subbuffer (infd : %d)", infd);
int infd = stream->wait_fd;
DBG("In read_subbuffer (infd : %d)", infd);
This page took
0.023924 seconds
and
4
git commands to generate.