From 1f10e18090ee46e1ce2fc886669f96cd66c59f98 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Tue, 24 May 2022 16:07:28 +0300 Subject: [PATCH] agl-screenshot-test.sh: Redo the compositor restart Stopping services and the client shell before restarting the compositor, would avoid some large delays until the new compositor instance is brought up. With this approach, were we stop explicitly the client shell and the launcher, we're basically have a hard stop, and should avoid those huge delays for qemu-arm. Until we can confirm this is the case, we still maintain that delay. Signed-off-by: Marius Vlad Change-Id: Ifa067ac40de162291d7d6cfb70035e87add07220 --- common/scripts/agl-screenshot-test.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/common/scripts/agl-screenshot-test.sh b/common/scripts/agl-screenshot-test.sh index cdd536a..5f83970 100755 --- a/common/scripts/agl-screenshot-test.sh +++ b/common/scripts/agl-screenshot-test.sh @@ -37,9 +37,13 @@ sleep 2 # create initial journal cursor file journalctl /usr/bin/agl-compositor --cursor-file=/tmp/agl-screenshot-cursor > /tmp/first-log 2>&1 -# restart weston@display -#systemctl restart weston.service -systemctl restart agl-session@agl-driver.service +# stop homescreen (shell) and launcher +su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user stop homescreen' +su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user stop launcher' +# restart agl-compositor +su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user restart agl-compositor' +su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user start homescreen' +su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user start launcher' # e.g. qemu-system-arm takes loooong sleep 10 -- 2.16.6