projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix coding style and add/change debug statements
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 53806b08d8ee4a0dcd54b80ee71edaca221fd784..f01eb5d065dd2d81dff1089754014fd449a8a10c 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-69,8
+69,9
@@
static struct lttng_consumer_stream *consumer_find_stream(int key)
struct lttng_consumer_stream *stream = NULL;
/* Negative keys are lookup failures */
struct lttng_consumer_stream *stream = NULL;
/* Negative keys are lookup failures */
- if (key < 0)
+ if (key < 0)
{
return NULL;
return NULL;
+ }
rcu_read_lock();
rcu_read_lock();
@@
-111,8
+112,9
@@
static struct lttng_consumer_channel *consumer_find_channel(int key)
struct lttng_consumer_channel *channel = NULL;
/* Negative keys are lookup failures */
struct lttng_consumer_channel *channel = NULL;
/* Negative keys are lookup failures */
- if (key < 0)
+ if (key < 0)
{
return NULL;
return NULL;
+ }
rcu_read_lock();
rcu_read_lock();
@@
-242,7
+244,7
@@
void consumer_del_stream(struct lttng_consumer_stream *stream)
if (stream->mmap_base != NULL) {
ret = munmap(stream->mmap_base, stream->mmap_len);
if (ret != 0) {
if (stream->mmap_base != NULL) {
ret = munmap(stream->mmap_base, stream->mmap_len);
if (ret != 0) {
-
perror
("munmap");
+
PERROR
("munmap");
}
}
break;
}
}
break;
@@
-353,13
+355,19
@@
struct lttng_consumer_stream *consumer_allocate_stream(
stream = zmalloc(sizeof(*stream));
if (stream == NULL) {
stream = zmalloc(sizeof(*stream));
if (stream == NULL) {
-
perror
("malloc struct lttng_consumer_stream");
+
PERROR
("malloc struct lttng_consumer_stream");
*alloc_ret = -ENOMEM;
*alloc_ret = -ENOMEM;
-
return NULL
;
+
goto end
;
}
}
+
+ /*
+ * Get stream's channel reference. Needed when adding the stream to the
+ * global hash table.
+ */
stream->chan = consumer_find_channel(channel_key);
if (!stream->chan) {
*alloc_ret = -ENOENT;
stream->chan = consumer_find_channel(channel_key);
if (!stream->chan) {
*alloc_ret = -ENOENT;
+ ERR("Unable to find channel for stream %d", stream_key);
goto error;
}
stream->chan->refcount++;
goto error;
}
stream->chan->refcount++;
@@
-419,6
+427,7
@@
struct lttng_consumer_stream *consumer_allocate_stream(
error:
free(stream);
error:
free(stream);
+end:
return NULL;
}
return NULL;
}
@@
-663,7
+672,7
@@
void consumer_del_channel(struct lttng_consumer_channel *channel)
if (channel->mmap_base != NULL) {
ret = munmap(channel->mmap_base, channel->mmap_len);
if (ret != 0) {
if (channel->mmap_base != NULL) {
ret = munmap(channel->mmap_base, channel->mmap_len);
if (ret != 0) {
-
perror
("munmap");
+
PERROR
("munmap");
}
}
if (channel->wait_fd >= 0 && !channel->wait_fd_is_copy) {
}
}
if (channel->wait_fd >= 0 && !channel->wait_fd_is_copy) {
@@
-696,7
+705,7
@@
struct lttng_consumer_channel *consumer_allocate_channel(
channel = zmalloc(sizeof(*channel));
if (channel == NULL) {
channel = zmalloc(sizeof(*channel));
if (channel == NULL) {
-
perror
("malloc struct lttng_consumer_channel");
+
PERROR
("malloc struct lttng_consumer_channel");
goto end;
}
channel->key = channel_key;
goto end;
}
channel->key = channel_key;
@@
-820,7
+829,7
@@
restart:
if (errno == EINTR) {
goto restart;
}
if (errno == EINTR) {
goto restart;
}
-
perror
("Poll error");
+
PERROR
("Poll error");
goto exit;
}
if (consumer_sockpoll[0].revents & (POLLIN | POLLPRI)) {
goto exit;
}
if (consumer_sockpoll[0].revents & (POLLIN | POLLPRI)) {
@@
-912,7
+921,7
@@
void lttng_consumer_should_exit(struct lttng_consumer_local_data *ctx)
ret = write(ctx->consumer_should_quit[1], "4", 1);
} while (ret < 0 && errno == EINTR);
if (ret < 0) {
ret = write(ctx->consumer_should_quit[1], "4", 1);
} while (ret < 0 && errno == EINTR);
if (ret < 0) {
-
perror
("write consumer quit");
+
PERROR
("write consumer quit");
}
}
}
}
@@
-984,7
+993,7
@@
struct lttng_consumer_local_data *lttng_consumer_create(
ctx = zmalloc(sizeof(struct lttng_consumer_local_data));
if (ctx == NULL) {
ctx = zmalloc(sizeof(struct lttng_consumer_local_data));
if (ctx == NULL) {
-
perror
("allocating context");
+
PERROR
("allocating context");
goto error;
}
goto error;
}
@@
-997,33
+1006,33
@@
struct lttng_consumer_local_data *lttng_consumer_create(
ret = pipe(ctx->consumer_poll_pipe);
if (ret < 0) {
ret = pipe(ctx->consumer_poll_pipe);
if (ret < 0) {
-
perror
("Error creating poll pipe");
+
PERROR
("Error creating poll pipe");
goto error_poll_pipe;
}
/* set read end of the pipe to non-blocking */
ret = fcntl(ctx->consumer_poll_pipe[0], F_SETFL, O_NONBLOCK);
if (ret < 0) {
goto error_poll_pipe;
}
/* set read end of the pipe to non-blocking */
ret = fcntl(ctx->consumer_poll_pipe[0], F_SETFL, O_NONBLOCK);
if (ret < 0) {
-
perror
("fcntl O_NONBLOCK");
+
PERROR
("fcntl O_NONBLOCK");
goto error_poll_fcntl;
}
/* set write end of the pipe to non-blocking */
ret = fcntl(ctx->consumer_poll_pipe[1], F_SETFL, O_NONBLOCK);
if (ret < 0) {
goto error_poll_fcntl;
}
/* set write end of the pipe to non-blocking */
ret = fcntl(ctx->consumer_poll_pipe[1], F_SETFL, O_NONBLOCK);
if (ret < 0) {
-
perror
("fcntl O_NONBLOCK");
+
PERROR
("fcntl O_NONBLOCK");
goto error_poll_fcntl;
}
ret = pipe(ctx->consumer_should_quit);
if (ret < 0) {
goto error_poll_fcntl;
}
ret = pipe(ctx->consumer_should_quit);
if (ret < 0) {
-
perror
("Error creating recv pipe");
+
PERROR
("Error creating recv pipe");
goto error_quit_pipe;
}
ret = pipe(ctx->consumer_thread_pipe);
if (ret < 0) {
goto error_quit_pipe;
}
ret = pipe(ctx->consumer_thread_pipe);
if (ret < 0) {
-
perror
("Error creating thread pipe");
+
PERROR
("Error creating thread pipe");
goto error_thread_pipe;
}
goto error_thread_pipe;
}
@@
-1882,7
+1891,7
@@
void *lttng_consumer_thread_poll_fds(void *data)
/* allocate for all fds + 1 for the consumer_poll_pipe */
pollfd = zmalloc((consumer_data.stream_count + 1) * sizeof(struct pollfd));
if (pollfd == NULL) {
/* allocate for all fds + 1 for the consumer_poll_pipe */
pollfd = zmalloc((consumer_data.stream_count + 1) * sizeof(struct pollfd));
if (pollfd == NULL) {
-
perror
("pollfd malloc");
+
PERROR
("pollfd malloc");
pthread_mutex_unlock(&consumer_data.lock);
goto end;
}
pthread_mutex_unlock(&consumer_data.lock);
goto end;
}
@@
-1891,7
+1900,7
@@
void *lttng_consumer_thread_poll_fds(void *data)
local_stream = zmalloc((consumer_data.stream_count + 1) *
sizeof(struct lttng_consumer_stream));
if (local_stream == NULL) {
local_stream = zmalloc((consumer_data.stream_count + 1) *
sizeof(struct lttng_consumer_stream));
if (local_stream == NULL) {
-
perror
("local_stream malloc");
+
PERROR
("local_stream malloc");
pthread_mutex_unlock(&consumer_data.lock);
goto end;
}
pthread_mutex_unlock(&consumer_data.lock);
goto end;
}
@@
-1923,7
+1932,7
@@
void *lttng_consumer_thread_poll_fds(void *data)
if (errno == EINTR) {
goto restart;
}
if (errno == EINTR) {
goto restart;
}
-
perror
("Poll error");
+
PERROR
("Poll error");
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_POLL_ERROR);
goto end;
} else if (num_rdy == 0) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_POLL_ERROR);
goto end;
} else if (num_rdy == 0) {
@@
-2095,7
+2104,7
@@
void *lttng_consumer_thread_receive_fds(void *data)
ret = fcntl(client_socket, F_SETFL, O_NONBLOCK);
if (ret < 0) {
ret = fcntl(client_socket, F_SETFL, O_NONBLOCK);
if (ret < 0) {
-
perror
("fcntl O_NONBLOCK");
+
PERROR
("fcntl O_NONBLOCK");
goto end;
}
goto end;
}
@@
-2118,7
+2127,7
@@
void *lttng_consumer_thread_receive_fds(void *data)
}
ret = fcntl(sock, F_SETFL, O_NONBLOCK);
if (ret < 0) {
}
ret = fcntl(sock, F_SETFL, O_NONBLOCK);
if (ret < 0) {
-
perror
("fcntl O_NONBLOCK");
+
PERROR
("fcntl O_NONBLOCK");
goto end;
}
goto end;
}
This page took
0.028729 seconds
and
5
git commands to generate.