From 7a57cf92a463031c8cb668900f9215e3773a15c3 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 3 Oct 2012 11:07:14 -0400 Subject: [PATCH] Fix coding style and add/change debug statements Change all perror() to PERROR() and add some DBG() and ERR() statement for easier verbose reading. Signed-off-by: David Goulet --- src/common/consumer.c | 49 +++++++++++++++----------- src/common/ust-consumer/ust-consumer.c | 16 ++++++--- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/common/consumer.c b/src/common/consumer.c index 53806b08d..f01eb5d06 100644 --- 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 */ - if (key < 0) + if (key < 0) { return NULL; + } 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 */ - if (key < 0) + if (key < 0) { return NULL; + } 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) { - perror("munmap"); + PERROR("munmap"); } } break; @@ -353,13 +355,19 @@ struct lttng_consumer_stream *consumer_allocate_stream( stream = zmalloc(sizeof(*stream)); if (stream == NULL) { - perror("malloc struct lttng_consumer_stream"); + PERROR("malloc struct lttng_consumer_stream"); *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; + ERR("Unable to find channel for stream %d", stream_key); goto error; } stream->chan->refcount++; @@ -419,6 +427,7 @@ struct lttng_consumer_stream *consumer_allocate_stream( error: free(stream); +end: 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) { - perror("munmap"); + PERROR("munmap"); } } 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) { - perror("malloc struct lttng_consumer_channel"); + PERROR("malloc struct lttng_consumer_channel"); goto end; } channel->key = channel_key; @@ -820,7 +829,7 @@ restart: if (errno == EINTR) { goto restart; } - perror("Poll error"); + PERROR("Poll error"); 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) { - 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) { - perror("allocating context"); + PERROR("allocating context"); goto error; } @@ -997,33 +1006,33 @@ struct lttng_consumer_local_data *lttng_consumer_create( 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) { - 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) { - perror("fcntl O_NONBLOCK"); + PERROR("fcntl O_NONBLOCK"); 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) { - perror("Error creating thread pipe"); + PERROR("Error creating 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) { - perror("pollfd malloc"); + PERROR("pollfd malloc"); 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) { - perror("local_stream malloc"); + PERROR("local_stream malloc"); 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; } - perror("Poll error"); + PERROR("Poll error"); 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) { - perror("fcntl O_NONBLOCK"); + PERROR("fcntl O_NONBLOCK"); goto end; } @@ -2118,7 +2127,7 @@ void *lttng_consumer_thread_receive_fds(void *data) } ret = fcntl(sock, F_SETFL, O_NONBLOCK); if (ret < 0) { - perror("fcntl O_NONBLOCK"); + PERROR("fcntl O_NONBLOCK"); goto end; } diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index f57e2e602..76238a087 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -190,9 +190,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, return ret; } - DBG("consumer_add_stream chan %d stream %d", - msg.u.stream.channel_key, - msg.u.stream.stream_key); + DBG("Consumer command ADD_STREAM chan %d stream %d", + msg.u.stream.channel_key, msg.u.stream.stream_key); assert(msg.u.stream.output == LTTNG_EVENT_MMAP); new_stream = consumer_allocate_stream(msg.u.stream.channel_key, @@ -384,17 +383,24 @@ int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream) obj.wait_fd = stream->wait_fd; obj.memory_map_size = stream->mmap_len; ret = ustctl_add_stream(stream->chan->handle, &obj); - if (ret) + if (ret) { + ERR("UST ctl add_stream failed with ret %d", ret); return ret; + } + stream->buf = ustctl_open_stream_read(stream->chan->handle, stream->cpu); - if (!stream->buf) + if (!stream->buf) { + ERR("UST ctl open_stream_read failed"); return -EBUSY; + } + /* ustctl_open_stream_read has closed the shm fd. */ stream->wait_fd_is_copy = 1; stream->shm_fd = -1; stream->mmap_base = ustctl_get_mmap_base(stream->chan->handle, stream->buf); if (!stream->mmap_base) { + ERR("UST ctl get_mmap_base failed"); return -EINVAL; } -- 2.34.1