X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=extras%2Fbindings%2Fswig%2Fpython%2Flttng.i.in;h=f98fda6a012345928910ffacae08658e16649ee1;hb=fe1b18eb4c8285187d5f598f918b1da2697d1532;hp=4349d93d000ea7270c75fc008527b4f0ed0eeea1;hpb=bc3bdadae7768cb3e668e3c197ca3541b54fb9a7;p=lttng-tools.git

diff --git a/extras/bindings/swig/python/lttng.i.in b/extras/bindings/swig/python/lttng.i.in
index 4349d93d0..f98fda6a0 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;
@@ -135,10 +144,6 @@ enum lttng_event_context_type {
 	LTTNG_EVENT_CONTEXT_PTHREAD_ID        = 10,
 };
 
-%rename("CALIBRATE_FUNCTION") LTTNG_CALIBRATE_FUNCTION;
-enum lttng_calibrate_type {
-	LTTNG_CALIBRATE_FUNCTION              = 0,
-};
 
 
 
@@ -185,18 +190,20 @@ enum lttng_calibrate_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;
@@ -335,7 +342,6 @@ enum lttng_calibrate_type {
 %rename("_lttng_enable_channel") lttng_enable_channel(struct lttng_handle *handle, struct lttng_channel *chan);
 %rename("_lttng_disable_event") lttng_disable_event(struct lttng_handle *handle, const char *name, const char *channel_name);
 %rename("_lttng_disable_channel") lttng_disable_channel(struct lttng_handle *handle, const char *name);
-%rename("_lttng_calibrate") lttng_calibrate(struct lttng_handle *handle, struct lttng_calibrate *calibrate);
 %rename("channel_set_default_attr") lttng_channel_set_default_attr(struct lttng_domain *domain, struct lttng_channel_attr *attr);
 
 //Redefined functions
@@ -354,7 +360,6 @@ int lttng_enable_channel(struct lttng_handle *handle, struct lttng_channel *chan
 int lttng_disable_event(struct lttng_handle *handle,
 		const char *name, const char *channel_name);
 int lttng_disable_channel(struct lttng_handle *handle, const char *name);
-int lttng_calibrate(struct lttng_handle *handle, struct lttng_calibrate *calibrate);
 int lttng_register_consumer(struct lttng_handle *handle, const char *socket_path);
 int lttng_list_sessions(struct lttng_session **sessions);
 int lttng_list_domains(const char *session_name, struct lttng_domain **domains);
@@ -477,10 +482,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)
 
@@ -696,20 +702,6 @@ def disable_channel(handle, name):
 		return _lttng_disable_channel(handle._h, name)
 	except AttributeError:
 		raise TypeError("in method 'disable_channel', argument 1 must be a Handle instance")
-
-
-def calibrate(handle, calibrate):
-	"""
-	calibrate(Handle handle, Calibrate calibrate) -> int
-
-	Quantify LTTng overhead.
-	Returns size of returned session payload data or a negative error code.
-	"""
-
-	try:
-		return _lttng_calibrate(handle._h, calibrate)
-	except AttributeError:
-		raise TypeError("in method 'calibrate', argument 1 must be a Handle instance")
 %}
 
 
@@ -776,13 +768,13 @@ class Handle:
 %rename("Domain") lttng_domain;
 %rename("EventContext") lttng_event_context;
 %rename("Event") lttng_event;
-%rename("Calibrate") lttng_calibrate;
 %rename("ChannelAttr") lttng_channel_attr;
 %rename("Channel") lttng_channel;
 %rename("Session") lttng_session;
 
 struct lttng_domain{
 	enum lttng_domain_type type;
+	enum lttng_buffer_type buf_type;
 	char padding[LTTNG_DOMAIN_PADDING1];
 
 	union {
@@ -794,17 +786,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(temp, "lttng.Domain; type(%i)", $self->type);
+				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(buffer_type, "buf_type(%i)", $self->buf_type);
+				break;
+			}
+
+			sprintf(temp, "lttng.Domain; %s, %s",
+				domain_type,
+				buffer_type
+				);
 			return &temp[0];
 		}
 	}
@@ -954,26 +968,6 @@ struct lttng_event {
 	}
 };
 
-struct lttng_calibrate {
-	enum lttng_calibrate_type type;
-	char padding[LTTNG_CALIBRATE_PADDING1];
-
-	%extend {
-		char *__repr__() {
-			static char temp[256];
-			switch ( $self->type ) {
-			case 0:
-				sprintf(temp, "lttng.Calibrate; type(CALIBRATE_FUNCTION)");
-				break;
-			default:
-				sprintf(temp, "lttng.Calibrate; type(%i)", $self->type);
-				break;
-			}
-			return &temp[0];
-		}
-	}
-};
-
 struct lttng_channel_attr {
 	int overwrite;
 	uint64_t subbuf_size;
@@ -1020,7 +1014,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];
 		}
@@ -1035,8 +1029,8 @@ struct lttng_session {
 
 	%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];