Add lttng-error.h containing every API err. code

[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 e5d8b5707dea19b10810a89ecae52191b189fc15..af0a51b8891d1ad952c2324786798acf6a2f0fdf 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2196,6 +2196,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
        ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
        if (ret < 0) {
+               ret = LTTNG_ERR_UST_META_FAIL;
                goto error_rcu_unlock;
        }
 
@@ -2227,6 +2228,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
                                /* Got all streams */
                                lttng_fd_put(LTTNG_FD_APPS, 2);
                                free(ustream);
+                               ret = LTTNG_ERR_UST_STREAM_FAIL;
                                break;
                        }
                        ustream->handle = ustream->obj->handle;
@@ -2921,12 +2923,12 @@ int ust_app_validate_version(int sock)
        }
 
        /* Validate version */
-       if (app->version.major > UST_APP_MAJOR_VERSION) {
+       if (app->version.major != UST_APP_MAJOR_VERSION) {
                goto error;
        }
 
-       DBG2("UST app PID %d is compatible with major version %d "
-                       "(supporting <= %d)", app->pid, app->version.major,
+       DBG2("UST app PID %d is compatible with internal major version %d "
+                       "(supporting == %d)", app->pid, app->version.major,
                        UST_APP_MAJOR_VERSION);
        app->compatible = 1;
        rcu_read_unlock();
@@ -2934,8 +2936,8 @@ int ust_app_validate_version(int sock)
        return 0;
 
 error:
-       DBG2("UST app PID %d is not compatible with major version %d "
-                       "(supporting <= %d)", app->pid, app->version.major,
+       DBG2("UST app PID %d is not compatible with internal major version %d "
+                       "(supporting == %d)", app->pid, app->version.major,
                        UST_APP_MAJOR_VERSION);
        app->compatible = 0;
        rcu_read_unlock();