X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.h;h=af48cd92a39c16b5da4e314056c6868705b2e707;hp=f01fa2e166977dd6a4f69e623b82d6ac23dbd442;hb=540126381ff8f3b1e2b3357329fe105fc0bb5e4c;hpb=5b74c7b1ca96399ba5c8bd0ce6974aea671198eb

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index f01fa2e16..af48cd92a 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -1,15 +1,16 @@
-/* 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.
- * 
+ *
  * 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
  * 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.
@@ -19,49 +20,30 @@
 #define _LTT_SESSIOND_H
 
 #define DEFAULT_HOME_DIR			"/tmp"
-#define DEFAULT_UST_SOCK_DIR		"/tmp/ust-app-socks"
-#define DEFAULT_GLOBAL_APPS_PIPE	"/tmp/ust-app-socks/global"
+#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"
+
+/*
+ * Kernel tracer defines
+ */
+#define DEFAULT_KERNEL_TRACER_PATH			"/mnt/debugfs/lttng"
 
 extern const char default_home_dir[],
 	default_tracing_group[],
 	default_ust_sock_dir[],
 	default_global_apps_pipe[];
 
-/* LTTng trace representation */
-struct ltt_lttng_trace {
-	struct cds_list_head list;
-	char trace_name[NAME_MAX];
-	struct cds_list_head marker_list;
-};
-
-/* UST trace representation */
-struct ltt_ust_trace {
-	struct cds_list_head list;
-	int shmid;
-	pid_t pid;
-	struct cds_list_head markers;
-};
-
-struct ltt_ust_marker {
-	struct cds_list_head list;
-	char *name;
-	char *channel;
-};
-
-/* Traceable application list */
-struct ltt_traceable_app_list {
-	struct cds_list_head head;
-};
-
 /*
- * 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;
 };
 
 #endif /* _LTT_SESSIOND_H */