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

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 591e83104..f01fa2e16 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -13,16 +13,19 @@
  * 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
 
-const char default_home_dir[] = "/tmp";
-const char default_tracing_group[] = "tracing";
-const char default_ust_sock_dir[] = "/tmp/ust-app-socks";
-const char default_global_apps_pipe[] = "/tmp/ust-app-socks/global";
+#define DEFAULT_HOME_DIR			"/tmp"
+#define DEFAULT_UST_SOCK_DIR		"/tmp/ust-app-socks"
+#define DEFAULT_GLOBAL_APPS_PIPE	"/tmp/ust-app-socks/global"
+
+extern const char default_home_dir[],
+	default_tracing_group[],
+	default_ust_sock_dir[],
+	default_global_apps_pipe[];
 
 /* LTTng trace representation */
 struct ltt_lttng_trace {
@@ -35,7 +38,7 @@ struct ltt_lttng_trace {
 struct ltt_ust_trace {
 	struct cds_list_head list;
 	int shmid;
-	char trace_name[NAME_MAX];
+	pid_t pid;
 	struct cds_list_head markers;
 };
 
@@ -45,11 +48,6 @@ struct ltt_ust_marker {
 	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;
@@ -66,18 +64,4 @@ struct ltt_traceable_app {
 	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.
- */
-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;
-};
-
 #endif /* _LTT_SESSIOND_H */