[lttng-dev] [PATCH lttng-modules] Cleanup: Remove unused lttng-types module

Mathieu Desnoyers mathieu.desnoyers at efficios.com
Fri Feb 12 15:35:49 EST 2016


merged in master, thanks!

Mathieu

----- On Feb 12, 2016, at 3:26 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> lttng-events.h           |  2 --
> probes/Kbuild            |  1 -
> probes/lttng-type-list.h | 33 ------------------------
> probes/lttng-types.c     | 66 ------------------------------------------------
> 4 files changed, 102 deletions(-)
> delete mode 100644 probes/lttng-type-list.h
> delete mode 100644 probes/lttng-types.c
> 
> diff --git a/lttng-events.h b/lttng-events.h
> index 1b4f39c..2eccf86 100644
> --- a/lttng-events.h
> +++ b/lttng-events.h
> @@ -43,7 +43,6 @@ struct lib_ring_buffer_config;
> 
> /* Type description */
> 
> -/* Update the astract_types name table in lttng-types.c along with this enum */
> enum abstract_types {
> 	atype_integer,
> 	atype_enum,
> @@ -53,7 +52,6 @@ enum abstract_types {
> 	NR_ABSTRACT_TYPES,
> };
> 
> -/* Update the string_encodings name table in lttng-types.c along with this enum
> */
> enum lttng_string_encodings {
> 	lttng_encode_none = 0,
> 	lttng_encode_UTF8 = 1,
> diff --git a/probes/Kbuild b/probes/Kbuild
> index 13e7bd8..0be49d7 100644
> --- a/probes/Kbuild
> +++ b/probes/Kbuild
> @@ -3,7 +3,6 @@ MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
> include $(MAKEFILEDIR)/../Makefile.ABI.workarounds
> 
> ccflags-y += -I$(PWD)/probes
> -obj-$(CONFIG_LTTNG) += lttng-types.o
> 
> obj-$(CONFIG_LTTNG) += lttng-probe-sched.o
> obj-$(CONFIG_LTTNG) += lttng-probe-irq.o
> diff --git a/probes/lttng-type-list.h b/probes/lttng-type-list.h
> deleted file mode 100644
> index 564a13f..0000000
> --- a/probes/lttng-type-list.h
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/*
> - * lttng-type-list.h
> - *
> - * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; only
> - * version 2.1 of the License.
> - *
> - * This library 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
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> - */
> -
> -/* Type list, used to create metadata */
> -
> -/* Enumerations */
> -TRACE_EVENT_ENUM(hrtimer_mode,
> -        V(HRTIMER_MODE_ABS),
> -        V(HRTIMER_MODE_REL),
> -        V(HRTIMER_MODE_PINNED),
> -        V(HRTIMER_MODE_ABS_PINNED),
> -        V(HRTIMER_MODE_REL_PINNED),
> -	R(HRTIMER_MODE_UNDEFINED, 0x04, 0x20),	/* Example (to remove) */
> -)
> -
> -TRACE_EVENT_TYPE(hrtimer_mode, enum, unsigned char)
> diff --git a/probes/lttng-types.c b/probes/lttng-types.c
> deleted file mode 100644
> index 0973454..0000000
> --- a/probes/lttng-types.c
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -/*
> - * probes/lttng-types.c
> - *
> - * LTTng types.
> - *
> - * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; only
> - * version 2.1 of the License.
> - *
> - * This library 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
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> - */
> -
> -#include <linux/module.h>
> -#include <linux/types.h>
> -#include "../wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
> -#include "../lttng-events.h"
> -#include "lttng-types.h"
> -#include <linux/hrtimer.h>
> -#include "../lttng-tracer.h"
> -
> -#define STAGE_EXPORT_ENUMS
> -#include "lttng-types.h"
> -#include "lttng-type-list.h"
> -#undef STAGE_EXPORT_ENUMS
> -
> -struct lttng_enum lttng_enums[] = {
> -#define STAGE_EXPORT_TYPES
> -#include "lttng-types.h"
> -#include "lttng-type-list.h"
> -#undef STAGE_EXPORT_TYPES
> -};
> -
> -static int lttng_types_init(void)
> -{
> -	int ret = 0;
> -
> -	wrapper_vmalloc_sync_all();
> -	/* TODO */
> -	return ret;
> -}
> -
> -module_init(lttng_types_init);
> -
> -static void lttng_types_exit(void)
> -{
> -}
> -
> -module_exit(lttng_types_exit);
> -
> -MODULE_LICENSE("GPL and additional rights");
> -MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers at efficios.com>");
> -MODULE_DESCRIPTION("LTTng types");
> -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
> -	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
> -	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
> -	LTTNG_MODULES_EXTRAVERSION);
> --
> 2.7.0

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com



More information about the lttng-dev mailing list