X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=0e92327cd30392102617b3f343b2dd7b113d8cbb;hb=72f579eecf1453ae2a662dc2fa35690f5118b384;hp=023ad48b991a75e983cf9d9148909d8b567e06b7;hpb=1ab1ea0b77d5fc71765e06b5c84431e403e8bd2e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 023ad48b9..0e92327cd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -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;
 	}