X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracectl.c;h=e9907fc4b52a93b4de6b70905dc2ebb6a3edb2c9;hb=d748a7de2e2a43fb576d67668a8c105f863051e7;hp=3b9d3d39fccbff0d88b839c58238ee19bc7f5962;hpb=769d015768372ce7f68ff12bbc55aa339c3a6bcd;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 3b9d3d3..e9907fc 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -570,12 +570,13 @@ int listener_main(void *p)
 
 					result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old);
 					if(result < 0) {
-						WARN("ltt_do_put_subbuf: error");
+						WARN("ltt_do_put_subbuf: error (subbuf=%s)", channel_name);
+						asprintf(&reply, "%s", "ERROR", consumed_old);
 					}
 					else {
-						DBG("ltt_do_put_subbuf: success");
+						DBG("ltt_do_put_subbuf: success (subbuf=%s)", channel_name);
+						asprintf(&reply, "%s", "OK", consumed_old);
 					}
-					asprintf(&reply, "%s", "OK", consumed_old);
 
 					result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
 					if(result) {
@@ -870,6 +871,8 @@ static void __attribute__((constructor(1000))) init()
 /* This is only called if we terminate normally, not with an unhandled signal,
  * so we cannot rely on it. */
 
+/* This destructor probably isn't needed, because ustd can do crash recovery. */
+#if 0
 static void __attribute__((destructor)) fini()
 {
 	int result;
@@ -888,9 +891,6 @@ static void __attribute__((destructor)) fini()
 		ERR("ltt_trace_destroy error");
 	}
 
-	/* FIXME: wait for the consumer to be done */
-	//DBG("waiting 5 sec for consume");
-	//sleep(5);
-
 	destroy_socket();
 }
+#endif