X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Flttng-kernel.h;h=38a9038f61595137877f2bf0c1540c6f7271b355;hb=2f225ce2a30ad1172d65f77409aadf102825f50b;hp=e1d99ceee0bdd5ae366f196ab94da53d4b8efaee;hpb=dbbb3ec59c8af169c516360d27423af1cab923f6;p=lttng-tools.git

diff --git a/src/common/lttng-kernel.h b/src/common/lttng-kernel.h
index e1d99ceee..38a9038f6 100644
--- a/src/common/lttng-kernel.h
+++ b/src/common/lttng-kernel.h
@@ -3,25 +3,25 @@
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *                      David Goulet <david.goulet@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; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * 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.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTTNG_KERNEL_H
 #define _LTTNG_KERNEL_H
 
 #include <stdint.h>
+#include <common/macros.h>
 
 #define LTTNG_KERNEL_SYM_NAME_LEN  256
 
@@ -52,6 +52,7 @@ enum lttng_kernel_context_type {
 	LTTNG_KERNEL_CONTEXT_VTID           = 7,
 	LTTNG_KERNEL_CONTEXT_PPID           = 8,
 	LTTNG_KERNEL_CONTEXT_VPPID          = 9,
+	LTTNG_KERNEL_CONTEXT_HOSTNAME       = 10,
 };
 
 /* Perf counter attributes */
@@ -59,7 +60,7 @@ struct lttng_kernel_perf_counter_ctx {
 	uint32_t type;
 	uint64_t config;
 	char name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 /* Event/Channel context */
 #define LTTNG_KERNEL_CONTEXT_PADDING1  16
@@ -72,14 +73,14 @@ struct lttng_kernel_context {
 		struct lttng_kernel_perf_counter_ctx perf_counter;
 		char padding[LTTNG_KERNEL_CONTEXT_PADDING2];
 	} u;
-};
+} LTTNG_PACKED;
 
 struct lttng_kernel_kretprobe {
 	uint64_t addr;
 
 	uint64_t offset;
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 /*
  * Either addr is used, or symbol_name and offset.
@@ -89,12 +90,12 @@ struct lttng_kernel_kprobe {
 
 	uint64_t offset;
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 /* Function tracer */
 struct lttng_kernel_function {
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
-};
+} LTTNG_PACKED;
 
 #define LTTNG_KERNEL_EVENT_PADDING1    16
 #define LTTNG_KERNEL_EVENT_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
@@ -110,13 +111,13 @@ struct lttng_kernel_event {
 		struct lttng_kernel_function ftrace;
 		char padding[LTTNG_KERNEL_EVENT_PADDING2];
 	} u;
-};
+} LTTNG_PACKED;
 
 struct lttng_kernel_tracer_version {
-	uint32_t version;
+	uint32_t major;
+	uint32_t minor;
 	uint32_t patchlevel;
-	uint32_t sublevel;
-};
+} LTTNG_PACKED;
 
 enum lttng_kernel_calibrate_type {
 	LTTNG_KERNEL_CALIBRATE_KRETPROBE,
@@ -124,6 +125,21 @@ enum lttng_kernel_calibrate_type {
 
 struct lttng_kernel_calibrate {
 	enum lttng_kernel_calibrate_type type;	/* type (input) */
-};
+} LTTNG_PACKED;
+
+/*
+ * kernel channel
+ */
+#define LTTNG_KERNEL_CHANNEL_PADDING1 LTTNG_SYMBOL_NAME_LEN + 32
+struct lttng_kernel_channel {
+	uint64_t subbuf_size;               /* bytes */
+	uint64_t num_subbuf;                /* power of 2 */
+	unsigned int switch_timer_interval; /* usec */
+	unsigned int read_timer_interval;   /* usec */
+	enum lttng_event_output output;     /* splice, mmap */
+
+	int overwrite;                      /* 1: overwrite, 0: discard */
+	char padding[LTTNG_KERNEL_CHANNEL_PADDING1];
+} LTTNG_PACKED;
 
 #endif /* _LTTNG_KERNEL_H */