summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-11-19 13:48:32 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:09 +0000
commit22dd6e75f80b6967db14e147ec183e587002cdb5 (patch)
tree95e1b10d655e5cddf9fa8b691d662fb1fdd61bfb
parentef73f219ada40dd5fae827e0427012843fc3f70e (diff)
downloadpoky-22dd6e75f80b6967db14e147ec183e587002cdb5.tar.gz
lttng-tools: Upgrade to 2.7 release
(From OE-Core rev: dddf51204238a094f633149663a7ed843dc8f55c) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch58
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch442
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch42
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch51
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb)15
5 files changed, 56 insertions, 552 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
deleted file mode 100644
index ac1f34bfaa..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 700c5a9d4dc7b552926b8ddcbba91cc13312aba0 Mon Sep 17 00:00:00 2001
2From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
3Date: Wed, 9 Sep 2015 17:08:20 -0400
4Subject: [PATCH] Fix: sessiond: disable: match app event by name
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The use of a simple lookup and match on event name is insufficient
10to identify the corresponding ust app event.
11
12Fixes #914
13
14Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
15Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
16
17Upstream-Status: Backport
18
19Signed-off-by: Li Zhou <li.zhou@windriver.com>
20---
21 src/bin/lttng-sessiond/ust-app.c | 10 +++++-----
22 1 file changed, 5 insertions(+), 5 deletions(-)
23
24diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
25index 4066b06..53a6f93 100644
26--- a/src/bin/lttng-sessiond/ust-app.c
27+++ b/src/bin/lttng-sessiond/ust-app.c
28@@ -3873,7 +3873,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
29 {
30 int ret = 0;
31 struct lttng_ht_iter iter, uiter;
32- struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
33+ struct lttng_ht_node_str *ua_chan_node;
34 struct ust_app *app;
35 struct ust_app_session *ua_sess;
36 struct ust_app_channel *ua_chan;
37@@ -3910,14 +3910,14 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
38 }
39 ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
40
41- lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &uiter);
42- ua_event_node = lttng_ht_iter_get_node_str(&uiter);
43- if (ua_event_node == NULL) {
44+ ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
45+ uevent->filter, uevent->attr.loglevel,
46+ uevent->exclusion);
47+ if (ua_event == NULL) {
48 DBG2("Event %s not found in channel %s for app pid %d."
49 "Skipping", uevent->attr.name, uchan->name, app->pid);
50 continue;
51 }
52- ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
53
54 ret = disable_ust_app_event(ua_sess, ua_event, app);
55 if (ret < 0) {
56--
571.7.9.5
58
diff --git a/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch b/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
deleted file mode 100644
index 199ef5761f..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
+++ /dev/null
@@ -1,442 +0,0 @@
1This make the declarations to be extern so they dont end up
2in duplicates in data.rel.ro sections
3
4avoid errors like
5
6| ../../../src/common/.libs/libcommon.a(mi-lttng.o):(.data.rel.ro.local+0x0): multiple definition of `mi_lttng_element_snapshots'
7| commands/enable_events.o:(.bss+0x48): first defined here
8| collect2: error: ld returned 1 exit status
9| Makefile:502: recipe for target 'lttng' failed
10| make[3]: *** [lttng] Error 1
11
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15
16Index: git/src/common/config/config-session-abi.h
17===================================================================
18--- git.orig/src/common/config/config-session-abi.h
19+++ git/src/common/config/config-session-abi.h
20@@ -18,95 +18,95 @@
21 #ifndef CONFIG_SESSION_INTERNAL_H
22 #define CONFIG_SESSION_INTERNAL_H
23
24-const char * const config_element_channel;
25-const char * const config_element_channels;
26-const char * const config_element_domain;
27-const char * const config_element_domains;
28-const char * const config_element_event;
29-const char * const config_element_events;
30-const char * const config_element_context;
31-const char * const config_element_contexts;
32-const char * const config_element_attributes;
33-const char * const config_element_exclusion;
34-const char * const config_element_exclusions;
35-const char * const config_element_function_attributes;
36-const char * const config_element_probe_attributes;
37-const char * const config_element_symbol_name;
38-const char * const config_element_address;
39-const char * const config_element_offset;
40-const char * const config_element_name;
41-const char * const config_element_enabled;
42-const char * const config_element_overwrite_mode;
43-const char * const config_element_subbuf_size;
44-const char * const config_element_num_subbuf;
45-const char * const config_element_switch_timer_interval;
46-const char * const config_element_read_timer_interval;
47-const char * const config_element_output;
48-const char * const config_element_output_type;
49-const char * const config_element_tracefile_size;
50-const char * const config_element_tracefile_count;
51-const char * const config_element_live_timer_interval;
52-const char * const config_element_type;
53-const char * const config_element_buffer_type;
54-const char * const config_element_session;
55-const char * const config_element_sessions;
56-const char * const config_element_perf;
57-const char * const config_element_config;
58-const char * const config_element_started;
59-const char * const config_element_snapshot_mode;
60-const char * const config_element_loglevel;
61-const char * const config_element_loglevel_type;
62-const char * const config_element_filter;
63-const char * const config_element_snapshot_outputs;
64-const char * const config_element_consumer_output;
65-const char * const config_element_destination;
66-const char * const config_element_path;
67-const char * const config_element_net_output;
68-const char * const config_element_control_uri;
69-const char * const config_element_data_uri;
70-const char * const config_element_max_size;
71-
72-const char * const config_domain_type_kernel;
73-const char * const config_domain_type_ust;
74-const char * const config_domain_type_jul;
75-const char * const config_domain_type_log4j;
76-
77-const char * const config_buffer_type_per_pid;
78-const char * const config_buffer_type_per_uid;
79-const char * const config_buffer_type_global;
80-
81-const char * const config_overwrite_mode_discard;
82-const char * const config_overwrite_mode_overwrite;
83-
84-const char * const config_output_type_splice;
85-const char * const config_output_type_mmap;
86-
87-const char * const config_loglevel_type_all;
88-const char * const config_loglevel_type_range;
89-const char * const config_loglevel_type_single;
90-
91-const char * const config_event_type_all;
92-const char * const config_event_type_tracepoint;
93-const char * const config_event_type_probe;
94-const char * const config_event_type_function;
95-const char * const config_event_type_function_entry;
96-const char * const config_event_type_noop;
97-const char * const config_event_type_syscall;
98-const char * const config_event_type_kprobe;
99-const char * const config_event_type_kretprobe;
100-
101-const char * const config_event_context_pid;
102-const char * const config_event_context_procname;
103-const char * const config_event_context_prio;
104-const char * const config_event_context_nice;
105-const char * const config_event_context_vpid;
106-const char * const config_event_context_tid;
107-const char * const config_event_context_vtid;
108-const char * const config_event_context_ppid;
109-const char * const config_event_context_vppid;
110-const char * const config_event_context_pthread_id;
111-const char * const config_event_context_hostname;
112-const char * const config_event_context_ip;
113-const char * const config_event_context_perf_thread_counter;
114+extern const char * const config_element_channel;
115+extern const char * const config_element_channels;
116+extern const char * const config_element_domain;
117+extern const char * const config_element_domains;
118+extern const char * const config_element_event;
119+extern const char * const config_element_events;
120+extern const char * const config_element_context;
121+extern const char * const config_element_contexts;
122+extern const char * const config_element_attributes;
123+extern const char * const config_element_exclusion;
124+extern const char * const config_element_exclusions;
125+extern const char * const config_element_function_attributes;
126+extern const char * const config_element_probe_attributes;
127+extern const char * const config_element_symbol_name;
128+extern const char * const config_element_address;
129+extern const char * const config_element_offset;
130+extern const char * const config_element_name;
131+extern const char * const config_element_enabled;
132+extern const char * const config_element_overwrite_mode;
133+extern const char * const config_element_subbuf_size;
134+extern const char * const config_element_num_subbuf;
135+extern const char * const config_element_switch_timer_interval;
136+extern const char * const config_element_read_timer_interval;
137+extern const char * const config_element_output;
138+extern const char * const config_element_output_type;
139+extern const char * const config_element_tracefile_size;
140+extern const char * const config_element_tracefile_count;
141+extern const char * const config_element_live_timer_interval;
142+extern const char * const config_element_type;
143+extern const char * const config_element_buffer_type;
144+extern const char * const config_element_session;
145+extern const char * const config_element_sessions;
146+extern const char * const config_element_perf;
147+extern const char * const config_element_config;
148+extern const char * const config_element_started;
149+extern const char * const config_element_snapshot_mode;
150+extern const char * const config_element_loglevel;
151+extern const char * const config_element_loglevel_type;
152+extern const char * const config_element_filter;
153+extern const char * const config_element_snapshot_outputs;
154+extern const char * const config_element_consumer_output;
155+extern const char * const config_element_destination;
156+extern const char * const config_element_path;
157+extern const char * const config_element_net_output;
158+extern const char * const config_element_control_uri;
159+extern const char * const config_element_data_uri;
160+extern const char * const config_element_max_size;
161+
162+extern const char * const config_domain_type_kernel;
163+extern const char * const config_domain_type_ust;
164+extern const char * const config_domain_type_jul;
165+extern const char * const config_domain_type_log4j;
166+
167+extern const char * const config_buffer_type_per_pid;
168+extern const char * const config_buffer_type_per_uid;
169+extern const char * const config_buffer_type_global;
170+
171+extern const char * const config_overwrite_mode_discard;
172+extern const char * const config_overwrite_mode_overwrite;
173+
174+extern const char * const config_output_type_splice;
175+extern const char * const config_output_type_mmap;
176+
177+extern const char * const config_loglevel_type_all;
178+extern const char * const config_loglevel_type_range;
179+extern const char * const config_loglevel_type_single;
180+
181+extern const char * const config_event_type_all;
182+extern const char * const config_event_type_tracepoint;
183+extern const char * const config_event_type_probe;
184+extern const char * const config_event_type_function;
185+extern const char * const config_event_type_function_entry;
186+extern const char * const config_event_type_noop;
187+extern const char * const config_event_type_syscall;
188+extern const char * const config_event_type_kprobe;
189+extern const char * const config_event_type_kretprobe;
190+
191+extern const char * const config_event_context_pid;
192+extern const char * const config_event_context_procname;
193+extern const char * const config_event_context_prio;
194+extern const char * const config_event_context_nice;
195+extern const char * const config_event_context_vpid;
196+extern const char * const config_event_context_tid;
197+extern const char * const config_event_context_vtid;
198+extern const char * const config_event_context_ppid;
199+extern const char * const config_event_context_vppid;
200+extern const char * const config_event_context_pthread_id;
201+extern const char * const config_event_context_hostname;
202+extern const char * const config_event_context_ip;
203+extern const char * const config_event_context_perf_thread_counter;
204
205 #endif /* CONFIG_SESSION_INTERNAL_H */
206Index: git/src/common/mi-lttng.h
207===================================================================
208--- git.orig/src/common/mi-lttng.h
209+++ git/src/common/mi-lttng.h
210@@ -49,133 +49,133 @@ struct mi_lttng_version {
211 };
212
213 /* Strings related to command */
214-const char * const mi_lttng_element_command;
215-const char * const mi_lttng_element_command_action;
216-const char * const mi_lttng_element_command_add_context;
217-const char * const mi_lttng_element_command_calibrate;
218-const char * const mi_lttng_element_command_create;
219-const char * const mi_lttng_element_command_destroy;
220-const char * const mi_lttng_element_command_disable_channel;
221-const char * const mi_lttng_element_command_disable_event;
222-const char * const mi_lttng_element_command_enable_channels;
223-const char * const mi_lttng_element_command_enable_event;
224-const char * const mi_lttng_element_command_list;
225-const char * const mi_lttng_element_command_load;
226-const char * const mi_lttng_element_command_name;
227-const char * const mi_lttng_element_command_output;
228-const char * const mi_lttng_element_command_save;
229-const char * const mi_lttng_element_command_set_session;
230-const char * const mi_lttng_element_command_snapshot;
231-const char * const mi_lttng_element_command_snapshot_add;
232-const char * const mi_lttng_element_command_snapshot_del;
233-const char * const mi_lttng_element_command_snapshot_list;
234-const char * const mi_lttng_element_command_snapshot_record;
235-const char * const mi_lttng_element_command_start;
236-const char * const mi_lttng_element_command_stop;
237-const char * const mi_lttng_element_command_success;
238-const char * const mi_lttng_element_command_version;
239+extern const char * const mi_lttng_element_command;
240+extern const char * const mi_lttng_element_command_action;
241+extern const char * const mi_lttng_element_command_add_context;
242+extern const char * const mi_lttng_element_command_calibrate;
243+extern const char * const mi_lttng_element_command_create;
244+extern const char * const mi_lttng_element_command_destroy;
245+extern const char * const mi_lttng_element_command_disable_channel;
246+extern const char * const mi_lttng_element_command_disable_event;
247+extern const char * const mi_lttng_element_command_enable_channels;
248+extern const char * const mi_lttng_element_command_enable_event;
249+extern const char * const mi_lttng_element_command_list;
250+extern const char * const mi_lttng_element_command_load;
251+extern const char * const mi_lttng_element_command_name;
252+extern const char * const mi_lttng_element_command_output;
253+extern const char * const mi_lttng_element_command_save;
254+extern const char * const mi_lttng_element_command_set_session;
255+extern const char * const mi_lttng_element_command_snapshot;
256+extern const char * const mi_lttng_element_command_snapshot_add;
257+extern const char * const mi_lttng_element_command_snapshot_del;
258+extern const char * const mi_lttng_element_command_snapshot_list;
259+extern const char * const mi_lttng_element_command_snapshot_record;
260+extern const char * const mi_lttng_element_command_start;
261+extern const char * const mi_lttng_element_command_stop;
262+extern const char * const mi_lttng_element_command_success;
263+extern const char * const mi_lttng_element_command_version;
264
265 /* Strings related to version command */
266-const char * const mi_lttng_element_version;
267-const char * const mi_lttng_element_version_commit;
268-const char * const mi_lttng_element_version_description;
269-const char * const mi_lttng_element_version_license;
270-const char * const mi_lttng_element_version_major;
271-const char * const mi_lttng_element_version_minor;
272-const char * const mi_lttng_element_version_patch_level;
273-const char * const mi_lttng_element_version_str;
274-const char * const mi_lttng_element_version_web;
275+extern const char * const mi_lttng_element_version;
276+extern const char * const mi_lttng_element_version_commit;
277+extern const char * const mi_lttng_element_version_description;
278+extern const char * const mi_lttng_element_version_license;
279+extern const char * const mi_lttng_element_version_major;
280+extern const char * const mi_lttng_element_version_minor;
281+extern const char * const mi_lttng_element_version_patch_level;
282+extern const char * const mi_lttng_element_version_str;
283+extern const char * const mi_lttng_element_version_web;
284
285 /* String related to a lttng_event_field */
286-const char * const mi_lttng_element_event_field;
287-const char * const mi_lttng_element_event_fields;
288+extern const char * const mi_lttng_element_event_field;
289+extern const char * const mi_lttng_element_event_fields;
290
291 /* String related to lttng_event_context */
292-const char * const mi_lttng_context_type_perf_counter;
293-const char * const mi_lttng_context_type_perf_cpu_counter;
294-const char * const mi_lttng_context_type_perf_thread_counter;
295+extern const char * const mi_lttng_context_type_perf_counter;
296+extern const char * const mi_lttng_context_type_perf_cpu_counter;
297+extern const char * const mi_lttng_context_type_perf_thread_counter;
298
299 /* String related to lttng_event_perf_counter_ctx */
300-const char * const mi_lttng_element_perf_counter_context;
301+extern const char * const mi_lttng_element_perf_counter_context;
302
303 /* Strings related to pid */
304-const char * const mi_lttng_element_pids;
305-const char * const mi_lttng_element_pid;
306-const char * const mi_lttng_element_pid_id;
307+extern const char * const mi_lttng_element_pids;
308+extern const char * const mi_lttng_element_pid;
309+extern const char * const mi_lttng_element_pid_id;
310
311 /* Strings related to save command */
312-const char * const mi_lttng_element_save;
313+extern const char * const mi_lttng_element_save;
314
315 /* Strings related to load command */
316-const char * const mi_lttng_element_load;
317+extern const char * const mi_lttng_element_load;
318
319 /* General element of mi_lttng */
320-const char * const mi_lttng_element_empty;
321-const char * const mi_lttng_element_id;
322-const char * const mi_lttng_element_nowrite;
323-const char * const mi_lttng_element_success;
324-const char * const mi_lttng_element_type_enum;
325-const char * const mi_lttng_element_type_float;
326-const char * const mi_lttng_element_type_integer;
327-const char * const mi_lttng_element_type_other;
328-const char * const mi_lttng_element_type_string;
329+extern const char * const mi_lttng_element_empty;
330+extern const char * const mi_lttng_element_id;
331+extern const char * const mi_lttng_element_nowrite;
332+extern const char * const mi_lttng_element_success;
333+extern const char * const mi_lttng_element_type_enum;
334+extern const char * const mi_lttng_element_type_float;
335+extern const char * const mi_lttng_element_type_integer;
336+extern const char * const mi_lttng_element_type_other;
337+extern const char * const mi_lttng_element_type_string;
338
339 /* String related to loglevel */
340-const char * const mi_lttng_loglevel_str_alert;
341-const char * const mi_lttng_loglevel_str_crit;
342-const char * const mi_lttng_loglevel_str_debug;
343-const char * const mi_lttng_loglevel_str_debug_function;
344-const char * const mi_lttng_loglevel_str_debug_line;
345-const char * const mi_lttng_loglevel_str_debug_module;
346-const char * const mi_lttng_loglevel_str_debug_process;
347-const char * const mi_lttng_loglevel_str_debug_program;
348-const char * const mi_lttng_loglevel_str_debug_system;
349-const char * const mi_lttng_loglevel_str_debug_unit;
350-const char * const mi_lttng_loglevel_str_emerg;
351-const char * const mi_lttng_loglevel_str_err;
352-const char * const mi_lttng_loglevel_str_info;
353-const char * const mi_lttng_loglevel_str_notice;
354-const char * const mi_lttng_loglevel_str_unknown;
355-const char * const mi_lttng_loglevel_str_warning;
356+extern const char * const mi_lttng_loglevel_str_alert;
357+extern const char * const mi_lttng_loglevel_str_crit;
358+extern const char * const mi_lttng_loglevel_str_debug;
359+extern const char * const mi_lttng_loglevel_str_debug_function;
360+extern const char * const mi_lttng_loglevel_str_debug_line;
361+extern const char * const mi_lttng_loglevel_str_debug_module;
362+extern const char * const mi_lttng_loglevel_str_debug_process;
363+extern const char * const mi_lttng_loglevel_str_debug_program;
364+extern const char * const mi_lttng_loglevel_str_debug_system;
365+extern const char * const mi_lttng_loglevel_str_debug_unit;
366+extern const char * const mi_lttng_loglevel_str_emerg;
367+extern const char * const mi_lttng_loglevel_str_err;
368+extern const char * const mi_lttng_loglevel_str_info;
369+extern const char * const mi_lttng_loglevel_str_notice;
370+extern const char * const mi_lttng_loglevel_str_unknown;
371+extern const char * const mi_lttng_loglevel_str_warning;
372
373 /* String related to loglevel JUL */
374-const char * const mi_lttng_loglevel_str_jul_all;
375-const char * const mi_lttng_loglevel_str_jul_config;
376-const char * const mi_lttng_loglevel_str_jul_fine;
377-const char * const mi_lttng_loglevel_str_jul_finer;
378-const char * const mi_lttng_loglevel_str_jul_finest;
379-const char * const mi_lttng_loglevel_str_jul_info;
380-const char * const mi_lttng_loglevel_str_jul_off;
381-const char * const mi_lttng_loglevel_str_jul_severe;
382-const char * const mi_lttng_loglevel_str_jul_warning;
383+extern const char * const mi_lttng_loglevel_str_jul_all;
384+extern const char * const mi_lttng_loglevel_str_jul_config;
385+extern const char * const mi_lttng_loglevel_str_jul_fine;
386+extern const char * const mi_lttng_loglevel_str_jul_finer;
387+extern const char * const mi_lttng_loglevel_str_jul_finest;
388+extern const char * const mi_lttng_loglevel_str_jul_info;
389+extern const char * const mi_lttng_loglevel_str_jul_off;
390+extern const char * const mi_lttng_loglevel_str_jul_severe;
391+extern const char * const mi_lttng_loglevel_str_jul_warning;
392
393 /* String related to loglevel Log4j */
394-const char * const mi_lttng_loglevel_str_log4j_off;
395-const char * const mi_lttng_loglevel_str_log4j_fatal;
396-const char * const mi_lttng_loglevel_str_log4j_error;
397-const char * const mi_lttng_loglevel_str_log4j_warn;
398-const char * const mi_lttng_loglevel_str_log4j_info;
399-const char * const mi_lttng_loglevel_str_log4j_debug;
400-const char * const mi_lttng_loglevel_str_log4j_trace;
401-const char * const mi_lttng_loglevel_str_log4j_all;
402+extern const char * const mi_lttng_loglevel_str_log4j_off;
403+extern const char * const mi_lttng_loglevel_str_log4j_fatal;
404+extern const char * const mi_lttng_loglevel_str_log4j_error;
405+extern const char * const mi_lttng_loglevel_str_log4j_warn;
406+extern const char * const mi_lttng_loglevel_str_log4j_info;
407+extern const char * const mi_lttng_loglevel_str_log4j_debug;
408+extern const char * const mi_lttng_loglevel_str_log4j_trace;
409+extern const char * const mi_lttng_loglevel_str_log4j_all;
410
411 /* String related to loglevel type */
412-const char * const mi_lttng_loglevel_type_all;
413-const char * const mi_lttng_loglevel_type_range;
414-const char * const mi_lttng_loglevel_type_single;
415-const char * const mi_lttng_loglevel_type_unknown;
416+extern const char * const mi_lttng_loglevel_type_all;
417+extern const char * const mi_lttng_loglevel_type_range;
418+extern const char * const mi_lttng_loglevel_type_single;
419+extern const char * const mi_lttng_loglevel_type_unknown;
420
421 /* Sting related to lttng_calibrate */
422-const char * const mi_lttng_element_calibrate;
423-const char * const mi_lttng_element_calibrate_function;
424+extern const char * const mi_lttng_element_calibrate;
425+extern const char * const mi_lttng_element_calibrate_function;
426
427 /* String related to a lttng_snapshot */
428-const char * const mi_lttng_element_snapshot_ctrl_url;
429-const char * const mi_lttng_element_snapshot_data_url;
430-const char * const mi_lttng_element_snapshot_max_size;
431-const char * const mi_lttng_element_snapshot_n_ptr;
432-const char * const mi_lttng_element_snapshot_session_name;
433-const char * const mi_lttng_element_snapshots;
434+extern const char * const mi_lttng_element_snapshot_ctrl_url;
435+extern const char * const mi_lttng_element_snapshot_data_url;
436+extern const char * const mi_lttng_element_snapshot_max_size;
437+extern const char * const mi_lttng_element_snapshot_n_ptr;
438+extern const char * const mi_lttng_element_snapshot_session_name;
439+extern const char * const mi_lttng_element_snapshots;
440
441 /* Utility string function */
442 const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain);
diff --git a/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch b/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch
deleted file mode 100644
index 4719d95489..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 161496fbe1465817a77a50a1172734dae81a13ef Mon Sep 17 00:00:00 2001
2From: Mikael Beckius <mikael.beckius@windriver.com>
3Date: Tue, 12 May 2015 11:11:48 +0200
4Subject: [PATCH] lttng-tools: Fix live timer calculation error
5
6There is an calculation error for live timer. Variable switch_timer_interval is
7based on microsecond, and it is not right to assign switch_timer_interval mod
81000000 to var tv_nsec which is based on nanosecond.
9
10Upstream-Status: Pending
11
12Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
13Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
14---
15 src/common/consumer-timer.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
19index 1408052..c6202ba 100644
20--- a/src/common/consumer-timer.c
21+++ b/src/common/consumer-timer.c
22@@ -368,7 +368,7 @@ void consumer_timer_switch_start(struct lttng_consumer_channel *channel,
23 channel->switch_timer_enabled = 1;
24
25 its.it_value.tv_sec = switch_timer_interval / 1000000;
26- its.it_value.tv_nsec = switch_timer_interval % 1000000;
27+ its.it_value.tv_nsec = (switch_timer_interval % 1000000) * 1000;
28 its.it_interval.tv_sec = its.it_value.tv_sec;
29 its.it_interval.tv_nsec = its.it_value.tv_nsec;
30
31@@ -425,7 +425,7 @@ void consumer_timer_live_start(struct lttng_consumer_channel *channel,
32 channel->live_timer_enabled = 1;
33
34 its.it_value.tv_sec = live_timer_interval / 1000000;
35- its.it_value.tv_nsec = live_timer_interval % 1000000;
36+ its.it_value.tv_nsec = (live_timer_interval % 1000000) * 1000;
37 its.it_interval.tv_sec = its.it_value.tv_sec;
38 its.it_interval.tv_nsec = its.it_value.tv_nsec;
39
40--
411.9.1
42
diff --git a/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch b/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch
new file mode 100644
index 0000000000..bd4f7d1d1b
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch
@@ -0,0 +1,51 @@
1From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
3 <jeremie.galarneau@efficios.com>
4Date: Sat, 17 Oct 2015 19:41:47 -0400
5Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9Organization: O.S. Systems Software LTDA.
10
11Upstream-Status: Backport [2.8.0]
12
13Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
14---
15 src/common/runas.c | 18 +++++-------------
16 1 file changed, 5 insertions(+), 13 deletions(-)
17
18diff --git a/src/common/runas.c b/src/common/runas.c
19index 57f7382..0825470 100644
20--- a/src/common/runas.c
21+++ b/src/common/runas.c
22@@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
23 static
24 int reset_sighandler(void)
25 {
26- int sig, ret = 0;
27+ int sig;
28
29- for (sig = SIGHUP; sig <= SIGUNUSED; sig++) {
30- /* Skip unblockable signals. */
31- if (sig == SIGKILL || sig == SIGSTOP) {
32- continue;
33- }
34- if (signal(sig, SIG_DFL) == SIG_ERR) {
35- PERROR("reset signal %d", sig);
36- ret = -1;
37- goto end;
38- }
39+ DBG("Resetting run_as worker signal handlers to default");
40+ for (sig = 1; sig <= 31; sig++) {
41+ (void) signal(sig, SIG_DFL);
42 }
43-end:
44- return ret;
45+ return 0;
46 }
47
48 static
49--
502.6.2
51
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 909acc37a7..74c047fb0c 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
12DEPENDS = "liburcu popt lttng-ust libxml2" 12DEPENDS = "liburcu popt lttng-ust libxml2"
13RDEPENDS_${PN}-ptest += "make perl bash" 13RDEPENDS_${PN}-ptest += "make perl bash"
14 14
15SRCREV = "d522c1f14285e2e8b10b7c0cd011847696ffe779" 15SRCREV = "d71e55a5f1f423eeaa47c08e5797e47ce8e825fb"
16PV = "2.7.0+git${SRCPV}"
16 17
17PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ 18PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
18 am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ 19 am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
@@ -23,13 +24,10 @@ PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-
23PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" 24PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
24PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" 25PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
25 26
26SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \ 27SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
28 file://stop-using-SIGUNUSED.patch \
27 file://runtest-2.4.0.patch \ 29 file://runtest-2.4.0.patch \
28 file://extern-decls.patch \ 30 file://run-ptest"
29 file://run-ptest \
30 file://lttng-tools-Fix-live-timer-calculation-error.patch \
31 file://0001-Fix-sessiond-disable-match-app-event-by-name.patch \
32 "
33 31
34S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
35 33
@@ -71,9 +69,6 @@ do_install_ptest () {
71 -i $i 69 -i $i
72 done 70 done
73 71
74 sed -e "s:src/bin/lttng-sessiond:$bindir:g" \
75 -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \
76 -i ${D}${PTEST_PATH}/tests/regression/run-report.py
77 sed -e "s:src/bin:bin:g" -e "s:lt-::g" \ 72 sed -e "s:src/bin:bin:g" -e "s:lt-::g" \
78 -i ${D}${PTEST_PATH}/tests/utils/utils.sh 73 -i ${D}${PTEST_PATH}/tests/utils/utils.sh
79 sed -e "s:ini_config:\.libs\/ini_config:" \ 74 sed -e "s:ini_config:\.libs\/ini_config:" \