From 17baffe29814f2508556e498ab8c41a192e76b67 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 2 Jun 2011 15:40:17 -0400 Subject: [PATCH] Update licensing info Signed-off-by: Mathieu Desnoyers --- LICENSE | 17 +++++++++++++++++ deprecated/probes/net-extended-trace.c | 2 ++ lib/ringbuffer/nohz.h | 8 ++++++++ ltt-context.c | 2 ++ ltt-debugfs-abi.c | 2 ++ ltt-debugfs-abi.h | 2 ++ ltt-endian.h | 8 ++++++++ ltt-events.c | 2 ++ ltt-events.h | 2 ++ ltt-probes.c | 2 ++ ltt-tracer-core.h | 10 ++++++---- ltt-tracer.h | 10 ++++++---- probes/define_trace.h | 9 +++++++++ probes/lttng-events-reset.h | 8 ++++++++ probes/lttng-events.h | 9 +++++++++ probes/lttng-probe-block.c | 2 ++ probes/lttng-probe-irq.c | 2 ++ probes/lttng-probe-kvm.c | 2 ++ probes/lttng-probe-lttng.c | 2 ++ probes/lttng-probe-sched.c | 2 ++ probes/lttng-probe-syscalls.c | 2 ++ probes/lttng-type-list.h | 8 ++++++++ probes/lttng-types.c | 2 ++ probes/lttng-types.h | 10 ++++++++++ probes/lttng.h | 8 ++++++++ wrapper/inline_memcpy.h | 8 ++++++++ wrapper/poll.h | 8 ++++++++ 27 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..0e0efc37 --- /dev/null +++ b/LICENSE @@ -0,0 +1,17 @@ +LTTng modules licensing +Mathieu Desnoyers +June 2, 2011 + +* LGPLv2.1/GPLv2 dual-license + +The files contained within this package are licensed under +LGPLv2.1/GPLv2 dual-license, except for files identified by the +following section. + +* GPLv2 license + +These files are licensed exclusively under the GPLv2 license: + +lib/ringbuffer/ring_buffer_splice.c +instrumentation/events/mainline/*.h +instrumentation/events/lttng-modules/*.h diff --git a/deprecated/probes/net-extended-trace.c b/deprecated/probes/net-extended-trace.c index 15fc8109..ee05c2e4 100644 --- a/deprecated/probes/net-extended-trace.c +++ b/deprecated/probes/net-extended-trace.c @@ -15,6 +15,8 @@ * especially interested in the details of network traffic and do not wish to * synchronize distributed traces. * + * (C) Copyright 2009 - Mathieu Desnoyers + * * Dual LGPL v2.1/GPL v2 license. */ diff --git a/lib/ringbuffer/nohz.h b/lib/ringbuffer/nohz.h index a2d7e459..3c310725 100644 --- a/lib/ringbuffer/nohz.h +++ b/lib/ringbuffer/nohz.h @@ -1,6 +1,14 @@ #ifndef _LINUX_RING_BUFFER_NOHZ_H #define _LINUX_RING_BUFFER_NOHZ_H +/* + * ringbuffer/nohz.h + * + * Copyright (C) 2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #ifdef CONFIG_LIB_RING_BUFFER void lib_ring_buffer_tick_nohz_flush(void); void lib_ring_buffer_tick_nohz_stop(void); diff --git a/ltt-context.c b/ltt-context.c index e0cd073c..8f00bb1b 100644 --- a/ltt-context.c +++ b/ltt-context.c @@ -4,6 +4,8 @@ * Copyright 2011 (c) - Mathieu Desnoyers * * LTTng trace/channel/event context management. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c index 37b78de0..e192474d 100644 --- a/ltt-debugfs-abi.c +++ b/ltt-debugfs-abi.c @@ -20,6 +20,8 @@ * - Takes an instrumentation source as parameter * - e.g. tracepoints, dynamic_probes... * - Takes instrumentation source specific arguments. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h index 8483b275..d91c52d5 100644 --- a/ltt-debugfs-abi.h +++ b/ltt-debugfs-abi.h @@ -7,6 +7,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng debugfs ABI header + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-endian.h b/ltt-endian.h index 29d75df6..9a0512d2 100644 --- a/ltt-endian.h +++ b/ltt-endian.h @@ -1,6 +1,14 @@ #ifndef _LTT_ENDIAN_H #define _LTT_ENDIAN_H +/* + * ltt-endian.h + * + * Copyright 2010 (c) - Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #ifdef __KERNEL__ # include # ifdef __BIG_ENDIAN diff --git a/ltt-events.c b/ltt-events.c index 1b53d2c1..ffcc61ec 100644 --- a/ltt-events.c +++ b/ltt-events.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * Holds LTTng per-session event registry. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-events.h b/ltt-events.h index b9bb3bb9..de6ae0e7 100644 --- a/ltt-events.h +++ b/ltt-events.h @@ -7,6 +7,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * Holds LTTng per-session event registry. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-probes.c b/ltt-probes.c index 94beb05b..45d2dabd 100644 --- a/ltt-probes.c +++ b/ltt-probes.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * Holds LTTng probes registry. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/ltt-tracer-core.h b/ltt-tracer-core.h index e6756ed7..d464877d 100644 --- a/ltt-tracer-core.h +++ b/ltt-tracer-core.h @@ -1,14 +1,16 @@ +#ifndef LTT_TRACER_CORE_H +#define LTT_TRACER_CORE_H + /* - * Copyright (C) 2005,2006 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca) + * ltt-tracer-core.h + * + * Copyright (C) 2005-2011 Mathieu Desnoyers * * This contains the core definitions for the Linux Trace Toolkit. * * Dual LGPL v2.1/GPL v2 license. */ -#ifndef LTT_TRACER_CORE_H -#define LTT_TRACER_CORE_H - #include #include diff --git a/ltt-tracer.h b/ltt-tracer.h index b4e18f71..d98d9d0c 100644 --- a/ltt-tracer.h +++ b/ltt-tracer.h @@ -1,14 +1,16 @@ +#ifndef _LTT_TRACER_H +#define _LTT_TRACER_H + /* - * Copyright (C) 2005,2006,2008 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca) + * ltt-tracer.h + * + * Copyright (C) 2005-2011 Mathieu Desnoyers * * This contains the definitions for the Linux Trace Toolkit tracer. * * Dual LGPL v2.1/GPL v2 license. */ -#ifndef _LTT_TRACER_H -#define _LTT_TRACER_H - #include #include #include diff --git a/probes/define_trace.h b/probes/define_trace.h index 2224fd5d..3c9a4678 100644 --- a/probes/define_trace.h +++ b/probes/define_trace.h @@ -1,3 +1,12 @@ +/* + * define_trace.h + * + * Copyright (C) 2009 Steven Rostedt + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + /* * Trace files that want to automate creationg of all tracepoints defined * in their file should include this file. The following are macros that the diff --git a/probes/lttng-events-reset.h b/probes/lttng-events-reset.h index 0a1671cd..5a4089d9 100644 --- a/probes/lttng-events-reset.h +++ b/probes/lttng-events-reset.h @@ -1,3 +1,11 @@ +/* + * lttng-events-reset.h + * + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + /* Reset macros used within TRACE_EVENT to "nothing" */ #undef __field diff --git a/probes/lttng-events.h b/probes/lttng-events.h index 8de92ba5..16e26804 100644 --- a/probes/lttng-events.h +++ b/probes/lttng-events.h @@ -1,3 +1,12 @@ +/* + * lttng-events.h + * + * Copyright (C) 2009 Steven Rostedt + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #include #include "lttng.h" #include "lttng-types.h" diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c index 43dd2be1..9eeebfc3 100644 --- a/probes/lttng-probe-block.c +++ b/probes/lttng-probe-block.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng block probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-probe-irq.c b/probes/lttng-probe-irq.c index fd4213f0..4a6a322d 100644 --- a/probes/lttng-probe-irq.c +++ b/probes/lttng-probe-irq.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng irq probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-probe-kvm.c b/probes/lttng-probe-kvm.c index 05988e55..9efc6dd1 100644 --- a/probes/lttng-probe-kvm.c +++ b/probes/lttng-probe-kvm.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng kvm probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-probe-lttng.c b/probes/lttng-probe-lttng.c index 99a3dd9c..62aab6c7 100644 --- a/probes/lttng-probe-lttng.c +++ b/probes/lttng-probe-lttng.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng core probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-probe-sched.c b/probes/lttng-probe-sched.c index 8f9f2470..18c1521d 100644 --- a/probes/lttng-probe-sched.c +++ b/probes/lttng-probe-sched.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng sched probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-probe-syscalls.c b/probes/lttng-probe-syscalls.c index 57ef2c4a..3889b507 100644 --- a/probes/lttng-probe-syscalls.c +++ b/probes/lttng-probe-syscalls.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng sched probes. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-type-list.h b/probes/lttng-type-list.h index 84acc4e8..7b953dbc 100644 --- a/probes/lttng-type-list.h +++ b/probes/lttng-type-list.h @@ -1,3 +1,11 @@ +/* + * lttng-type-list.h + * + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + /* Type list, used to create metadata */ /* Enumerations */ diff --git a/probes/lttng-types.c b/probes/lttng-types.c index ecd4c867..93a9ae54 100644 --- a/probes/lttng-types.c +++ b/probes/lttng-types.c @@ -4,6 +4,8 @@ * Copyright 2010 (c) - Mathieu Desnoyers * * LTTng types. + * + * Dual LGPL v2.1/GPL v2 license. */ #include diff --git a/probes/lttng-types.h b/probes/lttng-types.h index cec2739e..10620280 100644 --- a/probes/lttng-types.h +++ b/probes/lttng-types.h @@ -5,6 +5,16 @@ #ifndef _LTTNG_PROBES_LTTNG_TYPES_H #define _LTTNG_PROBES_LTTNG_TYPES_H +/* + * probes/lttng-types.h + * + * Copyright 2010 (c) - Mathieu Desnoyers + * + * LTTng types. + * + * Dual LGPL v2.1/GPL v2 license. + */ + #include #include "lttng.h" #include "../ltt-events.h" diff --git a/probes/lttng.h b/probes/lttng.h index f87017ba..e16fc2dd 100644 --- a/probes/lttng.h +++ b/probes/lttng.h @@ -1,6 +1,14 @@ #ifndef _LTTNG_PROBES_LTTNG_H #define _LTTNG_PROBES_LTTNG_H +/* + * lttng.h + * + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #undef PARAMS #define PARAMS(args...) args diff --git a/wrapper/inline_memcpy.h b/wrapper/inline_memcpy.h index ae4ba10e..33150cdb 100644 --- a/wrapper/inline_memcpy.h +++ b/wrapper/inline_memcpy.h @@ -1,3 +1,11 @@ +/* + * wrapper/inline_memcpy.h + * + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #if !defined(__HAVE_ARCH_INLINE_MEMCPY) && !defined(inline_memcpy) #define inline_memcpy memcpy #endif diff --git a/wrapper/poll.h b/wrapper/poll.h index 71ebce94..416ce574 100644 --- a/wrapper/poll.h +++ b/wrapper/poll.h @@ -1,3 +1,11 @@ +/* + * wrapper/poll.h + * + * Copyright (C) 2010-2011 Mathieu Desnoyers + * + * Dual LGPL v2.1/GPL v2 license. + */ + #ifndef CONFIG_LIB_RING_BUFFER #include -- 2.34.1