summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch58
1 files changed, 0 insertions, 58 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