X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttd%2Flttd.c;h=27240882189de464882d2f2ab1d64fa674fc8f29;hb=b8d28629a136662a1d1372228d7a43b558e49497;hp=230159185df229e0e3d3b220784184910489da2b;hpb=22acb617fc3d3c8e0b7a95de89679f91662aa387;p=lttv.git 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));