X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=9b2d1fe0079c91753877dec1ca724466187ac9f3;hb=335a95b7e3fab0d66908594ac7039651c7aaf6f4;hp=7da0b7c686c314010bfd5106620e1892809b88c5;hpb=8db8d1dc9f11aa7995b2f77bb938f2585005413c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7da0b7c68..9b2d1fe00 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;
 	}
@@ -2159,11 +2159,11 @@ static int cmd_disable_channel(struct ltt_session *session,
 		}
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
-		goto error;
+#endif
 	default:
 		ret = LTTCOMM_UNKNOWN_DOMAIN;
 		goto error;
@@ -2222,11 +2222,11 @@ static int cmd_enable_channel(struct ltt_session *session,
 		}
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
-		goto error;
+#endif
 	default:
 		ret = LTTCOMM_UNKNOWN_DOMAIN;
 		goto error;
@@ -2289,11 +2289,13 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 				channel_name);
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2356,11 +2358,13 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2397,11 +2401,13 @@ static int cmd_add_context(struct ltt_session *session, int domain,
 		}
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2512,11 +2518,13 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 		}
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2647,11 +2655,13 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 
 		break;
 	}
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -2685,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;
 	}
 
@@ -2914,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;
 	}
 
@@ -2952,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;
 	}
 
@@ -3028,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;
 	}
 
@@ -3075,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;
 	}
 
@@ -4056,14 +4077,14 @@ static void sighandler(int sig)
 {
 	switch (sig) {
 	case SIGPIPE:
-		DBG("SIGPIPE caugth");
+		DBG("SIGPIPE caught");
 		return;
 	case SIGINT:
-		DBG("SIGINT caugth");
+		DBG("SIGINT caught");
 		stop_threads();
 		break;
 	case SIGTERM:
-		DBG("SIGTERM caugth");
+		DBG("SIGTERM caught");
 		stop_threads();
 		break;
 	default:
@@ -4137,6 +4158,8 @@ int main(int argc, char **argv)
 	void *status;
 	const char *home_path;
 
+	init_kernel_workarounds();
+
 	rcu_register_thread();
 
 	/* Create thread quit pipe */