X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.h;h=cc6a6ba155ced9e26b6cec7b5f9f4e24a54bb968;hp=cff3ae75472aa2b79627012e77ef4d437cff8383;hb=099e26bda04bd3e02eee5b0a17fc0d7f47e3f8ea;hpb=686204ab689fc20afc4aaf014f1f4a877b1e581d

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index cff3ae754..cc6a6ba15 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -1,88 +1,91 @@
-/* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+/*
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- * 
  */
 
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
-#define DEFAULT_HOME_DIR		"/tmp"
-#define DEFAULT_TRACING_GROUP		"/tracing"
-#define DEFAULT_UST_SOCK_DIR		"/tmp/ust-app-socks"
-#define DEFAULT_GLOBAL_APPS_PIPE	"/tmp/ust-app-socks/global"
+#define _LGPL_SOURCE
+#include <urcu/wfqueue.h>
 
-extern const char default_home_dir[],
-	default_tracing_group[],
-	default_ust_sock_dir[],
-	default_global_apps_pipe[];
+#include "traceable-app.h"
 
-/* LTTng trace representation */
-struct ltt_lttng_trace {
-	struct cds_list_head list;
-	char trace_name[NAME_MAX];
-	struct cds_list_head marker_list;
-};
+#define DEFAULT_HOME_DIR            "/tmp"
+#define DEFAULT_UST_SOCK_DIR        DEFAULT_HOME_DIR "/ust-app-socks"
+#define DEFAULT_GLOBAL_APPS_PIPE    DEFAULT_UST_SOCK_DIR "/global"
+#define DEFAULT_TRACE_OUTPUT        DEFAULT_HOME_DIR "/lttng"
 
-/* UST trace representation */
-struct ltt_ust_trace {
-	struct cds_list_head list;
-	int shmid;
-	char trace_name[NAME_MAX];
-	struct cds_list_head markers;
+struct module_param {
+	const char *name;
+	int required;
 };
 
-struct ltt_ust_marker {
-	struct cds_list_head list;
-	char *name;
-	char *channel;
+/* LTTng kernel tracer modules list */
+const struct module_param kernel_modules_list[] = {
+	{ "lttng-ftrace", 0 },
+	{ "lttng-kprobes", 0 },
+	{ "lttng-kretprobes", 0 },
+	{ "lib-ring-buffer", 1 },
+	{ "ltt-relay", 1 },
+	{ "ltt-ring-buffer-client-discard", 1 },
+	{ "ltt-ring-buffer-client-overwrite", 1 },
+	{ "ltt-ring-buffer-metadata-client", 1 },
+	{ "ltt-ring-buffer-client-mmap-discard", 1 },
+	{ "ltt-ring-buffer-client-mmap-overwrite", 1 },
+	{ "ltt-ring-buffer-metadata-mmap-client", 1 },
+	{ "lttng-probe-lttng", 1 },
+	{ "lttng-types", 0 },
+	{ "lttng-probe-block", 0 },
+	{ "lttng-probe-irq", 0 },
+	{ "lttng-probe-kvm", 0 },
+	{ "lttng-probe-sched", 0 },
+	{ "lttng-probe-syscalls", 0 },
 };
 
-/* Global session list */
-struct ltt_session_list {
-	struct cds_list_head head;
-};
-
-/* Traceable application list */
-struct ltt_traceable_app_list {
-	struct cds_list_head head;
-};
+extern const char default_home_dir[],
+	default_tracing_group[],
+	default_ust_sock_dir[],
+	default_global_apps_pipe[];
 
 /*
- * Registered traceable applications. Libust registers
- * to the session daemon and a linked list is kept
- * of all running traceable app.
+ * This contains extra data needed for processing a command received by the
+ * session daemon from the lttng client.
  */
-struct ltt_traceable_app {
-	struct cds_list_head list;
-	pid_t pid;
-	uid_t uid;		/* User ID that owns the apps */
+struct command_ctx {
+	int ust_sock;
+	unsigned int lttng_msg_size;
+	struct ltt_session *session;
+	struct lttcomm_lttng_msg *llm;
+	struct lttcomm_session_msg *lsm;
+};
+
+struct ust_command {
+	int sock;
+	struct ust_register_msg reg_msg;
+	struct cds_wfq_node node;
 };
 
 /*
- * ltt-session - This data structure contains information needed
- * to identify a tracing session for both LTTng and UST.
+ * Queue used to enqueue UST registration request (ust_commant) and protected
+ * by a futex with a scheme N wakers / 1 waiters. See futex.c/.h
  */
-struct ltt_session {
-	char *name;
-	struct cds_list_head list;
-	uuid_t uuid;
-	struct cds_list_head ust_traces;
-	struct cds_list_head lttng_traces;
-	pid_t ust_consumer;
-	pid_t lttng_consumer;
+struct ust_cmd_queue {
+	int32_t futex;
+	struct cds_wfq_queue queue;
 };
 
 #endif /* _LTT_SESSIOND_H */