Add kernel trace data structure init functions

[lttng-tools.git] / ltt-sessiond / ltt-sessiond.h

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 491656e852b27650e53f4a2705773d1253cde13c..af48cd92a39c16b5da4e314056c6868705b2e707 100644 (file)
--- 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,33 +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;
+/*
+ * This contains extra data needed for processing a command received by the
+ * session daemon from the lttng client.
+ */
+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 */