X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustconsumer%2Flibustconsumer.c;h=25c84ce0c48d36b20ef6369e8f0a60d5a2508293;hb=7f0357f05bf1dae6e371b04a6f94d6912f0a0303;hp=6cb3dbf3b472327c65b1a8363d552a23c6b042ec;hpb=9dc7b7ff797a5cbb1e9ffd59e053a04562f306c4;p=ust.git

diff --git a/libustconsumer/libustconsumer.c b/libustconsumer/libustconsumer.c
index 6cb3dbf..25c84ce 100644
--- a/libustconsumer/libustconsumer.c
+++ b/libustconsumer/libustconsumer.c
@@ -445,7 +445,8 @@ static void destroy_buffer(struct ustconsumer_callbacks *callbacks,
 
 int consumer_loop(struct ustconsumer_instance *instance, struct buffer_info *buf)
 {
-	int result, read_result;
+	int result = 0;
+	int read_result;
 	char read_buf;
 
 	pthread_cleanup_push(decrement_active_buffers, instance);
@@ -487,6 +488,7 @@ int consumer_loop(struct ustconsumer_instance *instance, struct buffer_info *buf
 			/* Skip the first subbuffer. We are not sure it is trustable
 			 * because the put_subbuffer() did not complete.
 			 */
+			/* TODO: check on_put_error return value */
 			if(instance->callbacks->on_put_error)
 				instance->callbacks->on_put_error(instance->callbacks, buf);
 
@@ -598,7 +600,7 @@ int start_consuming_buffer(struct ustconsumer_instance *instance, pid_t pid,
 	args->channel_cpu = channel_cpu;
 	args->instance = instance;
 	DBG("beginning2 of start_consuming_buffer: args: pid %d trace %s"
-	    " bufname %s_%d", args->pid, args->channel, args->channel_cpu);
+	    " bufname %s_%d", args->pid, args->trace, args->channel, args->channel_cpu);
 
 	result = pthread_create(&thr, NULL, consumer_thread, args);
 	if(result == -1) {
@@ -611,7 +613,7 @@ int start_consuming_buffer(struct ustconsumer_instance *instance, pid_t pid,
 		return -1;
 	}
 	DBG("end of start_consuming_buffer: args: pid %d trace %s "
-	    "bufname %s_%d", args->pid, args->channel, args->channel_cpu);
+	    "bufname %s_%d", args->pid, args->channel, args->trace, args->channel_cpu);
 
 	return 0;
 }