Fix: change function name for better meaning

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.c

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index dd8d103fd1d9c2773fe9f032d1389cedd09f32d3..1e7121e5f13dcb796350e659ed450666ba17eb51 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -721,9 +721,9 @@ error:
 }
 
 /*
- * Create stream onto the UST tracer for a UST session.
+ * Create metadata stream onto the UST tracer for a given session.
  */
-static int create_ust_stream(struct ust_app *app,
+static int create_ust_metadata_stream(struct ust_app *app,
                struct ust_app_session *ua_sess)
 {
        int ret;
@@ -1352,7 +1352,7 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 
        /* Open UST metadata stream */
        if (ua_sess->metadata->stream_obj == NULL) {
-               ret = create_ust_stream(app, ua_sess);
+               ret = create_ust_metadata_stream(app, ua_sess);
                if (ret < 0) {
                        goto error;
                }
@@ -2288,11 +2288,16 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
                        ret = ustctl_create_stream(app->sock, ua_chan->obj,
                                        &ustream->obj);
                        if (ret < 0) {
-                               /* Got all streams */
-                               lttng_fd_put(LTTNG_FD_APPS, 2);
+                               /* Free unused memory and reset FD states. */
                                free(ustream);
+                               lttng_fd_put(LTTNG_FD_APPS, 2);
+                               if (ret == -ENOENT) {
+                                       /* Got all streams. Continue normal execution. */
+                                       break;
+                               }
+                               /* Error at this point. Stop everything. */
                                ret = LTTNG_ERR_UST_STREAM_FAIL;
-                               break;
+                               goto error_rcu_unlock;
                        }
                        ustream->handle = ustream->obj->handle;
 
@@ -2350,7 +2355,7 @@ skip_setup:
        /* This start the UST tracing */
        ret = ustctl_start_session(app->sock, ua_sess->handle);
        if (ret < 0) {
-               ERR("Error starting tracing for app pid: %d", app->pid);
+               ERR("Error starting tracing for app pid: %d (ret: %d)", app->pid, ret);
                goto error_rcu_unlock;
        }
 
@@ -2402,7 +2407,7 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
         * from either the application manager thread or the command thread. Simply
         * indicate that this is a stop error.
         */
-       if (ua_sess->started == 1) {
+       if (!ua_sess->started) {
                goto error_rcu_unlock;
        }
 
@@ -2411,7 +2416,7 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
        /* This inhibits UST tracing */
        ret = ustctl_stop_session(app->sock, ua_sess->handle);
        if (ret < 0) {
-               ERR("Error stopping tracing for app pid: %d", app->pid);
+               ERR("Error stopping tracing for app pid: %d (ret: %d)", app->pid, ret);
                goto error_rcu_unlock;
        }
 
@@ -2651,12 +2656,6 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
                                /* FIXME: Should we quit here or continue... */
                                continue;
                        }
-
-                       ret = set_ust_event_filter(ua_event, app);
-                       if (ret < 0) {
-                               /* FIXME: Should we quit here or continue... */
-                               continue;
-                       }
                }
        }