* [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1
@ 2021-10-25 14:26 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] dnf: upgrade 4.9.0 -> 4.10.0 Wang Mingyu
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Wang Mingyu @ 2021-10-25 14:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
0002-src-privsep-linux.c-add-support-for-arc-28.patch
removed since it is included in 9.4.1
-License-Update: Copyright year updated to 2021.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../{dhcpcd_9.4.0.bb => dhcpcd_9.4.1.bb} | 5 +-
...ivsep-linux.c-add-support-for-arc-28.patch | 63 -------------------
2 files changed, 2 insertions(+), 66 deletions(-)
rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.4.0.bb => dhcpcd_9.4.1.bb} (88%)
delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
similarity index 88%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
index dbad8c8728..4007a4bd2d 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
@@ -7,18 +7,17 @@ DESCRIPTION = "dhcpcd runs on your machine and silently configures your \
HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/"
LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d"
UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
- file://0002-src-privsep-linux.c-add-support-for-arc-28.patch \
file://dhcpcd.service \
file://dhcpcd@.service \
"
-SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513"
+SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c"
inherit pkgconfig autotools-brokensep systemd useradd
diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch b/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch
deleted file mode 100644
index 045f06a9aa..0000000000
--- a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 8 Feb 2021 07:23:54 +0100
-Subject: [PATCH] src/privsep-linux.c: add support for arc (#28)
-
-Fix the following build failure:
-
-privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
- # error "Platform does not support seccomp filter yet"
- ^~~~~
-In file included from privsep-linux.c:36:
-privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
- BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
- ^~~~~~~~~~~~~~~~~~
-
-It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined
-since kernel 5.2 and
-https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84
-
-Detection of arc compact and arc v2 have been "copy/pasted" from
-https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2
-
-Fixes:
- - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3
-
-Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266]
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- src/privsep-linux.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 402667af..21d41a9a 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386
- #elif defined(__x86_64__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
-+#elif defined(__arc__)
-+# if defined(__A7__)
-+# if (BYTE_ORDER == LITTLE_ENDIAN)
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT
-+# else
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE
-+# endif
-+# elif defined(__HS__)
-+# if (BYTE_ORDER == LITTLE_ENDIAN)
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2
-+# else
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE
-+# endif
-+# else
-+# error "Platform does not support seccomp filter yet"
-+# endif
- #elif defined(__arm__)
- # ifndef EM_ARM
- # define EM_ARM 40
---
-2.16.2
-
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [OE-core] [PATCH] dnf: upgrade 4.9.0 -> 4.10.0
2021-10-25 14:26 [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 Wang Mingyu
@ 2021-10-25 14:26 ` Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] file: upgrade 5.40 -> 5.41 Wang Mingyu
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Wang Mingyu @ 2021-10-25 14:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-devtools/dnf/{dnf_4.9.0.bb => dnf_4.10.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.9.0.bb => dnf_4.10.0.bb} (98%)
diff --git a/meta/recipes-devtools/dnf/dnf_4.9.0.bb b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.9.0.bb
rename to meta/recipes-devtools/dnf/dnf_4.10.0.bb
index 27df88342e..b7273d4051 100644
--- a/meta/recipes-devtools/dnf/dnf_4.9.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
file://0001-dnf-write-the-log-lock-to-root.patch \
"
-SRCREV = "f85cf31395156a2aa5d75e894e5794a771054fe4"
+SRCREV = "bd691b784f2158e633072d368579898d740e4347"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [OE-core] [PATCH] file: upgrade 5.40 -> 5.41
2021-10-25 14:26 [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] dnf: upgrade 4.9.0 -> 4.10.0 Wang Mingyu
@ 2021-10-25 14:26 ` Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] libdnf: upgrade 0.64.0 -> 0.65.0 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1 Wang Mingyu
3 siblings, 0 replies; 7+ messages in thread
From: Wang Mingyu @ 2021-10-25 14:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-devtools/file/{file_5.40.bb => file_5.41.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/file/{file_5.40.bb => file_5.41.bb} (97%)
diff --git a/meta/recipes-devtools/file/file_5.40.bb b/meta/recipes-devtools/file/file_5.41.bb
similarity index 97%
rename from meta/recipes-devtools/file/file_5.40.bb
rename to meta/recipes-devtools/file/file_5.41.bb
index 32b61f4f39..9cc83085d0 100644
--- a/meta/recipes-devtools/file/file_5.40.bb
+++ b/meta/recipes-devtools/file/file_5.41.bb
@@ -13,7 +13,7 @@ DEPENDS:class-native = "bzip2-replacement-native"
SRC_URI = "git://github.com/file/file.git"
-SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8"
+SRCREV = "504206e53a89fd6eed71aeaf878aa3512418eab1"
S = "${WORKDIR}/git"
inherit autotools update-alternatives
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [OE-core] [PATCH] libdnf: upgrade 0.64.0 -> 0.65.0
2021-10-25 14:26 [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] dnf: upgrade 4.9.0 -> 4.10.0 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] file: upgrade 5.40 -> 5.41 Wang Mingyu
@ 2021-10-25 14:26 ` Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1 Wang Mingyu
3 siblings, 0 replies; 7+ messages in thread
From: Wang Mingyu @ 2021-10-25 14:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../libdnf/{libdnf_0.64.0.bb => libdnf_0.65.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.64.0.bb => libdnf_0.65.0.bb} (97%)
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
similarity index 97%
rename from meta/recipes-devtools/libdnf/libdnf_0.64.0.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
index 38d3307b11..78f2002040 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \
"
-SRCREV = "e5ecbc1e5062631f44cb94a3b73d9310db0ff386"
+SRCREV = "cee3e1c59f849d9be1bb8d7db3090cea5c59f4b6"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1
2021-10-25 14:26 [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 Wang Mingyu
` (2 preceding siblings ...)
2021-10-25 14:26 ` [OE-core] [PATCH] libdnf: upgrade 0.64.0 -> 0.65.0 Wang Mingyu
@ 2021-10-25 14:26 ` Wang Mingyu
2021-10-25 18:28 ` Alexandre Belloni
3 siblings, 1 reply; 7+ messages in thread
From: Wang Mingyu @ 2021-10-25 14:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 13721 bytes --]
2021-10-18 lttng-tools 2.13.1 (National Chocolate Cupcake Day)
Fix: ust: app stuck on recv message during UST comm timeout scenario
Fix: ust: UST communication can return -EAGAIN
Fix: ust: segfault on lttng start on filter bytecode copy
Fix: sessiond: previously created channel cannot be enabled
Build fix: Missing message in LTTNG_DEPRECATED invocation
Fix: notification-thread: handling event from a removed tracer event src
include: add missing "extern"
include: remove spurious spaces in condition/session-rotation.h
tests: fix header of regression/ust/getcpu-override/run-getcpu-override
fix: wrong define used for GCC version check
Fix: userspace-probe: unreported error on string copy error
Fix: userspace-probe: truncating binary path for SDT
Fix: lttng: add-trigger: don't provide a default event rule type
Fix: statements with side-effects in assert statements
Fix: lttng_trace_archive_location_serialize is called on freed memory
Fix: sessiond: ust session is inactive during ust_app_global_update
Fix: common: error query for trigger action protocol error
Fix: common: un-hide two rate policy functions
Fix: include: remove unneeded declaration of lttng_session_descriptor_get_session_name
Fix: Tests: race condition in test_ns_contexts_change
Fix: Tests: race condition in test_event_tracker
Fix: man: lttng-rotate: trace file count/size limitation does not apply
Fix: runas: less-than-zero comparison of an unsigned value
Fix: runas: supplementary groups are ignored on lttng save
Docs: lttng-event-rule(7): --exclude does not exist, use --exclude-name
sessiond: logging typo: {triger, triggger} -> trigger
Fix: lttng: free sessions in cmd_destroy
Fix: lttng: free domains and channels in get_session_stats_str
0001-Fix-Tests-race-condition-in-test_event_tracker.patch
0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
are removed since they're included in 2.13.1
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...race-condition-in-test_event_tracker.patch | 221 ------------------
...condition-in-test_ns_contexts_change.patch | 46 ----
...-tools_2.13.0.bb => lttng-tools_2.13.1.bb} | 4 +-
3 files changed, 1 insertion(+), 270 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
rename meta/recipes-kernel/lttng/{lttng-tools_2.13.0.bb => lttng-tools_2.13.1.bb} (97%)
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
deleted file mode 100644
index 10020e1ecf..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From d3392e4850532c02e53e3c3ff1cc27df7e51c941 Mon Sep 17 00:00:00 2001
-From: Francis Deslauriers <francis.deslauriers@efficios.com>
-Date: Tue, 7 Sep 2021 17:10:31 -0400
-Subject: [PATCH 1/2] Fix: Tests: race condition in test_event_tracker
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Background
-==========
-The `test_event_tracker` file contains test cases when the event
-generating app in executed in two distinct steps. Those two steps are
-preparation and execution.
- 1. the preparation is the launching the app in the background, and
- 2. the execution is actually generating the event that should or
- should not be traced depending on the test case.
-
-This is useful to test the tracker feature since we want to ensure that
-already running apps are notified properly when changing their tracking
-status.
-
-Issue
-=====
-The `test_event_vpid_track_untrack` test case suffers from a race
-condition that is easy to reproduce on Yocto.
-
-The issue is that sometimes events are end up the trace when none is
-expected.
-
-This is due to the absence of synchronization point at the launch of the
-app which leads to the app being scheduled in-between the track-untrack
-calls leading to events being recorded to the trace.
-
-It's easy to reproduce this issue on my machine by adding a `sleep 5`
-between the track and untrack calls and setting the `NR_USEC_WAIT`
-variable to 1.
-
-Fix
-===
-Using the testapp `--sync-before-last-event-touch` flag to make the app
-create a file when all but the last event are executed. We then have the
-app wait until we create a file (`--sync-before-last-event`) to generate
-that last event. This way, we are sure no event will be generated when
-running the track and untrack commands.
-
-Notes
-=====
-- This issue affects other test cases in this file.
-- This commit fixes a typo in the test header.
-- This commit adds `diag` calls to help tracking to what test the output
- relates to when reading the log.
-
-Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: Ia2b68128dc9a805526f9748f31ec2c2d95566f31
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- .../tools/tracker/test_event_tracker | 56 ++++++++++++++-----
- 1 file changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
-index feb3787..cc0f698 100755
---- a/tests/regression/tools/tracker/test_event_tracker
-+++ b/tests/regression/tools/tracker/test_event_tracker
-@@ -5,7 +5,7 @@
- #
- # SPDX-License-Identifier: GPL-2.0-only
-
--TEST_DESC="LTTng - Event traker test"
-+TEST_DESC="LTTng - Event tracker test"
-
- CURDIR=$(dirname "$0")/
- TESTDIR="$CURDIR/../../.."
-@@ -15,7 +15,7 @@ TESTAPP_KERNEL_NAME="gen-kernel-test-events"
- TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
- TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
- SESSION_NAME="tracker"
--NR_ITER=100
-+NR_ITER=1
- NUM_GLOBAL_TESTS=2
- NUM_UST_TESTS=283
- NUM_KERNEL_TESTS=462
-@@ -30,27 +30,41 @@ SCRIPT_GROUPNAME="$(id -gn)"
-
- CHILD_PID=-1
- WAIT_PATH=
--AFTER_FIRST_PATH=
--BEFORE_LAST_PATH=
-+TOUCH_BEFORE_LAST_PATH=
-+SYNC_BEFORE_LAST_PATH=
-
- source $TESTDIR/utils/utils.sh
-
-+# Launch the testapp and execute it up until right before the last event. It is
-+# useful to do it in two seperate steps in order to test tracking and
-+# untracking on an active app.
- function prepare_ust_app
- {
-- AFTER_FIRST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX)
-- BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
-+ TOUCH_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_touch_before_last.XXXXXX)
-+ SYNC_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
-+
-+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
-+ --sync-before-last-event-touch "$TOUCH_BEFORE_LAST_PATH" \
-+ --sync-before-last-event "$SYNC_BEFORE_LAST_PATH" &
-
-- $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT -a "$AFTER_FIRST_PATH" -b "$BEFORE_LAST_PATH" &
- CHILD_PID=$!
-+
-+ # Wait for the app to execute all the way to right before the last
-+ # event.
-+ while [ ! -f "${TOUCH_BEFORE_LAST_PATH}" ]; do
-+ sleep 0.5
-+ done
- }
-
-+# Generate the last event.
- function trace_ust_app
- {
-- touch "$BEFORE_LAST_PATH"
-- wait
-+ # Ask the test app to generate the last event.
-+ touch "$SYNC_BEFORE_LAST_PATH"
-+ wait "$CHILD_PID"
- ok $? "Traced application stopped."
-- rm "$BEFORE_LAST_PATH"
-- rm "$AFTER_FIRST_PATH"
-+ rm "$SYNC_BEFORE_LAST_PATH"
-+ rm "$TOUCH_BEFORE_LAST_PATH"
- }
-
- function prepare_kernel_app
-@@ -64,7 +78,7 @@ function prepare_kernel_app
- function trace_kernel_app
- {
- touch "$WAIT_PATH"
-- wait
-+ wait "$CHILD_PID"
- ok $? "Traced application stopped."
- rm "$WAIT_PATH"
- }
-@@ -78,6 +92,8 @@ function test_event_tracker()
- local tracker="$4"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -117,6 +133,8 @@ function test_event_vpid_tracker()
- local wildcard="$3"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -160,6 +178,8 @@ function test_event_pid_tracker()
- local wildcard="$3"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -203,6 +223,8 @@ function test_event_tracker_fail()
- local wildcard="$2"
- local tracker="$3"
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -222,6 +244,8 @@ function test_event_track_untrack()
- local tracker="$4"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -262,6 +286,8 @@ function test_event_vpid_track_untrack()
- local wildcard="$3"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -302,6 +328,8 @@ function test_event_pid_track_untrack()
- local wildcard="$3"
- local channel=''
-
-+ diag "${FUNCNAME[0]} $*"
-+
- trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path"
-@@ -336,9 +364,9 @@ function test_event_pid_track_untrack()
-
- function test_event_ust_vpid_untrack_snapshot()
- {
-- local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-+ diag "${FUNCNAME[0]} $*"
-
-- diag "Test_event_ust_vpid_untrack_snapshot"
-+ local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
-
- create_lttng_session_ok $SESSION_NAME "$trace_path" "--snapshot"
-
---
-2.20.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch b/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
deleted file mode 100644
index a8d983105a..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d284752e616dfc4c9288be3bb21c04ea78cdd967 Mon Sep 17 00:00:00 2001
-From: Francis Deslauriers <francis.deslauriers@efficios.com>
-Date: Wed, 8 Sep 2021 10:16:23 -0400
-Subject: [PATCH 2/2] Fix: Tests: race condition in test_ns_contexts_change
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Issue
-=====
-The test script doesn't wait for the test application to complete before
-stopping the tracing session. The race is that depending on the
-scheduling the application is not always done generating events when the
-session is stopped.
-
-Fix
-===
-Make the test script wait for the termination of the test app before
-stopping the session.
-
-Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: I29d9b41d2a2ed60a6c42020509c2067442ae332c
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/regression/ust/namespaces/test_ns_contexts_change | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
-index c0af15e..8a4b62c 100755
---- a/tests/regression/ust/namespaces/test_ns_contexts_change
-+++ b/tests/regression/ust/namespaces/test_ns_contexts_change
-@@ -79,6 +79,9 @@ function test_ns()
-
- touch "$file_sync_before_last"
-
-+ # Wait for the test app to generate all expected events and exit.
-+ wait $app_pid
-+
- # stop and destroy
- stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
---
-2.20.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
similarity index 97%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
index 1491aff618..063d8e8c2d 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
@@ -37,11 +37,9 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://lttng-sessiond.service \
file://determinism.patch \
file://0001-src-common-correct-header-location.patch \
- file://0001-Fix-Tests-race-condition-in-test_event_tracker.patch \
- file://0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch \
"
-SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6"
+SRC_URI[sha256sum] = "cfe6df7da831fc07fd07ce46b442c2ec1074c167af73f3a1b1d2fba0c453c8b5"
inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1
2021-10-25 14:26 ` [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1 Wang Mingyu
@ 2021-10-25 18:28 ` Alexandre Belloni
2021-10-25 18:52 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2021-10-25 18:28 UTC (permalink / raw)
To: wangmy; +Cc: openembedded-core
Hello,
I did fix it up but as this is the second time this is happening, I want
to let you know that git am fails while applying this patch:
error: cannot convert from y to UTF-8
fatal: could not parse patch
Indeed, the declared charset is y which isn't a thing. I think that what
happens is that you get to the following prompt:
The following files are 8bit, but do not declare a Content-Transfer-Encoding.
something.patch
Which 8bit encoding should I declare [UTF-8]?
At that point, you probably pressed y but you should simply press enter.
On 25/10/2021 22:26:56+0800, wangmy wrote:
> 2021-10-18 lttng-tools 2.13.1 (National Chocolate Cupcake Day)
> Fix: ust: app stuck on recv message during UST comm timeout scenario
> Fix: ust: UST communication can return -EAGAIN
> Fix: ust: segfault on lttng start on filter bytecode copy
> Fix: sessiond: previously created channel cannot be enabled
> Build fix: Missing message in LTTNG_DEPRECATED invocation
> Fix: notification-thread: handling event from a removed tracer event src
> include: add missing "extern"
> include: remove spurious spaces in condition/session-rotation.h
> tests: fix header of regression/ust/getcpu-override/run-getcpu-override
> fix: wrong define used for GCC version check
> Fix: userspace-probe: unreported error on string copy error
> Fix: userspace-probe: truncating binary path for SDT
> Fix: lttng: add-trigger: don't provide a default event rule type
> Fix: statements with side-effects in assert statements
> Fix: lttng_trace_archive_location_serialize is called on freed memory
> Fix: sessiond: ust session is inactive during ust_app_global_update
> Fix: common: error query for trigger action protocol error
> Fix: common: un-hide two rate policy functions
> Fix: include: remove unneeded declaration of lttng_session_descriptor_get_session_name
> Fix: Tests: race condition in test_ns_contexts_change
> Fix: Tests: race condition in test_event_tracker
> Fix: man: lttng-rotate: trace file count/size limitation does not apply
> Fix: runas: less-than-zero comparison of an unsigned value
> Fix: runas: supplementary groups are ignored on lttng save
> Docs: lttng-event-rule(7): --exclude does not exist, use --exclude-name
> sessiond: logging typo: {triger, triggger} -> trigger
> Fix: lttng: free sessions in cmd_destroy
> Fix: lttng: free domains and channels in get_session_stats_str
>
> 0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> 0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> are removed since they're included in 2.13.1
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> ...race-condition-in-test_event_tracker.patch | 221 ------------------
> ...condition-in-test_ns_contexts_change.patch | 46 ----
> ...-tools_2.13.0.bb => lttng-tools_2.13.1.bb} | 4 +-
> 3 files changed, 1 insertion(+), 270 deletions(-)
> delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> rename meta/recipes-kernel/lttng/{lttng-tools_2.13.0.bb => lttng-tools_2.13.1.bb} (97%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> deleted file mode 100644
> index 10020e1ecf..0000000000
> --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> +++ /dev/null
> @@ -1,221 +0,0 @@
> -From d3392e4850532c02e53e3c3ff1cc27df7e51c941 Mon Sep 17 00:00:00 2001
> -From: Francis Deslauriers <francis.deslauriers@efficios.com>
> -Date: Tue, 7 Sep 2021 17:10:31 -0400
> -Subject: [PATCH 1/2] Fix: Tests: race condition in test_event_tracker
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Background
> -==========
> -The `test_event_tracker` file contains test cases when the event
> -generating app in executed in two distinct steps. Those two steps are
> -preparation and execution.
> - 1. the preparation is the launching the app in the background, and
> - 2. the execution is actually generating the event that should or
> - should not be traced depending on the test case.
> -
> -This is useful to test the tracker feature since we want to ensure that
> -already running apps are notified properly when changing their tracking
> -status.
> -
> -Issue
> -=====
> -The `test_event_vpid_track_untrack` test case suffers from a race
> -condition that is easy to reproduce on Yocto.
> -
> -The issue is that sometimes events are end up the trace when none is
> -expected.
> -
> -This is due to the absence of synchronization point at the launch of the
> -app which leads to the app being scheduled in-between the track-untrack
> -calls leading to events being recorded to the trace.
> -
> -It's easy to reproduce this issue on my machine by adding a `sleep 5`
> -between the track and untrack calls and setting the `NR_USEC_WAIT`
> -variable to 1.
> -
> -Fix
> -===
> -Using the testapp `--sync-before-last-event-touch` flag to make the app
> -create a file when all but the last event are executed. We then have the
> -app wait until we create a file (`--sync-before-last-event`) to generate
> -that last event. This way, we are sure no event will be generated when
> -running the track and untrack commands.
> -
> -Notes
> -=====
> -- This issue affects other test cases in this file.
> -- This commit fixes a typo in the test header.
> -- This commit adds `diag` calls to help tracking to what test the output
> - relates to when reading the log.
> -
> -Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> -Change-Id: Ia2b68128dc9a805526f9748f31ec2c2d95566f31
> -Upstream-Status: Backport
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - .../tools/tracker/test_event_tracker | 56 ++++++++++++++-----
> - 1 file changed, 42 insertions(+), 14 deletions(-)
> -
> -diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
> -index feb3787..cc0f698 100755
> ---- a/tests/regression/tools/tracker/test_event_tracker
> -+++ b/tests/regression/tools/tracker/test_event_tracker
> -@@ -5,7 +5,7 @@
> - #
> - # SPDX-License-Identifier: GPL-2.0-only
> -
> --TEST_DESC="LTTng - Event traker test"
> -+TEST_DESC="LTTng - Event tracker test"
> -
> - CURDIR=$(dirname "$0")/
> - TESTDIR="$CURDIR/../../.."
> -@@ -15,7 +15,7 @@ TESTAPP_KERNEL_NAME="gen-kernel-test-events"
> - TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
> - TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
> - SESSION_NAME="tracker"
> --NR_ITER=100
> -+NR_ITER=1
> - NUM_GLOBAL_TESTS=2
> - NUM_UST_TESTS=283
> - NUM_KERNEL_TESTS=462
> -@@ -30,27 +30,41 @@ SCRIPT_GROUPNAME="$(id -gn)"
> -
> - CHILD_PID=-1
> - WAIT_PATH=
> --AFTER_FIRST_PATH=
> --BEFORE_LAST_PATH=
> -+TOUCH_BEFORE_LAST_PATH=
> -+SYNC_BEFORE_LAST_PATH=
> -
> - source $TESTDIR/utils/utils.sh
> -
> -+# Launch the testapp and execute it up until right before the last event. It is
> -+# useful to do it in two seperate steps in order to test tracking and
> -+# untracking on an active app.
> - function prepare_ust_app
> - {
> -- AFTER_FIRST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX)
> -- BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
> -+ TOUCH_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_touch_before_last.XXXXXX)
> -+ SYNC_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
> -+
> -+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
> -+ --sync-before-last-event-touch "$TOUCH_BEFORE_LAST_PATH" \
> -+ --sync-before-last-event "$SYNC_BEFORE_LAST_PATH" &
> -
> -- $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT -a "$AFTER_FIRST_PATH" -b "$BEFORE_LAST_PATH" &
> - CHILD_PID=$!
> -+
> -+ # Wait for the app to execute all the way to right before the last
> -+ # event.
> -+ while [ ! -f "${TOUCH_BEFORE_LAST_PATH}" ]; do
> -+ sleep 0.5
> -+ done
> - }
> -
> -+# Generate the last event.
> - function trace_ust_app
> - {
> -- touch "$BEFORE_LAST_PATH"
> -- wait
> -+ # Ask the test app to generate the last event.
> -+ touch "$SYNC_BEFORE_LAST_PATH"
> -+ wait "$CHILD_PID"
> - ok $? "Traced application stopped."
> -- rm "$BEFORE_LAST_PATH"
> -- rm "$AFTER_FIRST_PATH"
> -+ rm "$SYNC_BEFORE_LAST_PATH"
> -+ rm "$TOUCH_BEFORE_LAST_PATH"
> - }
> -
> - function prepare_kernel_app
> -@@ -64,7 +78,7 @@ function prepare_kernel_app
> - function trace_kernel_app
> - {
> - touch "$WAIT_PATH"
> -- wait
> -+ wait "$CHILD_PID"
> - ok $? "Traced application stopped."
> - rm "$WAIT_PATH"
> - }
> -@@ -78,6 +92,8 @@ function test_event_tracker()
> - local tracker="$4"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -117,6 +133,8 @@ function test_event_vpid_tracker()
> - local wildcard="$3"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -160,6 +178,8 @@ function test_event_pid_tracker()
> - local wildcard="$3"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -203,6 +223,8 @@ function test_event_tracker_fail()
> - local wildcard="$2"
> - local tracker="$3"
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -222,6 +244,8 @@ function test_event_track_untrack()
> - local tracker="$4"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -262,6 +286,8 @@ function test_event_vpid_track_untrack()
> - local wildcard="$3"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -302,6 +328,8 @@ function test_event_pid_track_untrack()
> - local wildcard="$3"
> - local channel=''
> -
> -+ diag "${FUNCNAME[0]} $*"
> -+
> - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path"
> -@@ -336,9 +364,9 @@ function test_event_pid_track_untrack()
> -
> - function test_event_ust_vpid_untrack_snapshot()
> - {
> -- local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -+ diag "${FUNCNAME[0]} $*"
> -
> -- diag "Test_event_ust_vpid_untrack_snapshot"
> -+ local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> -
> - create_lttng_session_ok $SESSION_NAME "$trace_path" "--snapshot"
> -
> ---
> -2.20.1
> -
> diff --git a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch b/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> deleted file mode 100644
> index a8d983105a..0000000000
> --- a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From d284752e616dfc4c9288be3bb21c04ea78cdd967 Mon Sep 17 00:00:00 2001
> -From: Francis Deslauriers <francis.deslauriers@efficios.com>
> -Date: Wed, 8 Sep 2021 10:16:23 -0400
> -Subject: [PATCH 2/2] Fix: Tests: race condition in test_ns_contexts_change
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Issue
> -=====
> -The test script doesn't wait for the test application to complete before
> -stopping the tracing session. The race is that depending on the
> -scheduling the application is not always done generating events when the
> -session is stopped.
> -
> -Fix
> -===
> -Make the test script wait for the termination of the test app before
> -stopping the session.
> -
> -Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> -Change-Id: I29d9b41d2a2ed60a6c42020509c2067442ae332c
> -Upstream-Status: Backport
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - tests/regression/ust/namespaces/test_ns_contexts_change | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
> -index c0af15e..8a4b62c 100755
> ---- a/tests/regression/ust/namespaces/test_ns_contexts_change
> -+++ b/tests/regression/ust/namespaces/test_ns_contexts_change
> -@@ -79,6 +79,9 @@ function test_ns()
> -
> - touch "$file_sync_before_last"
> -
> -+ # Wait for the test app to generate all expected events and exit.
> -+ wait $app_pid
> -+
> - # stop and destroy
> - stop_lttng_tracing_ok "$session_name"
> - destroy_lttng_session_ok "$session_name"
> ---
> -2.20.1
> -
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> similarity index 97%
> rename from meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
> rename to meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> index 1491aff618..063d8e8c2d 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> @@ -37,11 +37,9 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
> file://lttng-sessiond.service \
> file://determinism.patch \
> file://0001-src-common-correct-header-location.patch \
> - file://0001-Fix-Tests-race-condition-in-test_event_tracker.patch \
> - file://0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch \
> "
>
> -SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6"
> +SRC_URI[sha256sum] = "cfe6df7da831fc07fd07ce46b442c2ec1074c167af73f3a1b1d2fba0c453c8b5"
>
> inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
>
> --
> 2.25.1
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1
2021-10-25 18:28 ` Alexandre Belloni
@ 2021-10-25 18:52 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2021-10-25 18:52 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: wangmy, Patches and discussions about the oe-core layer
On Mon, Oct 25, 2021 at 11:28 AM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello,
>
> I did fix it up but as this is the second time this is happening, I want
> to let you know that git am fails while applying this patch:
>
> error: cannot convert from y to UTF-8
> fatal: could not parse patch
>
> Indeed, the declared charset is y which isn't a thing. I think that what
> happens is that you get to the following prompt:
>
> The following files are 8bit, but do not declare a Content-Transfer-Encoding.
> something.patch
> Which 8bit encoding should I declare [UTF-8]?
>
> At that point, you probably pressed y but you should simply press enter.
>
Yeah most likely that's the cause. You can also change defaults to use
utf-8 and perhaps that might help
git config sendemail.composeencoding UTF-8
in individual repos or perhaps globally if you want to do that
>
> On 25/10/2021 22:26:56+0800, wangmy wrote:
> > 2021-10-18 lttng-tools 2.13.1 (National Chocolate Cupcake Day)
> > Fix: ust: app stuck on recv message during UST comm timeout scenario
> > Fix: ust: UST communication can return -EAGAIN
> > Fix: ust: segfault on lttng start on filter bytecode copy
> > Fix: sessiond: previously created channel cannot be enabled
> > Build fix: Missing message in LTTNG_DEPRECATED invocation
> > Fix: notification-thread: handling event from a removed tracer event src
> > include: add missing "extern"
> > include: remove spurious spaces in condition/session-rotation.h
> > tests: fix header of regression/ust/getcpu-override/run-getcpu-override
> > fix: wrong define used for GCC version check
> > Fix: userspace-probe: unreported error on string copy error
> > Fix: userspace-probe: truncating binary path for SDT
> > Fix: lttng: add-trigger: don't provide a default event rule type
> > Fix: statements with side-effects in assert statements
> > Fix: lttng_trace_archive_location_serialize is called on freed memory
> > Fix: sessiond: ust session is inactive during ust_app_global_update
> > Fix: common: error query for trigger action protocol error
> > Fix: common: un-hide two rate policy functions
> > Fix: include: remove unneeded declaration of lttng_session_descriptor_get_session_name
> > Fix: Tests: race condition in test_ns_contexts_change
> > Fix: Tests: race condition in test_event_tracker
> > Fix: man: lttng-rotate: trace file count/size limitation does not apply
> > Fix: runas: less-than-zero comparison of an unsigned value
> > Fix: runas: supplementary groups are ignored on lttng save
> > Docs: lttng-event-rule(7): --exclude does not exist, use --exclude-name
> > sessiond: logging typo: {triger, triggger} -> trigger
> > Fix: lttng: free sessions in cmd_destroy
> > Fix: lttng: free domains and channels in get_session_stats_str
> >
> > 0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> > 0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> > are removed since they're included in 2.13.1
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> > ...race-condition-in-test_event_tracker.patch | 221 ------------------
> > ...condition-in-test_ns_contexts_change.patch | 46 ----
> > ...-tools_2.13.0.bb => lttng-tools_2.13.1.bb} | 4 +-
> > 3 files changed, 1 insertion(+), 270 deletions(-)
> > delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> > delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> > rename meta/recipes-kernel/lttng/{lttng-tools_2.13.0.bb => lttng-tools_2.13.1.bb} (97%)
> >
> > diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> > deleted file mode 100644
> > index 10020e1ecf..0000000000
> > --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
> > +++ /dev/null
> > @@ -1,221 +0,0 @@
> > -From d3392e4850532c02e53e3c3ff1cc27df7e51c941 Mon Sep 17 00:00:00 2001
> > -From: Francis Deslauriers <francis.deslauriers@efficios.com>
> > -Date: Tue, 7 Sep 2021 17:10:31 -0400
> > -Subject: [PATCH 1/2] Fix: Tests: race condition in test_event_tracker
> > -MIME-Version: 1.0
> > -Content-Type: text/plain; charset=UTF-8
> > -Content-Transfer-Encoding: 8bit
> > -
> > -Background
> > -==========
> > -The `test_event_tracker` file contains test cases when the event
> > -generating app in executed in two distinct steps. Those two steps are
> > -preparation and execution.
> > - 1. the preparation is the launching the app in the background, and
> > - 2. the execution is actually generating the event that should or
> > - should not be traced depending on the test case.
> > -
> > -This is useful to test the tracker feature since we want to ensure that
> > -already running apps are notified properly when changing their tracking
> > -status.
> > -
> > -Issue
> > -=====
> > -The `test_event_vpid_track_untrack` test case suffers from a race
> > -condition that is easy to reproduce on Yocto.
> > -
> > -The issue is that sometimes events are end up the trace when none is
> > -expected.
> > -
> > -This is due to the absence of synchronization point at the launch of the
> > -app which leads to the app being scheduled in-between the track-untrack
> > -calls leading to events being recorded to the trace.
> > -
> > -It's easy to reproduce this issue on my machine by adding a `sleep 5`
> > -between the track and untrack calls and setting the `NR_USEC_WAIT`
> > -variable to 1.
> > -
> > -Fix
> > -===
> > -Using the testapp `--sync-before-last-event-touch` flag to make the app
> > -create a file when all but the last event are executed. We then have the
> > -app wait until we create a file (`--sync-before-last-event`) to generate
> > -that last event. This way, we are sure no event will be generated when
> > -running the track and untrack commands.
> > -
> > -Notes
> > -=====
> > -- This issue affects other test cases in this file.
> > -- This commit fixes a typo in the test header.
> > -- This commit adds `diag` calls to help tracking to what test the output
> > - relates to when reading the log.
> > -
> > -Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> > -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> > -Change-Id: Ia2b68128dc9a805526f9748f31ec2c2d95566f31
> > -Upstream-Status: Backport
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ----
> > - .../tools/tracker/test_event_tracker | 56 ++++++++++++++-----
> > - 1 file changed, 42 insertions(+), 14 deletions(-)
> > -
> > -diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
> > -index feb3787..cc0f698 100755
> > ---- a/tests/regression/tools/tracker/test_event_tracker
> > -+++ b/tests/regression/tools/tracker/test_event_tracker
> > -@@ -5,7 +5,7 @@
> > - #
> > - # SPDX-License-Identifier: GPL-2.0-only
> > -
> > --TEST_DESC="LTTng - Event traker test"
> > -+TEST_DESC="LTTng - Event tracker test"
> > -
> > - CURDIR=$(dirname "$0")/
> > - TESTDIR="$CURDIR/../../.."
> > -@@ -15,7 +15,7 @@ TESTAPP_KERNEL_NAME="gen-kernel-test-events"
> > - TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
> > - TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
> > - SESSION_NAME="tracker"
> > --NR_ITER=100
> > -+NR_ITER=1
> > - NUM_GLOBAL_TESTS=2
> > - NUM_UST_TESTS=283
> > - NUM_KERNEL_TESTS=462
> > -@@ -30,27 +30,41 @@ SCRIPT_GROUPNAME="$(id -gn)"
> > -
> > - CHILD_PID=-1
> > - WAIT_PATH=
> > --AFTER_FIRST_PATH=
> > --BEFORE_LAST_PATH=
> > -+TOUCH_BEFORE_LAST_PATH=
> > -+SYNC_BEFORE_LAST_PATH=
> > -
> > - source $TESTDIR/utils/utils.sh
> > -
> > -+# Launch the testapp and execute it up until right before the last event. It is
> > -+# useful to do it in two seperate steps in order to test tracking and
> > -+# untracking on an active app.
> > - function prepare_ust_app
> > - {
> > -- AFTER_FIRST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX)
> > -- BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
> > -+ TOUCH_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_touch_before_last.XXXXXX)
> > -+ SYNC_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
> > -+
> > -+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
> > -+ --sync-before-last-event-touch "$TOUCH_BEFORE_LAST_PATH" \
> > -+ --sync-before-last-event "$SYNC_BEFORE_LAST_PATH" &
> > -
> > -- $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT -a "$AFTER_FIRST_PATH" -b "$BEFORE_LAST_PATH" &
> > - CHILD_PID=$!
> > -+
> > -+ # Wait for the app to execute all the way to right before the last
> > -+ # event.
> > -+ while [ ! -f "${TOUCH_BEFORE_LAST_PATH}" ]; do
> > -+ sleep 0.5
> > -+ done
> > - }
> > -
> > -+# Generate the last event.
> > - function trace_ust_app
> > - {
> > -- touch "$BEFORE_LAST_PATH"
> > -- wait
> > -+ # Ask the test app to generate the last event.
> > -+ touch "$SYNC_BEFORE_LAST_PATH"
> > -+ wait "$CHILD_PID"
> > - ok $? "Traced application stopped."
> > -- rm "$BEFORE_LAST_PATH"
> > -- rm "$AFTER_FIRST_PATH"
> > -+ rm "$SYNC_BEFORE_LAST_PATH"
> > -+ rm "$TOUCH_BEFORE_LAST_PATH"
> > - }
> > -
> > - function prepare_kernel_app
> > -@@ -64,7 +78,7 @@ function prepare_kernel_app
> > - function trace_kernel_app
> > - {
> > - touch "$WAIT_PATH"
> > -- wait
> > -+ wait "$CHILD_PID"
> > - ok $? "Traced application stopped."
> > - rm "$WAIT_PATH"
> > - }
> > -@@ -78,6 +92,8 @@ function test_event_tracker()
> > - local tracker="$4"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -117,6 +133,8 @@ function test_event_vpid_tracker()
> > - local wildcard="$3"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -160,6 +178,8 @@ function test_event_pid_tracker()
> > - local wildcard="$3"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -203,6 +223,8 @@ function test_event_tracker_fail()
> > - local wildcard="$2"
> > - local tracker="$3"
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -222,6 +244,8 @@ function test_event_track_untrack()
> > - local tracker="$4"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -262,6 +286,8 @@ function test_event_vpid_track_untrack()
> > - local wildcard="$3"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -302,6 +328,8 @@ function test_event_pid_track_untrack()
> > - local wildcard="$3"
> > - local channel=''
> > -
> > -+ diag "${FUNCNAME[0]} $*"
> > -+
> > - trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path"
> > -@@ -336,9 +364,9 @@ function test_event_pid_track_untrack()
> > -
> > - function test_event_ust_vpid_untrack_snapshot()
> > - {
> > -- local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -+ diag "${FUNCNAME[0]} $*"
> > -
> > -- diag "Test_event_ust_vpid_untrack_snapshot"
> > -+ local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
> > -
> > - create_lttng_session_ok $SESSION_NAME "$trace_path" "--snapshot"
> > -
> > ---
> > -2.20.1
> > -
> > diff --git a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch b/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> > deleted file mode 100644
> > index a8d983105a..0000000000
> > --- a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
> > +++ /dev/null
> > @@ -1,46 +0,0 @@
> > -From d284752e616dfc4c9288be3bb21c04ea78cdd967 Mon Sep 17 00:00:00 2001
> > -From: Francis Deslauriers <francis.deslauriers@efficios.com>
> > -Date: Wed, 8 Sep 2021 10:16:23 -0400
> > -Subject: [PATCH 2/2] Fix: Tests: race condition in test_ns_contexts_change
> > -MIME-Version: 1.0
> > -Content-Type: text/plain; charset=UTF-8
> > -Content-Transfer-Encoding: 8bit
> > -
> > -Issue
> > -=====
> > -The test script doesn't wait for the test application to complete before
> > -stopping the tracing session. The race is that depending on the
> > -scheduling the application is not always done generating events when the
> > -session is stopped.
> > -
> > -Fix
> > -===
> > -Make the test script wait for the termination of the test app before
> > -stopping the session.
> > -
> > -Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> > -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> > -Change-Id: I29d9b41d2a2ed60a6c42020509c2067442ae332c
> > -Upstream-Status: Backport
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ----
> > - tests/regression/ust/namespaces/test_ns_contexts_change | 3 +++
> > - 1 file changed, 3 insertions(+)
> > -
> > -diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
> > -index c0af15e..8a4b62c 100755
> > ---- a/tests/regression/ust/namespaces/test_ns_contexts_change
> > -+++ b/tests/regression/ust/namespaces/test_ns_contexts_change
> > -@@ -79,6 +79,9 @@ function test_ns()
> > -
> > - touch "$file_sync_before_last"
> > -
> > -+ # Wait for the test app to generate all expected events and exit.
> > -+ wait $app_pid
> > -+
> > - # stop and destroy
> > - stop_lttng_tracing_ok "$session_name"
> > - destroy_lttng_session_ok "$session_name"
> > ---
> > -2.20.1
> > -
> > diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> > similarity index 97%
> > rename from meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
> > rename to meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> > index 1491aff618..063d8e8c2d 100644
> > --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
> > +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
> > @@ -37,11 +37,9 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
> > file://lttng-sessiond.service \
> > file://determinism.patch \
> > file://0001-src-common-correct-header-location.patch \
> > - file://0001-Fix-Tests-race-condition-in-test_event_tracker.patch \
> > - file://0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch \
> > "
> >
> > -SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6"
> > +SRC_URI[sha256sum] = "cfe6df7da831fc07fd07ce46b442c2ec1074c167af73f3a1b1d2fba0c453c8b5"
> >
> > inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
> >
> > --
> > 2.25.1
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157357): https://lists.openembedded.org/g/openembedded-core/message/157357
> Mute This Topic: https://lists.openembedded.org/mt/86578262/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-25 18:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 14:26 [OE-core] [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] dnf: upgrade 4.9.0 -> 4.10.0 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] file: upgrade 5.40 -> 5.41 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] libdnf: upgrade 0.64.0 -> 0.65.0 Wang Mingyu
2021-10-25 14:26 ` [OE-core] [PATCH] lttng-tools: upgrade 2.13.0 -> 2.13.1 Wang Mingyu
2021-10-25 18:28 ` Alexandre Belloni
2021-10-25 18:52 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.