Remove default defines from lttng.h

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 023ad48b991a75e983cf9d9148909d8b567e06b7..4e5771f03639b476748c97a459e8c7aab0829fee 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -77,7 +77,7 @@ struct consumer_data {
 
 /* Const values */
 const char default_home_dir[] = DEFAULT_HOME_DIR;
-const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;
+const char default_tracing_group[] = DEFAULT_TRACING_GROUP;
 const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
 const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
 
@@ -215,11 +215,11 @@ void setup_consumerd_path(void)
        if (bin) {
                consumerd64_bin = bin;
        }
-       libdir = getenv("LTTNG_TOOLS_CONSUMERD32_LIBDIR");
+       libdir = getenv("LTTNG_CONSUMERD32_LIBDIR");
        if (libdir) {
                consumerd32_libdir = libdir;
        }
-       libdir = getenv("LTTNG_TOOLS_CONSUMERD64_LIBDIR");
+       libdir = getenv("LTTNG_CONSUMERD64_LIBDIR");
        if (libdir) {
                consumerd64_libdir = libdir;
        }
@@ -2924,8 +2924,19 @@ static int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
                }
                break;
        }
+       case LTTNG_DOMAIN_UST:
+       {
+               struct lttng_ust_calibrate ucalibrate;
+
+               ucalibrate.type = calibrate->type;
+               ret = ust_app_calibrate_glb(&ucalibrate);
+               if (ret < 0) {
+                       ret = LTTCOMM_UST_CALIBRATE_FAIL;
+                       goto error;
+               }
+               break;
+       }
        default:
-               /* TODO: Userspace tracing */
                ret = LTTCOMM_UND;
                goto error;
        }