Major changes of command processing for sessiond

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

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 97f8658e1ab764a24774e04fe2e527423cf02169..7133d061fee9d03d064dd206e7017969141284d1 100644 (file)
--- 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
@@ -28,60 +27,16 @@ extern const char default_home_dir[],
        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;
-       char trace_name[NAME_MAX];
-       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 */