X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=9eabf6225376360d2eef8e9d83d33b668e84c35e;hp=2c63ef0b5e65f7149e28eca47d6730cfeee3c9aa;hb=b0a5f0fbc428de5cd15a5c86f95a12f32e8c3c88;hpb=d5979e4a295b782fb44a1dc61fb4e01c47bcdf2c

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 2c63ef0b5..9eabf6225 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
@@ -181,7 +182,7 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
+struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 {
 	struct ltt_ust_session *lus;
 
@@ -202,7 +203,7 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 	 * during the session lifetime which is at the first enable channel and
 	 * only before start. The flag buffer_type_changed indicates the status.
 	 */
-	lus->buffer_type = LTTNG_BUFFER_PER_PID;
+	lus->buffer_type = LTTNG_BUFFER_PER_UID;
 	/* Once set to 1, the buffer_type is immutable for the session. */
 	lus->buffer_type_changed = 0;
 	/* Init it in case it get used after allocation. */
@@ -431,6 +432,9 @@ struct ltt_ust_context *trace_ust_create_context(
 	case LTTNG_EVENT_CONTEXT_PROCNAME:
 		utype = LTTNG_UST_CONTEXT_PROCNAME;
 		break;
+	case LTTNG_EVENT_CONTEXT_IP:
+		utype = LTTNG_UST_CONTEXT_IP;
+		break;
 	default:
 		ERR("Invalid UST context");
 		return NULL;
@@ -646,7 +650,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	assert(session);
 
-	DBG2("Trace UST destroy session %u", session->id);
+	DBG2("Trace UST destroy session %" PRIu64, session->id);
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);