X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=extras%2Fbindings%2Fswig%2Fpython%2Flttng.i.in;h=780ee01b5222ee2c87f004c8e51ce513e2e6806d;hp=e48bf6d8e57a6e229d4ed76d62ad7f340916e586;hb=dd5f427a5998f826204ac3bfc1659cd7177dc747;hpb=965ef48e12ccfb55fed5c1782fb6739ce67dd323

diff --git a/extras/bindings/swig/python/lttng.i.in b/extras/bindings/swig/python/lttng.i.in
index e48bf6d8e..780ee01b5 100644
--- a/extras/bindings/swig/python/lttng.i.in
+++ b/extras/bindings/swig/python/lttng.i.in
@@ -44,6 +44,15 @@ enum lttng_domain_type {
 	LTTNG_DOMAIN_UST                      = 2,
 };
 
+%rename("BUFFER_PER_PID") LTTNG_BUFFER_PER_PID;
+%rename("BUFFER_PER_UID") LTTNG_BUFFER_PER_UID;
+%rename("BUFFER_GLOBAL") LTTNG_BUFFER_GLOBAL;
+enum lttng_buffer_type {
+	LTTNG_BUFFER_PER_PID,
+	LTTNG_BUFFER_PER_UID,
+	LTTNG_BUFFER_GLOBAL,
+};
+
 %rename("EVENT_ALL") LTTNG_EVENT_ALL;
 %rename("EVENT_TRACEPOINT") LTTNG_EVENT_TRACEPOINT;
 %rename("EVENT_PROBE") LTTNG_EVENT_PROBE;
@@ -156,12 +165,10 @@ enum lttng_event_context_type {
 			PyObject *name = PyString_FromString((*$1)[i].name);
 			PyObject *path = PyString_FromString((*$1)[i].path);
 			PyObject *enabled = PyInt_FromSize_t((*$1)[i].enabled);
-			PyObject *padding = PyString_FromString((*$1)[i].padding);
 
 			PyTuple_SetItem(tmp, 0, name);
 			PyTuple_SetItem(tmp, 1, path);
 			PyTuple_SetItem(tmp, 2, enabled);
-			PyTuple_SetItem(tmp, 3, padding);
 			PyList_Append(sessions, tmp);
 		}
 		$result = sessions;
@@ -181,18 +188,20 @@ enum lttng_event_context_type {
 		int i;
 		for(i=0; i<l; i++)
 		{
-			PyObject *tmp = PyTuple_New(5);
+			PyObject *tmp = PyTuple_New(6);
 			PyObject *type = PyInt_FromSize_t((*$1)[i].type);
+			PyObject *buf_type = PyInt_FromSize_t((*$1)[i].buf_type);
 			PyObject *execname = PyString_FromString((*$1)[i].attr.exec_name);
 			PyObject *pid = PyInt_FromSize_t((*$1)[i].attr.pid);
 			PyObject *padding = PyString_FromString((*$1)[i].padding);
 			PyObject *attrpadding = PyString_FromString((*$1)[i].attr.padding);
 
 			PyTuple_SetItem(tmp, 0, type);
-			PyTuple_SetItem(tmp, 1, padding);
-			PyTuple_SetItem(tmp, 2, pid);
-			PyTuple_SetItem(tmp, 3, execname);
-			PyTuple_SetItem(tmp, 4, attrpadding);
+			PyTuple_SetItem(tmp, 1, buf_type);
+			PyTuple_SetItem(tmp, 2, padding);
+			PyTuple_SetItem(tmp, 3, pid);
+			PyTuple_SetItem(tmp, 4, execname);
+			PyTuple_SetItem(tmp, 5, attrpadding);
 			PyList_Append(dom, tmp);
 		}
 		$result = dom;
@@ -471,10 +480,11 @@ def list_domains(session_name):
 	for dom_elements in dom_list:
 		dom = Domain()
 		dom.type = dom_elements[0]
-		dom.paddinf = dom_elements[1]
-		dom.attr.pid = dom_elements[2]
-		dom.attr.exec_name = dom_elements[3]
-		dom.attr.padding = dom_elements[4]
+		dom.buf_type = dom_elements[1]
+		dom.paddinf = dom_elements[2]
+		dom.attr.pid = dom_elements[3]
+		dom.attr.exec_name = dom_elements[4]
+		dom.attr.padding = dom_elements[5]
 
 		domains.append(dom)
 
@@ -762,6 +772,7 @@ class Handle:
 
 struct lttng_domain{
 	enum lttng_domain_type type;
+	enum lttng_buffer_type buf_type;
 	char padding[LTTNG_DOMAIN_PADDING1];
 
 	union {
@@ -773,17 +784,39 @@ struct lttng_domain{
 	%extend {
 		char *__repr__() {
 			static char temp[256];
+			static char domain_type[25];
+			static char buffer_type[25];
 			switch ( $self->type ) {
 			case 1:
-				sprintf(temp, "lttng.Domain; type(DOMAIN_KERNEL)");
+				sprintf(domain_type, "type(DOMAIN_KERNEL)");
 				break;
 			case 2:
-				sprintf(temp, "lttng.Domain; type(DOMAIN_UST)");
+				sprintf(domain_type, "type(DOMAIN_UST)");
+				break;
+			default:
+				sprintf(domain_type, "type(%i)", $self->type);
+				break;
+			}
+
+			switch ( $self->buf_type ) {
+			case LTTNG_BUFFER_PER_UID:
+				sprintf(buffer_type, "buf_type(BUFFER_PER_UID)");
+				break;
+			case LTTNG_BUFFER_PER_PID:
+				sprintf(buffer_type, "buf_type(BUFFER_PER_PID)");
+				break;
+			case LTTNG_BUFFER_GLOBAL:
+				sprintf(buffer_type, "buf_type(BUFFER_GLOBAL)");
 				break;
 			default:
-				sprintf(temp, "lttng.Domain; type(%i)", $self->type);
+				sprintf(buffer_type, "buf_type(%i)", $self->buf_type);
 				break;
 			}
+
+			sprintf(temp, "lttng.Domain; %s, %s",
+				domain_type,
+				buffer_type
+				);
 			return &temp[0];
 		}
 	}
@@ -979,7 +1012,7 @@ struct lttng_channel {
 	%extend {
 		char *__repr__() {
 			static char temp[512];
-			sprintf(temp, "lttng.Channel; name('%s'), enabled(%s)",
+			snprintf(temp, sizeof(temp), "lttng.Channel; name('%s'), enabled(%s)",
 				$self->name, $self->enabled ? "True" : "False");
 			return &temp[0];
 		}
@@ -990,12 +1023,17 @@ struct lttng_session {
 	char name[NAME_MAX];
 	char path[PATH_MAX];
 	uint32_t enabled;
-	char padding[LTTNG_SESSION_PADDING1];
+	uint32_t snapshot_mode;
+	unsigned int live_timer_interval;
+	union {
+		char padding[LTTNG_SESSION_PADDING1];
+		void *ptr;
+	} extended;
 
 	%extend {
 		char *__repr__() {
-			static char temp[512];
-			sprintf(temp, "lttng.Session; name('%s'), path('%s'), enabled(%s)",
+			static char temp[PATH_MAX + NAME_MAX + 512];
+			snprintf(temp, sizeof(temp), "lttng.Session; name('%s'), path('%s'), enabled(%s)",
 				$self->name, $self->path,
 				$self->enabled ? "True" : "False");
 			return &temp[0];