X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flibltt%2Flibltt.c;h=662a05871521d5ac39c78649cfacf44ee4b01d85;hb=065f8f4123ad297a3a37864225b73b72cfc2e43a;hp=182c64720462db27e07dafbf3e36eb6a939c5671;hpb=c589e8b11c667828fab21beeb9d0ac207855fae7;p=lttv.git

diff --git a/ltt/branches/poly/libltt/libltt.c b/ltt/branches/poly/libltt/libltt.c
index 182c6472..662a0587 100644
--- a/ltt/branches/poly/libltt/libltt.c
+++ b/ltt/branches/poly/libltt/libltt.c
@@ -23,13 +23,11 @@
  * 	
  */
 
-#include <linux/socket.h>
-#include <linux/in.h> // for broken Fedora Core 3
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/netlink.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <libltt/libltt.h>
-#include <asm/socket.h>
 #include <errno.h>
 #include <stdio.h>
 
@@ -294,7 +292,7 @@ int lttctl_destroy_handle(struct lttctl_handle *h)
 
 
 int lttctl_create_trace(const struct lttctl_handle *h,
-		char *name, enum trace_mode mode)
+		char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs)
 {
 	int err;
 	
@@ -317,7 +315,9 @@ int lttctl_create_trace(const struct lttctl_handle *h,
 
 	strncpy(req.msg.trace_name, name, NAME_MAX);
 	req.msg.op = OP_CREATE;
-	req.msg.args.mode = mode;
+	req.msg.args.new_trace.mode = mode;
+	req.msg.args.new_trace.subbuf_size = subbuf_size;
+	req.msg.args.new_trace.n_subbufs = n_subbufs;
 
 	err = lttctl_netlink_sendto(h, (void *)&req, req.nlh.nlmsg_len);
 	if(err < 0) goto senderr;
@@ -329,13 +329,14 @@ int lttctl_create_trace(const struct lttctl_handle *h,
 	if(err != 0) {
 		errno = err;
 		lttctl_perror("Create Trace Error");
-		return -1;
+		return err;
 	}
 
 	return 0;
 
 senderr:
 	lttctl_perror("Create Trace Error");
+  err = EPERM;
 	return err;
 }
 
@@ -372,13 +373,14 @@ int lttctl_destroy_trace(const struct lttctl_handle *h,
 	if(err != 0) {
 		errno = err;
 		lttctl_perror("Destroy Trace Channels Error");
-		return -1;
+		return err;
 	}
 
 	return 0;
 
 senderr:
 	lttctl_perror("Destroy Trace Channels Error");
+  err = EPERM;
 	return err;
 
 }
@@ -417,12 +419,13 @@ int lttctl_start(const struct lttctl_handle *h,
 	if(err != 0) {
 		errno = err;
 		lttctl_perror("Start Trace Error");
-		return -1;
+		return err;
 	}
 
 	return 0;
 
 senderr:
+  err = EPERM;
 	lttctl_perror("Start Trace Error");
 	return err;
 
@@ -461,12 +464,14 @@ int lttctl_stop(const struct lttctl_handle *h,
 	if(err != 0) {
 		errno = err;
 		lttctl_perror("Stop Trace Error");
-		return -1;
+		return err;
 	}
 
 	return 0;
 
 senderr:
+  err = EPERM;
 	lttctl_perror("Stop Trace Error");
 	return err;
 }
+