fixes libctl

git-svn-id: http://ltt.polymtl.ca/svn@1259 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/liblttctl/Makefile.am b/ltt/branches/poly/liblttctl/Makefile.am
index 80f0bba675bad1a06623233771db46fba8127eae..1c650f0baa8eb384fbe81ae843f97d1627a45e98 100644 (file)
--- a/ltt/branches/poly/liblttctl/Makefile.am
+++ b/ltt/branches/poly/liblttctl/Makefile.am
@@ -1,9 +1,5 @@
 
 
-INCLUDES = \
-  $(DEFAULT_INCLUDES)
-
-
 lib_LTLIBRARIES = liblttctl.la
 liblttctl_la_SOURCES = liblttctl.c
 

diff --git a/ltt/branches/poly/liblttctl/liblttctl.h b/ltt/branches/poly/liblttctl/liblttctl.h
deleted file mode 100644 (file)
index 80cebba..0000000
--- a/ltt/branches/poly/liblttctl/liblttctl.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* libltt header file
- *
- * Copyright 2005-
- *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
- * Inspired from iptables, by James Morris <jmorris@intercode.com.au>.
- * 
- */
-
-#ifndef _LIBLTT_H
-#define _LIBLTT_H
-
-#include <linux/limits.h>
-#include <asm/types.h>
-#include <sys/socket.h>
-#include <linux/netlink.h>
-
-#ifndef NETLINK_LTT
-#define NETLINK_LTT 12
-#endif
-
-
-enum trace_op {
-       OP_CREATE,
-       OP_DESTROY,
-       OP_START,
-       OP_STOP,
-       OP_NONE
-};
-
-enum trace_mode {
-       LTT_TRACE_NORMAL,
-       LTT_TRACE_FLIGHT
-};
-
-typedef struct lttctl_peer_msg {
-       char trace_name[NAME_MAX];
-       enum trace_op op;
-       union {
-    struct {
-      enum trace_mode mode;
-      unsigned subbuf_size;
-      unsigned n_subbufs;
-    } new_trace;
-       } args;
-} lttctl_peer_msg_t;
-
-
-struct lttctl_handle
-{
-  int fd;
-  //u_int8_t blocking;
-  struct sockaddr_nl local;
-  struct sockaddr_nl peer;
-};
-
-typedef struct lttctl_resp_msg {
-       int err;
-} lttctl_resp_msg_t;
-
-struct lttctl_handle *lttctl_create_handle(void);
-
-int lttctl_destroy_handle(struct lttctl_handle *h);
-
-
-int lttctl_create_trace(const struct lttctl_handle *h,
-               char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs);
-
-int lttctl_destroy_trace(const struct lttctl_handle *handle, char *name);
-
-int lttctl_start(const struct lttctl_handle *handle, char *name);
-
-int lttctl_stop(const struct lttctl_handle *handle, char *name);
-
-#define LTTCTLM_BASE   0x10
-#define LTTCTLM_CONTROL        (LTTCTLM_BASE + 1)      /* LTT control message */
-
-
-#endif //_LIBLTT_H

diff --git a/ltt/branches/poly/liblttctl/lttctl.h b/ltt/branches/poly/liblttctl/lttctl.h
new file mode 100644 (file)
index 0000000..80cebba
--- /dev/null
+++ b/ltt/branches/poly/liblttctl/lttctl.h
@@ -0,0 +1,91 @@
+/* libltt header file
+ *
+ * Copyright 2005-
+ *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *
+ * Inspired from iptables, by James Morris <jmorris@intercode.com.au>.
+ * 
+ */
+
+#ifndef _LIBLTT_H
+#define _LIBLTT_H
+
+#include <linux/limits.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+#ifndef NETLINK_LTT
+#define NETLINK_LTT 12
+#endif
+
+
+enum trace_op {
+       OP_CREATE,
+       OP_DESTROY,
+       OP_START,
+       OP_STOP,
+       OP_NONE
+};
+
+enum trace_mode {
+       LTT_TRACE_NORMAL,
+       LTT_TRACE_FLIGHT
+};
+
+typedef struct lttctl_peer_msg {
+       char trace_name[NAME_MAX];
+       enum trace_op op;
+       union {
+    struct {
+      enum trace_mode mode;
+      unsigned subbuf_size;
+      unsigned n_subbufs;
+    } new_trace;
+       } args;
+} lttctl_peer_msg_t;
+
+
+struct lttctl_handle
+{
+  int fd;
+  //u_int8_t blocking;
+  struct sockaddr_nl local;
+  struct sockaddr_nl peer;
+};
+
+typedef struct lttctl_resp_msg {
+       int err;
+} lttctl_resp_msg_t;
+
+struct lttctl_handle *lttctl_create_handle(void);
+
+int lttctl_destroy_handle(struct lttctl_handle *h);
+
+
+int lttctl_create_trace(const struct lttctl_handle *h,
+               char *name, enum trace_mode mode, unsigned subbuf_size, unsigned n_subbufs);
+
+int lttctl_destroy_trace(const struct lttctl_handle *handle, char *name);
+
+int lttctl_start(const struct lttctl_handle *handle, char *name);
+
+int lttctl_stop(const struct lttctl_handle *handle, char *name);
+
+#define LTTCTLM_BASE   0x10
+#define LTTCTLM_CONTROL        (LTTCTLM_BASE + 1)      /* LTT control message */
+
+
+#endif //_LIBLTT_H