Distribute all necessary files for building

[ust.git] / libust / tracectl.c

diff --git a/libust/tracectl.c b/libust/tracectl.c
index b3dd4c207ab731953036f8c2f09518b39e93c40c..e9907fc4b52a93b4de6b70905dc2ebb6a3edb2c9 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -166,7 +166,7 @@ void process_blocked_consumers(void)
 
                                close(bc->fd_producer);
 
-                               __list_del(bc->list.prev, bc->list.next);
+                               list_del(&bc->list);
 
                                result = ustcomm_send_reply(&bc->server, "END", &bc->src);
                                if(result < 0) {
@@ -194,7 +194,7 @@ void process_blocked_consumers(void)
                        }
                        free(reply);
 
-                       __list_del(bc->list.prev, bc->list.next);
+                       list_del(&bc->list);
                }
        }
 
@@ -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