X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.h;h=d563d1016a9672d18f607d4142c91bea2d1cabee;hb=0632499a602c5588da22d191c14827be3b86a01a;hp=6c0824b80a6bb7d4f4436dba9304fed3594378f3;hpb=379473d2e442e5273e3afb7f71b1d3fb37641d0c;p=lttng-tools.git

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 6c0824b80..d563d1016 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -13,7 +13,6 @@
  * 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
@@ -23,65 +22,31 @@
 #define DEFAULT_UST_SOCK_DIR		"/tmp/ust-app-socks"
 #define DEFAULT_GLOBAL_APPS_PIPE	"/tmp/ust-app-socks/global"
 
+/*
+ * Kernel tracer defines
+ */
+#define DEFAULT_KERNEL_TRACER_PATH			"/mnt/debugfs/lttng"
+#define DEFAULT_KERNEL_OVERWRITE            0
+#define DEFAULT_KERNEL_SUBBUF_SIZE          512		/* bytes */
+#define DEFAULT_KERNEL_SUBBUF_NUM           2		/* Must always be a power of 2 */
+#define DEFAULT_KERNEL_SWITCH_TIMER         0		/* usec */
+#define DEFAULT_KERNEL_READ_TIMER           10000	/* usec */
+
 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;
-};
-
-/* 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;
-};
-
-/*
- * Registered traceable applications. Libust registers
- * to the session daemon and a linked list is kept
- * of all running traceable app.
- */
-struct ltt_traceable_app {
-	struct cds_list_head list;
-	pid_t pid;
-	uid_t uid;		/* User ID that owns the apps */
-};
-
 /*
- * ltt-session - This data structure contains information needed
- * to identify a tracing session for both LTTng and UST.
+ * This contains extra data needed for processing a command received by the
+ * session daemon from the lttng client.
  */
-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 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 */