cleanup

[ust.git] / libust / tracectl.c

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 533cc6599639bb5750d4f4437600c2b407a2e0f3..5439eed5cd0b3c2970fe56292d16b456fe77ec75 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -138,10 +138,38 @@ void notif_cb(void)
        }
 }
 
-static void inform_consumer_daemon(void)
+/* Ask the daemon to collect a trace called trace_name and being
+ * produced by this pid.
+ *
+ * The trace must be at least allocated. (It can also be started.)
+ * This is because _ltt_trace_find is used.
+ */
+
+static void inform_consumer_daemon(const char *trace_name)
 {
-       ustcomm_request_consumer(getpid(), "metadata");
-       ustcomm_request_consumer(getpid(), "ust");
+       int i;
+       struct ltt_trace_struct *trace;
+       pid_t pid = getpid();
+       int result;
+
+       ltt_lock_traces();
+
+       trace = _ltt_trace_find(trace_name);
+       if(trace == NULL) {
+               WARN("inform_consumer_daemon: could not find trace \"%s\"; it is probably already destroyed", trace_name);
+               goto finish;
+       }
+
+       for(i=0; i < trace->nr_channels; i++) {
+               result = ustcomm_request_consumer(pid, trace->channels[i].channel_name);
+               if(result == -1) {
+                       WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name);
+                       /* continue even if fail */
+               }
+       }
+
+       finish:
+       ltt_unlock_traces();
 }
 
 void process_blocked_consumers(void)
@@ -253,7 +281,7 @@ void *listener_main(void *p)
                        continue;
                }
 
-               DBG("received a message! it's: %s\n", recvbuf);
+               DBG("received a message! it's: %s", recvbuf);
                len = strlen(recvbuf);
 
                if(!strcmp(recvbuf, "print_markers")) {
@@ -292,7 +320,7 @@ void *listener_main(void *p)
                                return (void *)1;
                        }
 
-                       inform_consumer_daemon();
+                       inform_consumer_daemon(trace_name);
 
                        result = ltt_trace_start(trace_name);
                        if(result < 0) {
@@ -875,7 +903,7 @@ static void __attribute__((constructor(1000))) init()
        if(autoprobe_val) {
                struct marker_iter iter;
 
-               DBG("Autoprobe enabled.\n");
+               DBG("Autoprobe enabled.");
 
                /* Ensure markers are initialized */
                //init_markers();
@@ -910,9 +938,9 @@ static void __attribute__((constructor(1000))) init()
                marker_iter_reset(&iter);
                marker_iter_start(&iter);
 
-               DBG("now iterating on markers already registered\n");
+               DBG("now iterating on markers already registered");
                while(iter.marker) {
-                       DBG("now iterating on marker %s\n", iter.marker->name);
+                       DBG("now iterating on marker %s", iter.marker->name);
                        auto_probe_connect(iter.marker);
                        marker_iter_next(&iter);
                }
@@ -954,12 +982,13 @@ static void __attribute__((constructor(1000))) init()
                        return;
                }
 
+               inform_consumer_daemon(trace_name);
+
                result = ltt_trace_start(trace_name);
                if(result < 0) {
                        ERR("ltt_trace_start failed");
                        return;
                }
-               inform_consumer_daemon();
        }
 
 
@@ -1101,7 +1130,6 @@ void ust_fork(void)
        init_socket();
        have_listener = 0;
        create_listener();
-       ustcomm_request_consumer(getpid(), "metadata");
-       ustcomm_request_consumer(getpid(), "ust");
+       inform_consumer_daemon("auto");
 }