projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment fixes
[lttv.git]
/
ltt
/
branches
/
poly
/
lttd
/
lttd.c
diff --git
a/ltt/branches/poly/lttd/lttd.c
b/ltt/branches/poly/lttd/lttd.c
index 230159185df229e0e3d3b220784184910489da2b..27240882189de464882d2f2ab1d64fa674fc8f29 100644
(file)
--- 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;
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;
}
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;
/* 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));
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;
/* 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));
ret = pthread_mutex_unlock(&fd_pairs->pair[i].mutex);
if(ret)
printf("Error in mutex unlock : %s\n", strerror(ret));
This page took
0.023676 seconds
and
4
git commands to generate.