From ab6a656907905eb3a0f95a43a1e14a93d40e4cd2 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 7 Sep 2012 13:41:10 -0400 Subject: [PATCH 1/1] Update lttng-ust-abi.h from upstream lttng-ust Signed-off-by: David Goulet --- src/bin/lttng-sessiond/lttng-ust-abi.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h index 504c06078..91639a7c6 100644 --- a/src/bin/lttng-sessiond/lttng-ust-abi.h +++ b/src/bin/lttng-sessiond/lttng-ust-abi.h @@ -4,12 +4,9 @@ /* * lttng/ust-abi.h * - * Copyright 2010-2011 (c) - Mathieu Desnoyers - * * LTTng-UST ABI header * - * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED - * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * Copyright 2010-2012 - Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,9 +23,15 @@ #define LTTNG_UST_SYM_NAME_LEN 256 +/* Version for comm protocol between sessiond and ust */ #define LTTNG_UST_COMM_VERSION_MAJOR 2 #define LTTNG_UST_COMM_VERSION_MINOR 0 +/* Version for ABI between liblttng-ust, sessiond, consumerd */ +#define LTTNG_UST_INTERNAL_MAJOR_VERSION 3 +#define LTTNG_UST_INTERNAL_MINOR_VERSION 0 +#define LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION 0 + enum lttng_ust_instrumentation { LTTNG_UST_TRACEPOINT = 0, LTTNG_UST_PROBE = 1, @@ -96,12 +99,13 @@ enum lttng_ust_field_type { LTTNG_UST_FIELD_STRING = 4, }; -#define LTTNG_UST_FIELD_ITER_PADDING LTTNG_UST_SYM_NAME_LEN + 32 +#define LTTNG_UST_FIELD_ITER_PADDING LTTNG_UST_SYM_NAME_LEN + 28 struct lttng_ust_field_iter { char event_name[LTTNG_UST_SYM_NAME_LEN]; char field_name[LTTNG_UST_SYM_NAME_LEN]; enum lttng_ust_field_type type; int loglevel; /* event loglevel */ + int written; char padding[LTTNG_UST_FIELD_ITER_PADDING]; }; @@ -220,6 +224,9 @@ struct lttng_ust_filter_bytecode { #define LTTNG_UST_TRACEPOINT_LIST_GET _UST_CMD(0x90) #define LTTNG_UST_TRACEPOINT_FIELD_LIST_GET _UST_CMD(0x91) +/* Event FD commands */ +#define LTTNG_UST_FILTER _UST_CMD(0xA0) + #define LTTNG_UST_ROOT_HANDLE 0 struct lttng_ust_obj; -- 2.34.1