From: compudj Date: Thu, 2 Feb 2006 18:46:27 +0000 (+0000) Subject: comment fixes X-Git-Tag: v0.12.20~1980 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b8d28629a136662a1d1372228d7a43b558e49497;p=lttv.git comment fixes git-svn-id: http://ltt.polymtl.ca/svn@1509 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/lttctl/lttctl.c b/ltt/branches/poly/lttctl/lttctl.c index c14e3c90..c73bd257 100644 --- a/ltt/branches/poly/lttctl/lttctl.c +++ b/ltt/branches/poly/lttctl/lttctl.c @@ -86,7 +86,7 @@ void show_arguments(void) printf("-x Number of subbuffers\n"); printf("-e Get XML facilities description\n"); printf("-a Append to trace\n"); - printf("-N Number of ltt threads\n"); + printf("-N Number of lttd threads\n"); printf("\n"); } diff --git a/ltt/branches/poly/lttd/lttd.c b/ltt/branches/poly/lttd/lttd.c index 23015918..27240882 100644 --- a/ltt/branches/poly/lttd/lttd.c +++ b/ltt/branches/poly/lttd/lttd.c @@ -318,7 +318,7 @@ int read_subbuffer(struct fd_pair *pair) printf("cookie : %u\n", consumed_old); if(err != 0) { ret = errno; - perror("Error in reserving sub buffer"); + perror("Reserving sub buffer failed (everything is normal)"); goto get_error; } @@ -529,8 +529,7 @@ void * read_channels(void *arg) /* it's ok to have an unavailable subbuffer */ ret = read_subbuffer(&fd_pairs->pair[i]); if(ret == -EAGAIN) ret = 0; - else if(ret) - printf("Error in read_subbuffer : %s\n", strerror(ret)); + ret = pthread_mutex_unlock(&fd_pairs->pair[i].mutex); if(ret) printf("Error in mutex unlock : %s\n", strerror(ret)); @@ -551,8 +550,7 @@ void * read_channels(void *arg) /* it's ok to have an unavailable subbuffer */ ret = read_subbuffer(&fd_pairs->pair[i]); if(ret == -EAGAIN) ret = 0; - else if(ret) - printf("Error in read_subbuffer : %s\n", strerror(ret)); + ret = pthread_mutex_unlock(&fd_pairs->pair[i].mutex); if(ret) printf("Error in mutex unlock : %s\n", strerror(ret));