X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=cc9fa76a5f9b9f3a1bf7087f1120ab15d17ad57d;hb=616d3093e1c34557aca7e9f6149338f43cf91886;hp=f726c8b576e707a69a0cd3508f77c184d21706c4;hpb=1332bb04be7896f89c27da5eee9f149a357547ae;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index f726c8b5..cc9fa76a 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -4,18 +4,19 @@
 /*
  * lttng/ust-abi.h
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng-UST ABI header
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <stdint.h>
@@ -127,7 +128,9 @@ struct lttng_ust_tracepoint_iter {
 struct lttng_ust_object_data {
 	int handle;
 	int shm_fd;
+	char *shm_path;
 	int wait_fd;
+	char *wait_pipe_path;
 	uint64_t memory_map_size;
 	char padding[LTTNG_UST_OBJECT_DATA_PADDING];
 };
@@ -176,7 +179,7 @@ struct lttng_ust_calibrate {
 #define LTTNG_UST_STREAM			_UST_CMD(0x60)
 #define LTTNG_UST_EVENT			\
 	_UST_CMDW(0x61, struct lttng_ust_event)
-
+#define LTTNG_UST_STREAM_PIPE			_UST_CMD(0x62)
 /* Event and Channel FD commands */
 #define LTTNG_UST_CONTEXT			\
 	_UST_CMDW(0x70, struct lttng_ust_context)
@@ -197,12 +200,16 @@ struct lttng_ust_obj;
 union ust_args {
 	struct {
 		int *shm_fd;
+		char *shm_path;
 		int *wait_fd;
+		char *wait_pipe_path;
 		uint64_t *memory_map_size;
 	} channel;
 	struct {
 		int *shm_fd;
+		char *shm_path;
 		int *wait_fd;
+		char *wait_pipe_path;
 		uint64_t *memory_map_size;
 	} stream;
 };