X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=4e5771f03639b476748c97a459e8c7aab0829fee;hb=bbccc3d2cb9f83aecf00a207de9eef68c766bf9c;hp=1b837c1fc52ed201bcc2e553d2c67ce71189bddc;hpb=d78d661021eb1c5761c631dbd525697769fe638b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 1b837c1fc..4e5771f03 100644
--- 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;
 	}
@@ -2295,7 +2295,7 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2364,7 +2364,7 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2407,7 +2407,7 @@ static int cmd_add_context(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2524,7 +2524,7 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2661,7 +2661,7 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 #endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2695,7 +2695,7 @@ static ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
 		}
 		break;
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2924,9 +2924,20 @@ 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_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2962,7 +2973,7 @@ static int cmd_register_consumer(struct ltt_session *session, int domain,
 		break;
 	default:
 		/* TODO: Userspace tracing */
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -3038,7 +3049,7 @@ static ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		break;
 	default:
 		*channels = NULL;
-		ret = -LTTCOMM_NOT_IMPLEMENTED;
+		ret = -LTTCOMM_UND;
 		goto error;
 	}
 
@@ -3085,7 +3096,7 @@ static ssize_t cmd_list_events(int domain, struct ltt_session *session,
 		break;
 	}
 	default:
-		ret = -LTTCOMM_NOT_IMPLEMENTED;
+		ret = -LTTCOMM_UND;
 		goto error;
 	}