开源软件构建与测试

_service:tar_scm:wayland.spec Changed

@@ -1,10 +1,12 @@
 Name:           wayland
-Version:        1.21.0
-Release:	2
+Version:        1.22.0
+Release:	1
 Summary:	Wayland Compositor Infrastructure
 License:	MIT
 URL:		https://wayland.freedesktop.org/
-Source0:	https://gitlab.freedesktop.org/wayland/wayland/-/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://gitlab.freedesktop.org/wayland/wayland/-/archive/%{version}/%{name}-%{version}.tar.xz
+Source1:        https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig
+Source2:        emersion-gpg-key.asc
 
 BuildRequires:  gcc gcc-c++ docbook-style-xsl doxygen expat-devel  
 BuildRequires:  libxml2-devel libxslt pkgconfig(libffi) xmlto graphviz meson chrpath
@@ -88,11 +90,14 @@
 
 %files help
 %defattr(-,root,root)
-%doc README
+%doc README.md
 %{_mandir}/man3/*.3*
 %{_datadir}/doc/wayland/
 
 %changelog
+* Wed Jul 26 2023 zhangkea <zhangkea@uniontech.com> - 1.22.0-1
+- upgrade 1.22.0-1 
+
 * Fri Dec 30 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.21.0-2
 - add  Provides:libwayland-client%{?_isa} and libwayland-cursor%{?_isa}

_service:tar_scm:emersion-gpg-key.asc Added

_service:tar_scm:wayland-1.21.0.tar.gz/README Deleted

@@ -1,34 +0,0 @@
-What is Wayland?
-
-Wayland is a project to define a protocol for a compositor to talk to
-its clients as well as a library implementation of the protocol.  The
-compositor can be a standalone display server running on Linux kernel
-modesetting and evdev input devices, an X application, or a wayland
-client itself.  The clients can be traditional applications, X servers
-(rootless or fullscreen) or other display servers.
-
-The wayland protocol is essentially only about input handling and
-buffer management.  The compositor receives input events and forwards
-them to the relevant client.  The clients creates buffers and renders
-into them and notifies the compositor when it needs to redraw.  The
-protocol also handles drag and drop, selections, window management and
-other interactions that must go through the compositor.  However, the
-protocol does not handle rendering, which is one of the features that
-makes wayland so simple.  All clients are expected to handle rendering
-themselves, typically through cairo or OpenGL.
-
-The weston compositor is a reference implementation of a wayland
-compositor and the weston repository also includes a few example
-clients.
-
-Building the wayland libraries is fairly simple, aside from libffi,
-they don't have many dependencies:
-
-    $ git clone https://gitlab.freedesktop.org/wayland/wayland
-    $ cd wayland
-    $ meson build/ --prefix=PREFIX
-    $ ninja -C build/ install
-
-where PREFIX is where you want to install the libraries.  See
-https://wayland.freedesktop.org for more complete build instructions
-for wayland, weston, xwayland and various toolkits.

_service:tar_scm:wayland-1.22.0.tar.xz.sig Added

_service:tar_scm:wayland-1.21.0.tar.gz/.gitlab-ci.yml -> _service:tar_scm:wayland-1.22.0.tar.xz/.gitlab-ci.yml Changed

@@ -41,7 +41,7 @@
 # API changes. If you need new features from ci-templates you must bump
 # this to the current SHA you require from the ci-templates repo, however
 # be aware that you may need to account for API changes when doing so.
-.templates_sha: &template_sha 567700e483aabed992d0a4fea84994a0472deff6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha d5aa3941aa03c2f716595116354fb81eb8012acb # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -72,12 +72,12 @@
 .os-debian:
   variables:
     BUILD_OS: debian
-    FDO_DISTRIBUTION_VERSION: buster
+    FDO_DISTRIBUTION_VERSION: bullseye
     FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build'
     FDO_DISTRIBUTION_EXEC: 'pip3 install meson==0.56.0'
     # bump this tag every time you change something which requires rebuilding the
     # base image
-    FDO_DISTRIBUTION_TAG: "2022-02-05.0"
+    FDO_DISTRIBUTION_TAG: "2022-08-08.0"
 
 .debian-x86_64:
   extends:
@@ -156,6 +156,8 @@
 .build-env:
   variables:
     MESON_BUILD_TYPE: "-Dbuildtype=debug -Doptimization=0 -Db_sanitize=address,undefined"
+    # See https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/154
+    ASAN_OPTIONS: "detect_odr_violation=0"
   before_script:
     - export BUILD_ID="wayland-$CI_JOB_NAME"
     - export PREFIX="${CI_PROJECT_DIR}/prefix-${BUILD_ID}"
@@ -191,7 +193,7 @@
     # for every single subtest. For now, in order to get AArch64 builds and
     # tests into CI, just assume that we're not going to leak any more on
     # AArch64 than we would on ARMv7 or x86-64.
-    ASAN_OPTIONS: "detect_leaks=0"
+    ASAN_OPTIONS: "detect_leaks=0,detect_odr_violation=0"
   tags:
     - aarch64
   needs:
@@ -299,11 +301,11 @@
 .os-freebsd:
   variables:
     BUILD_OS: freebsd
-    FDO_DISTRIBUTION_VERSION: "13.0"
+    FDO_DISTRIBUTION_VERSION: "13.1"
     FDO_DISTRIBUTION_PACKAGES: 'libxslt meson ninja pkgconf expat libffi libepoll-shim libxml2'
     # bump this tag every time you change something which requires rebuilding the
     # base image
-    FDO_DISTRIBUTION_TAG: "2021-08-05.0"
+    FDO_DISTRIBUTION_TAG: "2022-09-08.0"
     # Don't build documentation since installing the required tools massively
     # increases the VM image (and therefore container) size.
     MESON_ARGS: "-Ddocumentation=false"

_service:tar_scm:wayland-1.22.0.tar.xz/.mailmap Added

_service:tar_scm:wayland-1.22.0.tar.xz/README.md Added

@@ -0,0 +1,30 @@
+# Wayland
+
+Wayland is a project to define a protocol for a compositor to talk to
+its clients as well as a library implementation of the protocol.  The
+compositor can be a standalone display server running on Linux kernel
+modesetting and evdev input devices, an X application, or a wayland
+client itself.  The clients can be traditional applications, X servers
+(rootless or fullscreen) or other display servers.
+
+The wayland protocol is essentially only about input handling and
+buffer management.  The compositor receives input events and forwards
+them to the relevant client.  The clients creates buffers and renders
+into them and notifies the compositor when it needs to redraw.  The
+protocol also handles drag and drop, selections, window management and
+other interactions that must go through the compositor.  However, the
+protocol does not handle rendering, which is one of the features that
+makes wayland so simple.  All clients are expected to handle rendering
+themselves, typically through cairo or OpenGL.
+
+Building the wayland libraries is fairly simple, aside from libffi,
+they don't have many dependencies:
+
+    $ git clone https://gitlab.freedesktop.org/wayland/wayland
+    $ cd wayland
+    $ meson build/ --prefix=PREFIX
+    $ ninja -C build/ install
+
+where PREFIX is where you want to install the libraries.
+
+See https://wayland.freedesktop.org for documentation.

_service:tar_scm:wayland-1.21.0.tar.gz/cursor/wayland-cursor.c -> _service:tar_scm:wayland-1.22.0.tar.xz/cursor/wayland-cursor.c Changed

@@ -151,32 +151,32 @@
  * the returned buffer.
  */
 WL_EXPORT struct wl_buffer *
-wl_cursor_image_get_buffer(struct wl_cursor_image *_img)
+wl_cursor_image_get_buffer(struct wl_cursor_image *image)
 {
-	struct cursor_image *image = (struct cursor_image *) _img;
-	struct wl_cursor_theme *theme = image->theme;
+	struct cursor_image *img = (struct cursor_image *) image;
+	struct wl_cursor_theme *theme = img->theme;
 
-	if (!image->buffer) {
-		image->buffer =
+	if (!img->buffer) {
+		img->buffer =
 			wl_shm_pool_create_buffer(theme->pool->pool,
-						  image->offset,
-						  _img->width, _img->height,
-						  _img->width * 4,
+						  img->offset,
+						  image->width, image->height,
+						  image->width * 4,
 						  WL_SHM_FORMAT_ARGB8888);
 	};
 
-	return image->buffer;
+	return img->buffer;
 }
 
 static void
-wl_cursor_image_destroy(struct wl_cursor_image *_img)
+wl_cursor_image_destroy(struct wl_cursor_image *image)
 {
-	struct cursor_image *image = (struct cursor_image *) _img;
+	struct cursor_image *img = (struct cursor_image *) image;
 
-	if (image->buffer)
-		wl_buffer_destroy(image->buffer);
+	if (img->buffer)
+		wl_buffer_destroy(img->buffer);
 
-	free(image);
+	free(img);
 }
 
 static void
@@ -461,21 +461,21 @@
  * given time in the cursor animation.
  */
 WL_EXPORT int
-wl_cursor_frame_and_duration(struct wl_cursor *_cursor, uint32_t time,
+wl_cursor_frame_and_duration(struct wl_cursor *cursor, uint32_t time,
 			     uint32_t *duration)
 {
-	struct cursor *cursor = (struct cursor *) _cursor;
+	struct cursor *cur = (struct cursor *) cursor;
 	uint32_t t;
 	int i;
 
-	if (cursor->cursor.image_count == 1 || cursor->total_delay == 0) {
+	if (cur->cursor.image_count == 1 || cur->total_delay == 0) {
 		if (duration)
 			*duration = 0;
 		return 0;
 	}
 
 	i = 0;
-	t = time % cursor->total_delay;
+	t = time % cur->total_delay;
 
 	/* If there is a 0 delay in the image set then this
 	 * loop breaks on it and we display that cursor until
@@ -484,8 +484,8 @@
 	 * seen one in a cursor file, we haven't bothered to
 	 * "fix" this.
 	 */
-	while (t - cursor->cursor.imagesi->delay < t)
-		t -= cursor->cursor.imagesi++->delay;
+	while (t - cur->cursor.imagesi->delay < t)
+		t -= cur->cursor.imagesi++->delay;
 
 	if (!duration)
 		return i;
@@ -493,10 +493,10 @@
 	/* Make sure we don't accidentally tell the caller this is
 	 * a static cursor image.
 	 */
-	if (t >= cursor->cursor.imagesi->delay)
+	if (t >= cur->cursor.imagesi->delay)
 		*duration = 1;
 	else
-		*duration = cursor->cursor.imagesi->delay - t;
+		*duration = cur->cursor.imagesi->delay - t;
 
 	return i;
 }
@@ -510,7 +510,7 @@
  * given time in the cursor animation.
  */
 WL_EXPORT int
-wl_cursor_frame(struct wl_cursor *_cursor, uint32_t time)
+wl_cursor_frame(struct wl_cursor *cursor, uint32_t time)
 {
-	return wl_cursor_frame_and_duration(_cursor, time, NULL);
+	return wl_cursor_frame_and_duration(cursor, time, NULL);
 }

_service:tar_scm:wayland-1.21.0.tar.gz/doc/publican/sources/Protocol.xml -> _service:tar_scm:wayland-1.22.0.tar.xz/doc/publican/sources/Protocol.xml Changed

_service:tar_scm:wayland-1.21.0.tar.gz/meson.build -> _service:tar_scm:wayland-1.22.0.tar.xz/meson.build Changed

_service:tar_scm:wayland-1.21.0.tar.gz/protocol/wayland.xml -> _service:tar_scm:wayland-1.22.0.tar.xz/protocol/wayland.xml Changed

@@ -177,6 +177,9 @@
     <description summary="callback object">
       Clients can handle the 'done' event to get notified when
       the related request is done.
+
+      Note, because wl_callback objects are created from multiple independent
+      factory interfaces, the wl_callback interface is frozen at version 1.
     </description>
 
     <event name="done" type="destructor">
@@ -187,7 +190,7 @@
     </event>
   </interface>
 
-  <interface name="wl_compositor" version="5">
+  <interface name="wl_compositor" version="6">
     <description summary="the compositor singleton">
       A compositor.  This object is a singleton global.  The
       compositor is in charge of combining the contents of multiple
@@ -453,6 +456,9 @@
       If the buffer uses a format that has an alpha channel, the alpha channel
       is assumed to be premultiplied in the color channels unless otherwise
       specified.
+
+      Note, because wl_buffer objects are created from multiple independent
+      factory interfaces, the wl_buffer interface is frozen at version 1.
     </description>
 
     <request name="destroy" type="destructor">
@@ -624,8 +630,9 @@
     <event name="source_actions" since="3">
       <description summary="notify the source-side available actions">
 	This event indicates the actions offered by the data source. It
-	will be sent right after wl_data_device.enter, or anytime the source
-	side changes its offered actions through wl_data_source.set_actions.
+	will be sent immediately after creating the wl_data_offer object,
+	or anytime the source side changes its offered actions through
+	wl_data_source.set_actions.
       </description>
       <arg name="source_actions" type="uint" summary="actions offered by the data source"
 	   enum="wl_data_device_manager.dnd_action"/>
@@ -867,11 +874,8 @@
 	a drag-and-drop icon. If the icon surface already has another role,
 	it raises a protocol error.
 
-	The current and pending input regions of the icon wl_surface are
-	cleared, and wl_surface.set_input_region is ignored until the
-	wl_surface is no longer used as the icon surface. When the use
-	as an icon ends, the current and pending input regions become
-	undefined, and the wl_surface is unmapped.
+	The input region is ignored for wl_surfaces with the role of a
+	drag-and-drop icon.
       </description>
       <arg name="source" type="object" interface="wl_data_source" allow-null="true" summary="data source for the eventual transfer"/>
       <arg name="origin" type="object" interface="wl_surface" summary="surface where the drag originates"/>
@@ -1352,7 +1356,7 @@
     </event>
   </interface>
 
-  <interface name="wl_surface" version="5">
+  <interface name="wl_surface" version="6">
     <description summary="an onscreen surface">
       A surface is a rectangular area that may be displayed on zero
       or more outputs, and shown any number of times at the compositor's
@@ -1384,8 +1388,9 @@
       that this request gives a role to a wl_surface. Often, this
       request also creates a new protocol object that represents the
       role and adds additional functionality to wl_surface. When a
-      client wants to destroy a wl_surface, they must destroy this 'role
-      object' before the wl_surface.
+      client wants to destroy a wl_surface, they must destroy this role
+      object before the wl_surface, otherwise a defunct_role_object error is
+      sent.
 
       Destroying the role object does not remove the role from the
       wl_surface, but it may stop the wl_surface from "playing the role".
@@ -1405,6 +1410,8 @@
       <entry name="invalid_transform" value="1" summary="buffer transform value is invalid"/>
       <entry name="invalid_size" value="2" summary="buffer size is invalid"/>
       <entry name="invalid_offset" value="3" summary="buffer offset is invalid"/>
+      <entry name="defunct_role_object" value="4"
+             summary="surface was destroyed before its role object"/>
     </enum>
 
     <request name="destroy" type="destructor">
@@ -1433,8 +1440,9 @@
 
 	When the bound wl_surface version is 5 or higher, passing any
 	non-zero x or y is a protocol violation, and will result in an
-	'invalid_offset' error being raised. To achieve equivalent semantics,
-	use wl_surface.offset.
+        'invalid_offset' error being raised. The x and y arguments are ignored
+        and do not change the pending state. To achieve equivalent semantics,
+        use wl_surface.offset.
 
 	Surface contents are double-buffered state, see wl_surface.commit.
 
@@ -1786,9 +1794,37 @@
       <arg name="x" type="int" summary="surface-local x coordinate"/>
       <arg name="y" type="int" summary="surface-local y coordinate"/>
     </request>
+
+    
+
+    <event name="preferred_buffer_scale" since="6">
+      <description summary="preferred buffer scale for the surface">
+	This event indicates the preferred buffer scale for this surface. It is
+	sent whenever the compositor's preference changes.
+
+	It is intended that scaling aware clients use this event to scale their
+	content and use wl_surface.set_buffer_scale to indicate the scale they
+	have rendered with. This allows clients to supply a higher detail
+	buffer.
+      </description>
+      <arg name="factor" type="int" summary="preferred scaling factor"/>
+    </event>
+
+    <event name="preferred_buffer_transform" since="6">
+      <description summary="preferred buffer transform for the surface">
+	This event indicates the preferred buffer transform for this surface.
+	It is sent whenever the compositor's preference changes.
+
+	It is intended that transform aware clients use this event to apply the
+	transform to their content and use wl_surface.set_buffer_transform to
+	indicate the transform they have rendered with.
+      </description>
+      <arg name="transform" type="uint" enum="wl_output.transform"
+	   summary="preferred transform"/>
+    </event>
    </interface>
 
-  <interface name="wl_seat" version="8">
+  <interface name="wl_seat" version="9">
     <description summary="group of input devices">
       A seat is a group of keyboards, pointer and touch devices. This
       object is published as a global during start up, or when such a
@@ -1921,7 +1957,7 @@
 
   </interface>
 
-  <interface name="wl_pointer" version="8">
+  <interface name="wl_pointer" version="9">
     <description summary="pointer input device">
       The wl_pointer interface represents one or more input devices,
       such as mice, which control the pointer location and pointer_focus
@@ -1965,11 +2001,9 @@
 	pointer surface to this request with new values for hotspot_x
 	and hotspot_y.
 
-	The current and pending input regions of the wl_surface are
-	cleared, and wl_surface.set_input_region is ignored until the
-	wl_surface is no longer used as the cursor. When the use as a
-	cursor ends, the current and pending input regions become
-	undefined, and the wl_surface is unmapped.
+	The input region is ignored for wl_surfaces with the role of
+	a cursor. When the use as a cursor ends, the wl_surface is
+	unmapped.
 
 	The serial parameter must match the latest wl_pointer.enter
 	serial number sent to the client. Otherwise the request will be
@@ -2278,9 +2312,65 @@
       <arg name="axis" type="uint" enum="axis" summary="axis type"/>
       <arg name="value120" type="int" summary="scroll distance as fraction of 120"/>
     </event>
+
+    
+
+    <enum name="axis_relative_direction">
+      <description summary="axis relative direction">
+	This specifies the direction of the physical motion that caused a
+	wl_pointer.axis event, relative to the wl_pointer.axis direction.
+      </description>
+      <entry name="identical" value="0"
+	  summary="physical motion matches axis direction"/>
+      <entry name="inverted" value="1"
+	  summary="physical motion is the inverse of the axis direction"/>
+    </enum>
+
+    <event name="axis_relative_direction" since="9">
+      <description summary="axis relative physical direction event">
+	Relative directional information of the entity causing the axis
+	motion.
+
+	For a wl_pointer.axis event, the wl_pointer.axis_relative_direction
+	event specifies the movement direction of the entity causing the
+	wl_pointer.axis event. For example:
+	- if a user's fingers on a touchpad move down and this
+	  causes a wl_pointer.axis vertical_scroll down event, the physical
+	  direction is 'identical'
+	- if a user's fingers on a touchpad move down and this causes a
+	  wl_pointer.axis vertical_scroll up scroll up event ('natural
+	  scrolling'), the physical direction is 'inverted'.
+
+	A client may use this information to adjust scroll motion of
+	components. Specifically, enabling natural scrolling causes the
+	content to change direction compared to traditional scrolling.
+	Some widgets like volume control sliders should usually match the
+	physical direction regardless of whether natural scrolling is
+	active. This event enables clients to match the scroll direction of
+	a widget to the physical direction.

_service:tar_scm:wayland-1.22.0.tar.xz/release.sh Added

@@ -0,0 +1,79 @@
+#!/bin/sh -eu
+
+build_dir=build-release
+
+if ! type glab >/dev/null; then
+	echo "glab is needed to create a release"
+	exit 1
+fi
+
+case "$(git rev-parse --abbrev-ref HEAD)" in
+main | 0-9*.0-9*)
+	;;
+*)
+	echo "Not on the main or a stable branch"
+	exit 1
+esac
+
+if  -n "$(git log @{upstream}..)" ; then
+	echo "The main branch has unpushed commits"
+	exit 1
+fi
+
+meson_options=""
+if  -e "$build_dir" ; then
+	meson_options="$meson_options --wipe"
+fi
+meson setup "$build_dir" $meson_options
+
+prev_version="$(git describe --tags --abbrev=0)"
+version="$(meson introspect "$build_dir" --projectinfo | jq -r .version)"
+if  "$version" = "$prev_version" ; then
+	echo "Version not bumped"
+	exit 1
+fi
+
+name="$(meson introspect "$build_dir" --projectinfo | jq -r .descriptive_name)"
+if  "$name" = "" ; then
+	echo "Cannot determine project name"
+	exit 1
+fi
+
+ninja -C "$build_dir" dist
+
+archive_name="$name-$version.tar.xz"
+archive_path="$build_dir/meson-dist/$archive_name"
+gpg --detach-sig "$archive_path"
+
+sha256="$(cd $build_dir/meson-dist && sha256sum $archive_name)"
+sha512="$(cd $build_dir/meson-dist && sha512sum $archive_name)"
+archive_url="https://gitlab.freedesktop.org/wayland/$name/-/releases/$version/downloads/$archive_name"
+announce_path="$build_dir/meson-dist/$name-$version-announce.eml"
+current_branch=$(git branch --show-current)
+remote_name=$(git config --get branch.${current_branch}.remote)
+
+cat >"$announce_path" <<EOF
+To: <wayland-devel@lists.freedesktop.org>
+Subject: ANNOUNCE $name $version
+
+`git shortlog --no-merges "$prev_version.."`
+
+git tag: $version
+
+$archive_url
+SHA256: $sha256
+SHA512: $sha512
+PGP:    $archive_url.sig
+EOF
+
+echo "Release announcement written to $announce_path"
+
+echo -n "Release $name $version? y/N "
+read answer
+if  "$answer" != "y" ; then
+	exit 1
+fi
+
+git tag -s -m "$version" "$version"
+git push "$remote_name" "$version"
+glab release create "$version" "$archive_path"* --notes ""

_service:tar_scm:wayland-1.21.0.tar.gz/releasing.txt -> _service:tar_scm:wayland-1.22.0.tar.xz/releasing.txt Changed

@@ -17,27 +17,11 @@
 
   2.  Run the release.sh script to generate the tarballs, sign and
       upload them, and generate a release announcement template.
-      This script can be obtained from X.org's modular package:
 
-        http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh
-
-      The script supports a --dry-run option to test it without actually
-      doing a release.  If the script fails on the distcheck step due to
-      a testsuite error that can't be fixed for some reason, you can
-      skip testsuite by specifying the --dist argument.  Pass --help to
-      see other supported options.
-
-      $ release.sh .
-
-      For Wayland official and point releases, also publish the publican
-      documentation to wayland.freedesktop.org:
-
-      $ ./publish-doc
-
-  3.  Compose the release announcements.  The script will generate
-      *.x.y.z.announce files with a list of changes and tags.  Prepend
-      it with a human-readable listing of the most notable changes.
-      For x.y.0 releases, indicate the schedule for the x.y+1.0
+  3.  Compose the release announcements.  The script will generate a
+      wayland-x.y.z-announce.eml file with a list of changes and tags.
+      Prepend it with a human-readable listing of the most notable
+      changes. For x.y.0 releases, indicate the schedule for the x.y+1.0
       release.
 
   4.  PGP sign the release announcements and send them to

_service:tar_scm:wayland-1.21.0.tar.gz/src/connection.c -> _service:tar_scm:wayland-1.22.0.tar.xz/src/connection.c Changed

_service:tar_scm:wayland-1.21.0.tar.gz/src/scanner.c -> _service:tar_scm:wayland-1.22.0.tar.xz/src/scanner.c Changed

_service:tar_scm:wayland-1.21.0.tar.gz/src/wayland-client.c -> _service:tar_scm:wayland-1.22.0.tar.xz/src/wayland-client.c Changed

@@ -70,10 +70,12 @@
 	wl_dispatcher_func_t dispatcher;
 	uint32_t version;
 	const char * const *tag;
+	struct wl_list queue_link; /**< in struct wl_event_queue::proxy_list */
 };
 
 struct wl_event_queue {
 	struct wl_list event_list;
+	struct wl_list proxy_list; /**< struct wl_proxy::queue_link */
 	struct wl_display *display;
 };
 
@@ -221,6 +223,7 @@
 wl_event_queue_init(struct wl_event_queue *queue, struct wl_display *display)
 {
 	wl_list_init(&queue->event_list);
+	wl_list_init(&queue->proxy_list);
 	queue->display = display;
 }
 
@@ -298,6 +301,27 @@
 {
 	struct wl_closure *closure;
 
+	if (!wl_list_empty(&queue->proxy_list)) {
+		struct wl_proxy *proxy, *tmp;
+
+		if (queue != &queue->display->default_queue) {
+			wl_log("warning: queue %p destroyed while proxies "
+			       "still attached:\n", queue);
+		}
+
+		wl_list_for_each_safe(proxy, tmp, &queue->proxy_list,
+				      queue_link) {
+			if (queue != &queue->display->default_queue) {
+				wl_log("  %s@%u still attached\n",
+				       proxy->object.interface->name,
+				       proxy->object.id);
+			}
+			proxy->queue = NULL;
+			wl_list_remove(&proxy->queue_link);
+			wl_list_init(&proxy->queue_link);
+		}
+	}
+
 	while (!wl_list_empty(&queue->event_list)) {
 		closure = wl_container_of(queue->event_list.next,
 					  closure, link);
@@ -435,6 +459,8 @@
 		return NULL;
 	}
 
+	wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
+
 	return proxy;
 }
 
@@ -494,6 +520,8 @@
 		return NULL;
 	}
 
+	wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
+
 	return proxy;
 }
 
@@ -518,6 +546,10 @@
 
 	proxy->flags |= WL_PROXY_FLAG_DESTROYED;
 
+	proxy->queue = NULL;
+	wl_list_remove(&proxy->queue_link);
+	wl_list_init(&proxy->queue_link);
+
 	wl_proxy_unref(proxy);
 }
 
@@ -1276,8 +1308,9 @@
  *
  * \param display The display context object
  *
- * Close the connection to \c display and free all resources associated
- * with it.
+ * Close the connection to \c display. The \ref wl_proxy and
+ * \ref wl_event_queue objects need to be manually destroyed by the caller
+ * before disconnecting.
  *
  * \memberof wl_display
  */
@@ -1538,6 +1571,9 @@
 	else
 		queue = proxy->queue;
 
+	if (!queue)
+		wl_abort("Tried to add event to destroyed queue\n");
+
 	wl_list_insert(queue->event_list.prev, &closure->link);
 
 	return size;
@@ -2335,6 +2371,8 @@
 {
 	pthread_mutex_lock(&proxy->display->mutex);
 
+	wl_list_remove(&proxy->queue_link);
+
 	if (queue) {
 		assert(proxy->display == queue->display);
 		proxy->queue = queue;
@@ -2342,6 +2380,8 @@
 		proxy->queue = &proxy->display->default_queue;
 	}
 
+	wl_list_insert(&proxy->queue->proxy_list, &proxy->queue_link);
+
 	pthread_mutex_unlock(&proxy->display->mutex);
 }
 
@@ -2413,6 +2453,8 @@
 	wrapper->flags = WL_PROXY_FLAG_WRAPPER;
 	wrapper->refcount = 1;
 
+	wl_list_insert(&wrapper->queue->proxy_list, &wrapper->queue_link);
+
 	pthread_mutex_unlock(&wrapped_proxy->display->mutex);
 
 	return wrapper;
@@ -2434,6 +2476,12 @@
 
 	assert(wrapper->refcount == 1);
 
+	pthread_mutex_lock(&wrapper->display->mutex);
+
+	wl_list_remove(&wrapper->queue_link);
+
+	pthread_mutex_unlock(&wrapper->display->mutex);
+
 	free(wrapper);
 }

_service:tar_scm:wayland-1.21.0.tar.gz/src/wayland-server-core.h -> _service:tar_scm:wayland-1.22.0.tar.xz/src/wayland-server-core.h Changed

_service:tar_scm:wayland-1.21.0.tar.gz/src/wayland-server.c -> _service:tar_scm:wayland-1.22.0.tar.xz/src/wayland-server.c Changed

@@ -79,6 +79,7 @@
 	struct wl_list link;
 	struct wl_map objects;
 	struct wl_priv_signal destroy_signal;
+	struct wl_priv_signal destroy_late_signal;
 	pid_t pid;
 	uid_t uid;
 	gid_t gid;
@@ -90,7 +91,7 @@
 	struct wl_event_loop *loop;
 	int run;
 
-	uint32_t id;
+	uint32_t next_global_name;
 	uint32_t serial;
 
 	struct wl_list registry_resource_list;
@@ -547,6 +548,7 @@
 		goto err_map;
 
 	wl_priv_signal_init(&client->destroy_signal);
+	wl_priv_signal_init(&client->destroy_late_signal);
 	if (bind_display(client, display) < 0)
 		goto err_map;
 
@@ -864,6 +866,17 @@
 	return resource->object.interface->name;
 }
 
+/**
+ * Add a listener to be called at the beginning of wl_client destruction
+ *
+ * The listener provided will be called when wl_client destroy has begun,
+ * before any of that client's resources have been destroyed.
+ *
+ * There is no requirement to remove the link of the wl_listener when the
+ * signal is emitted.
+ *
+ * \memberof wl_client
+ */
 WL_EXPORT void
 wl_client_add_destroy_listener(struct wl_client *client,
 			       struct wl_listener *listener)
@@ -878,6 +891,32 @@
 	return wl_priv_signal_get(&client->destroy_signal, notify);
 }
 
+/**
+ * Add a listener to be called at the end of wl_client destruction
+ *
+ * The listener provided will be called when wl_client destroy is nearly
+ * complete, after all of that client's resources have been destroyed.
+ *
+ * There is no requirement to remove the link of the wl_listener when the
+ * signal is emitted.
+ *
+ * \memberof wl_client
+ * \since 1.22.0
+ */
+WL_EXPORT void
+wl_client_add_destroy_late_listener(struct wl_client *client,
+				    struct wl_listener *listener)
+{
+	wl_priv_signal_add(&client->destroy_late_signal, listener);
+}
+
+WL_EXPORT struct wl_listener *
+wl_client_get_destroy_late_listener(struct wl_client *client,
+				    wl_notify_func_t notify)
+{
+	return wl_priv_signal_get(&client->destroy_late_signal, notify);
+}
+
 WL_EXPORT void
 wl_client_destroy(struct wl_client *client)
 {
@@ -890,6 +929,9 @@
 	wl_map_release(&client->objects);
 	wl_event_source_remove(client->source);
 	close(wl_connection_destroy(client->connection));
+
+	wl_priv_signal_final_emit(&client->destroy_late_signal, client);
+
 	wl_list_remove(&client->link);
 	wl_list_remove(&client->resource_created_signal.listener_list);
 	free(client);
@@ -1097,7 +1139,7 @@
 	wl_priv_signal_init(&display->destroy_signal);
 	wl_priv_signal_init(&display->create_client_signal);
 
-	display->id = 1;
+	display->next_global_name = 1;
 	display->serial = 0;
 
 	display->global_filter = NULL;
@@ -1150,7 +1192,6 @@
 /** Destroy Wayland display object.
  *
  * \param display The Wayland display object which should be destroyed.
- * \return None.
  *
  * This function emits the wl_display destroy signal, releases
  * all the sockets added to this display, free's all the globals associated
@@ -1193,7 +1234,6 @@
  * \param display The Wayland display object.
  * \param filter  The global filter function.
  * \param data User data to be associated with the global filter.
- * \return None.
  *
  * Set a filter for the wl_display to advertise or hide global objects
  * to clients.
@@ -1245,12 +1285,17 @@
 		return NULL;
 	}
 
+	if (display->next_global_name >= UINT32_MAX) {
+		wl_log("wl_global_create: ran out of global names\n");
+		return NULL;
+	}
+
 	global = zalloc(sizeof *global);
 	if (global == NULL)
 		return NULL;
 
 	global->display = display;
-	global->name = display->id++;
+	global->name = display->next_global_name++;
 	global->interface = interface;
 	global->version = version;
 	global->data = data;
@@ -1324,6 +1369,23 @@
 	return global->interface;
 }
 
+/** Get the name of the global.
+ *
+ * \param global The global object.
+ * \param client Client for which to look up the global.
+ * \return The name of the global, or 0 if the global is not visible to the
+ *         client.
+ *
+ * \memberof wl_global
+ * \since 1.22
+ */
+WL_EXPORT uint32_t
+wl_global_get_name(const struct wl_global *global,
+		   const struct wl_client *client)
+{
+	return wl_global_is_visible(client, global) ? global->name : 0;
+}
+
 /** Get the version of the given global.
  *
  * \param global The global object.
@@ -1635,7 +1697,7 @@
 {
 	struct wl_socket *s;
 	int displayno = 0;
-	char display_name16 = "";
+	char display_name20 = "";
 
 	/* A reasonable number of maximum default sockets. If
 	 * you need more than this, use the explicit add_socket API. */

_service:tar_scm:wayland-1.21.0.tar.gz/src/wayland-shm.c -> _service:tar_scm:wayland-1.22.0.tar.xz/src/wayland-shm.c Changed

_service:tar_scm:wayland-1.21.0.tar.gz/src/wayland-util.h -> _service:tar_scm:wayland-1.22.0.tar.xz/src/wayland-util.h Changed

@@ -118,7 +118,7 @@
  * * `n`: new_id
  * * `a`: array
  * * `h`: fd
- * * `?`: following argument is nullable
+ * * `?`: following argument (`o` or `s`) is nullable
  *
  * While demarshaling primitive arguments is straightforward, when demarshaling
  * messages containing `object` or `new_id` arguments, the protocol
@@ -707,17 +707,17 @@
  * corresponding to the callback. The final argument is an array of arguments
  * received from the other process via the wire protocol.
  *
- * \param "const void *" Dispatcher-specific implementation data
- * \param "void *" Callback invocation target (wl_proxy or `wl_resource`)
- * \param uint32_t Callback opcode
- * \param "const struct wl_message *" Callback message signature
- * \param "union wl_argument *" Array of received arguments
+ * \param user_data Dispatcher-specific implementation data
+ * \param target Callback invocation target (wl_proxy or `wl_resource`)
+ * \param opcode Callback opcode
+ * \param msg Callback message signature
+ * \param args Array of received arguments
  *
  * \return 0 on success, or -1 on failure
  */
-typedef int (*wl_dispatcher_func_t)(const void *, void *, uint32_t,
-				    const struct wl_message *,
-				    union wl_argument *);
+typedef int (*wl_dispatcher_func_t)(const void *user_data, void *target,
+				    uint32_t opcode, const struct wl_message *msg,
+				    union wl_argument *args);
 
 /**
  * Log function type alias
@@ -736,14 +736,14 @@
  * \note Take care to not confuse this with `wl_protocol_logger_func_t`, which
  *       is a specific server-side logger for requests and events.
  *
- * \param "const char *" String to write to the log, containing optional format
- *                       specifiers
- * \param "va_list" Variable argument list
+ * \param fmt String to write to the log, containing optional format
+ *            specifiers
+ * \param args Variable argument list
  *
  * \sa wl_log_set_handler_client
  * \sa wl_log_set_handler_server
  */
-typedef void (*wl_log_func_t)(const char *, va_list) WL_PRINTF(1, 0);
+typedef void (*wl_log_func_t)(const char *fmt, va_list args) WL_PRINTF(1, 0);
 
 /**
  * Return value of an iterator function

_service:tar_scm:wayland-1.21.0.tar.gz/tests/client-test.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/client-test.c Changed

@@ -40,7 +40,11 @@
 
 struct client_destroy_listener {
 	struct wl_listener listener;
-	int done;
+	bool done;
+	struct wl_listener late_listener;
+	bool late_done;
+	struct wl_listener resource_listener;
+	bool resource_done;
 };
 
 static void
@@ -49,13 +53,38 @@
 	struct client_destroy_listener *listener =
 		wl_container_of(l, listener, listener);
 
-	listener->done = 1;
+	listener->done = true;
+	assert(!listener->resource_done);
+	assert(!listener->late_done);
+}
+
+static void
+client_resource_destroy_notify(struct wl_listener *l, void *data)
+{
+	struct client_destroy_listener *listener =
+		wl_container_of(l, listener, resource_listener);
+
+	assert(listener->done);
+	listener->resource_done = true;
+	assert(!listener->late_done);
+}
+
+static void
+client_late_destroy_notify(struct wl_listener *l, void *data)
+{
+	struct client_destroy_listener *listener =
+		wl_container_of(l, listener, late_listener);
+
+	assert(listener->done);
+	assert(listener->resource_done);
+	listener->late_done = true;
 }
 
 TEST(client_destroy_listener)
 {
 	struct wl_display *display;
 	struct wl_client *client;
+	struct wl_resource *resource;
 	struct client_destroy_listener a, b;
 	int s2;
 
@@ -65,23 +94,48 @@
 	client = wl_client_create(display, s0);
 	assert(client);
 
+	resource = wl_resource_create(client, &wl_callback_interface, 1, 0);
+	assert(resource);
+
 	a.listener.notify = client_destroy_notify;
-	a.done = 0;
+	a.done = false;
+	a.resource_listener.notify = client_resource_destroy_notify;
+	a.resource_done = false;
+	a.late_listener.notify = client_late_destroy_notify;
+	a.late_done = false;
 	wl_client_add_destroy_listener(client, &a.listener);
+	wl_resource_add_destroy_listener(resource, &a.resource_listener);
+	wl_client_add_destroy_late_listener(client, &a.late_listener);
 
 	assert(wl_client_get_destroy_listener(client, client_destroy_notify) ==
 	       &a.listener);
+	assert(wl_resource_get_destroy_listener(resource, client_resource_destroy_notify) ==
+	       &a.resource_listener);
+	assert(wl_client_get_destroy_late_listener(client, client_late_destroy_notify) ==
+	       &a.late_listener);
 
 	b.listener.notify = client_destroy_notify;
-	b.done = 0;
+	b.done = false;
+	b.resource_listener.notify = client_resource_destroy_notify;
+	b.resource_done = false;
+	b.late_listener.notify = client_late_destroy_notify;
+	b.late_done = false;
 	wl_client_add_destroy_listener(client, &b.listener);
+	wl_resource_add_destroy_listener(resource, &b.resource_listener);
+	wl_client_add_destroy_late_listener(client, &b.late_listener);
 
 	wl_list_remove(&a.listener.link);
+	wl_list_remove(&a.resource_listener.link);
+	wl_list_remove(&a.late_listener.link);
 
 	wl_client_destroy(client);
 
 	assert(!a.done);
+	assert(!a.resource_done);
+	assert(!a.late_done);
 	assert(b.done);
+	assert(b.resource_done);
+	assert(b.late_done);
 
 	close(s0);
 	close(s1);

_service:tar_scm:wayland-1.21.0.tar.gz/tests/connection-test.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/connection-test.c Changed

@@ -245,9 +245,6 @@
 	marshal(&data, "n", 12, &object);
 	assert(data.buffer2 == object.id);
 
-	marshal(&data, "?n", 12, NULL);
-	assert(data.buffer2 == 0);
-
 	array.data = (void *) text;
 	array.size = sizeof text;
 	marshal(&data, "a", 20, &array);
@@ -305,7 +302,6 @@
 {
 	struct marshal_data data;
 	struct wl_object object;
-	struct wl_array array;
 	const char text = "curry";
 
 	setup_marshal_data(&data);
@@ -317,9 +313,6 @@
 	marshal(&data, "?o", 12, NULL);
 	assert(data.buffer2 == 0);
 
-	marshal(&data, "?a", 12, NULL);
-	assert(data.buffer2 == 0);
-
 	marshal(&data, "?s", 12, NULL);
 	assert(data.buffer2 == 0);
 
@@ -327,12 +320,6 @@
 	marshal(&data, "?o", 12, &object);
 	assert(data.buffer2 == object.id);
 
-	array.data = (void *) text;
-	array.size = sizeof text;
-	marshal(&data, "?a", 20, &array);
-	assert(data.buffer2 == array.size);
-	assert(memcmp(&data.buffer3, text, array.size) == 0);
-
 	marshal(&data, "?s", 20, text);
 	assert(data.buffer2 == sizeof text);
 	assert(strcmp((char *) &data.buffer3, text) == 0);

_service:tar_scm:wayland-1.21.0.tar.gz/tests/message-test.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/message-test.c Changed

_service:tar_scm:wayland-1.21.0.tar.gz/tests/queue-test.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/queue-test.c Changed

@@ -23,14 +23,18 @@
  * SOFTWARE.
  */
 
+#define _GNU_SOURCE /* For memrchr */
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <string.h>
 #include <unistd.h>
+#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
+#include <signal.h>
 
 #include "wayland-client.h"
 #include "wayland-server.h"
@@ -303,6 +307,170 @@
 	wl_display_disconnect(display);
 }
 
+static char *
+maybe_map_file(int fd, size_t *len)
+{
+	char *data;
+
+	*len = lseek(fd, 0, SEEK_END);
+	data = mmap(0, *len, PROT_READ, MAP_PRIVATE, fd, 0);
+
+	return data;
+}
+
+static char *
+map_file(int fd, size_t *len)
+{
+	char *data;
+
+	data = maybe_map_file(fd, len);
+	assert(data != MAP_FAILED && "Failed to mmap file");
+
+	return data;
+}
+
+static char *
+last_line_of(char *s)
+{
+	size_t len = strlen(s);
+	char *last;
+
+	last = memrchr(s, '\n', len);
+	/* If we found a newline at end of string, find the previous one. */
+	if (last && last1 == 0)
+		last = memrchr(s, '\n', len - 1);
+	/* If we have a newline, the last line starts after the newline.
+	 * Otherwise, the whole string is the last line. */
+	if (last)
+		last += 1;
+	else
+		last = s;
+
+	return last;
+}
+
+static void
+client_test_queue_destroy_with_attached_proxies(void)
+{
+	struct wl_event_queue *queue;
+	struct wl_display *display;
+	struct wl_display *display_wrapper;
+	struct wl_callback *callback;
+	char *log;
+	size_t log_len;
+	char callback_name24;
+	int ret;
+
+	display = wl_display_connect(NULL);
+	assert(display);
+
+	/* Pretend we are in a separate thread where a thread-local queue is
+	 * used. */
+	queue = wl_display_create_queue(display);
+	assert(queue);
+
+	/* Create a sync dispatching events on the thread-local queue. */
+	display_wrapper = wl_proxy_create_wrapper(display);
+	assert(display_wrapper);
+	wl_proxy_set_queue((struct wl_proxy *) display_wrapper, queue);
+	callback = wl_display_sync(display_wrapper);
+	wl_proxy_wrapper_destroy(display_wrapper);
+	assert(callback != NULL);
+
+	/* Destroy the queue before the attached object. */
+	wl_event_queue_destroy(queue);
+
+	/* Check that the log contains some information about the attached
+	 * wl_callback proxy. */
+	log = map_file(client_log_fd, &log_len);
+	ret = snprintf(callback_name, sizeof(callback_name), "wl_callback@%u",
+		       wl_proxy_get_id((struct wl_proxy *) callback));
+	assert(ret > 0 && ret < (int)sizeof(callback_name) &&
+	       "callback name creation failed (possibly truncated)");
+	assert(strstr(last_line_of(log), callback_name));
+	munmap(log, log_len);
+
+	wl_callback_destroy(callback);
+
+	wl_display_disconnect(display);
+}
+
+static void
+client_test_queue_proxy_event_to_destroyed_queue(void)
+{
+	struct wl_event_queue *queue;
+	struct wl_display *display;
+	struct wl_display *display_wrapper;
+	struct wl_callback *callback;
+
+	display = wl_display_connect(NULL);
+	assert(display);
+
+	/* Pretend we are in a separate thread where a thread-local queue is
+	 * used. */
+	queue = wl_display_create_queue(display);
+	assert(queue);
+
+	/* Create a sync dispatching events on the thread-local queue. */
+	display_wrapper = wl_proxy_create_wrapper(display);
+	assert(display_wrapper);
+	wl_proxy_set_queue((struct wl_proxy *) display_wrapper, queue);
+	callback = wl_display_sync(display_wrapper);
+	wl_proxy_wrapper_destroy(display_wrapper);
+	assert(callback != NULL);
+	wl_display_flush(display);
+
+	/* Destroy the queue before the attached object. */
+	wl_event_queue_destroy(queue);
+
+	/* During this roundtrip we should receive the done event on 'callback',
+	 * try to queue it to the destroyed queue, and abort. */
+	wl_display_roundtrip(display);
+
+	wl_callback_destroy(callback);
+
+	wl_display_disconnect(display);
+}
+
+static void
+client_test_queue_destroy_default_with_attached_proxies(void)
+{
+	struct wl_display *display;
+	struct wl_callback *callback;
+	char *log;
+	size_t log_len;
+	char callback_name24;
+	int ret;
+
+	display = wl_display_connect(NULL);
+	assert(display);
+
+	/* Create a sync dispatching events on the default queue. */
+	callback = wl_display_sync(display);
+	assert(callback != NULL);
+
+	/* Destroy the default queue (by disconnecting) before the attached
+	 * object. */
+	wl_display_disconnect(display);
+
+	/* Check that the log does not contain any warning about the attached
+	 * wl_callback proxy. */
+	log = maybe_map_file(client_log_fd, &log_len);
+	ret = snprintf(callback_name, sizeof(callback_name), "wl_callback@%u",
+		       wl_proxy_get_id((struct wl_proxy *) callback));
+	assert(ret > 0 && ret < (int)sizeof(callback_name) &&
+	       "callback name creation failed (possibly truncated)");
+	assert(log == MAP_FAILED || strstr(log, callback_name) == NULL);
+	if (log != MAP_FAILED)
+		munmap(log, log_len);
+
+	/* HACK: Directly free the memory of the wl_callback proxy to appease
+	 * ASan. We would normally use wl_callback_destroy(), but since we have
+	 * destroyed the associated wl_display, using this function would lead
+	 * to memory errors. */
+	free(callback);
+}
+
 static void
 dummy_bind(struct wl_client *client,
 	   void *data, uint32_t version, uint32_t id)
@@ -382,3 +550,50 @@
 
 	display_destroy(d);
 }
+
+TEST(queue_destroy_with_attached_proxies)
+{
+	struct display *d = display_create();
+
+	test_set_timeout(2);

_service:tar_scm:wayland-1.21.0.tar.gz/tests/sanity-test.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/sanity-test.c Changed

@@ -25,7 +25,9 @@
 
 #include <stdlib.h>
 #include <assert.h>
+#include <string.h>
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <signal.h>
 #include <unistd.h>
 
@@ -181,6 +183,65 @@
 	display_destroy(d);
 }
 
+static char *
+map_file(int fd, size_t *len)
+{
+	char *data;
+
+	*len = lseek(fd, 0, SEEK_END);
+	data = mmap(0, *len, PROT_READ, MAP_PRIVATE, fd, 0);
+	assert(data != MAP_FAILED && "Failed to mmap file");
+
+	return data;
+}
+
+static void
+sanity_client_log(void)
+{
+	char *log;
+	size_t log_len;
+	char *wayland_socket = strdup(getenv("WAYLAND_SOCKET"));
+	char *xdg_runtime_dir = strdup(getenv("XDG_RUNTIME_DIR"));
+
+	unsetenv("WAYLAND_SOCKET");
+	unsetenv("XDG_RUNTIME_DIR");
+
+	/* Try to connect to the default wayland display, which should fail since
+	 * we have neither WAYLAND_SOCKET nor XDG_RUNTIME_DIR. */
+	assert(!wl_display_connect(NULL));
+
+	/* Check that the client log contains some mention of XDG_RUNTIME_DIR. */
+	log = map_file(client_log_fd, &log_len);
+	assert(strstr(log, "XDG_RUNTIME_DIR"));
+	munmap(log, log_len);
+
+	/* Reset the environment variables we unset for the test. The test harness
+	 * leak checker cares about the value of WAYLAND_SOCKET during teardown for
+	 * correct fd accounting. */
+	setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 0);
+	setenv("WAYLAND_SOCKET", wayland_socket, 0);
+	free(xdg_runtime_dir);
+	free(wayland_socket);
+}
+
+TEST(tc_client_log)
+{
+	struct display *d = display_create();
+	struct client_info *ci;
+	char *log;
+	size_t log_len;
+
+	ci = client_create_noarg(d, sanity_client_log);
+	display_run(d);
+
+	/* Check that the client log contains some mention of XDG_RUNTIME_DIR. */
+	log = map_file(ci->log_fd, &log_len);
+	assert(strstr(log, "XDG_RUNTIME_DIR"));
+	munmap(log, log_len);
+
+	display_destroy(d);
+}
+
 FAIL_TEST(timeout_tst)
 {
 	test_set_timeout(1);

_service:tar_scm:wayland-1.21.0.tar.gz/tests/test-compositor.c -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/test-compositor.c Changed

@@ -40,6 +40,8 @@
 #include "test-runner.h"
 #include "test-compositor.h"
 
+int client_log_fd = -1;
+
 /* --- Protocol --- */
 struct test_compositor;
 
@@ -112,7 +114,7 @@
 	case CLD_DUMPED:
 		fprintf(stderr, "Client '%s' was killed by signal %d\n",
 			ci->name, status.si_status);
-		ci->exit_code = status.si_status;
+		ci->kill_code = status.si_status;
 		break;
 	case CLD_EXITED:
 		if (status.si_status != EXIT_SUCCESS)
@@ -156,8 +158,20 @@
 }
 
 static void
+client_log_handler(const char *fmt, va_list arg)
+{
+	va_list arg_copy;
+
+	va_copy(arg_copy, arg);
+	vdprintf(client_log_fd, fmt, arg_copy);
+	va_end(arg_copy);
+
+	vfprintf(stderr, fmt, arg);
+}
+
+static void
 run_client(void (*client_main)(void *data), void *data,
-	   int wayland_sock, int client_pipe)
+	   int wayland_sock, int client_pipe, int log_fd)
 {
 	char s8;
 	int cur_fds;
@@ -173,6 +187,10 @@
 	snprintf(s, sizeof s, "%d", wayland_sock);
 	setenv("WAYLAND_SOCKET", s, 0);
 
+	/* Capture the log to the specified file descriptor. */
+	client_log_fd = log_fd;
+	wl_log_set_handler_client(client_log_handler);
+
 	cur_fds = count_open_fds();
 
 	client_main(data);
@@ -188,6 +206,18 @@
 	check_fd_leaks(cur_fds);
 }
 
+static int
+create_log_fd(void)
+{
+	char logname = "/tmp/wayland-tests-log-XXXXXX";
+	int log_fd = mkstemp(logname);
+
+	if (log_fd >= 0)
+		unlink(logname);
+
+	return log_fd;
+}
+
 static struct client_info *
 display_create_client(struct display *d,
 		      void (*client_main)(void *data),
@@ -199,11 +229,15 @@
 	pid_t pid;
 	int can_continue = 0;
 	struct client_info *cl;
+	int log_fd;
 
 	assert(pipe(pipe_cli) == 0 && "Failed creating pipe");
 	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, sock_wayl) == 0
 	       && "Failed creating socket pair");
 
+	log_fd = create_log_fd();
+	assert(log_fd >= 0 && "Failed to create log fd");
+
 	pid = fork();
 	assert(pid != -1 && "Fork failed");
 
@@ -211,10 +245,11 @@
 		close(sock_wayl1);
 		close(pipe_cli1);
 
-		run_client(client_main, data, sock_wayl0, pipe_cli0);
+		run_client(client_main, data, sock_wayl0, pipe_cli0, log_fd);
 
 		close(sock_wayl0);
 		close(pipe_cli0);
+		close(log_fd);
 
 		exit(0);
 	}
@@ -231,6 +266,7 @@
 	cl->name = name;
 	cl->pid = pid;
 	cl->pipe = pipe_cli1;
+	cl->log_fd = log_fd;
 	cl->destroy_listener.notify = &client_destroyed;
 
 	cl->wl_client = wl_client_create(d->wl_display, sock_wayl1);
@@ -389,8 +425,10 @@
 	wl_display_run(d->wl_display);
 }
 
+/* If signum is 0, expect a successful client exit, otherwise
+ * expect the client to have been killed by that signal. */
 void
-display_destroy(struct display *d)
+display_destroy_expect_signal(struct display *d, int signum)
 {
 	struct client_info *cl, *next;
 	int failed = 0;
@@ -401,12 +439,21 @@
 	wl_list_for_each_safe(cl, next, &d->clients, link) {
 		assert(cl->wl_client == NULL);
 
-		if (cl->exit_code != 0) {
+		if (signum != 0 && cl->kill_code != signum) {
+			++failed;
+			fprintf(stderr,
+				"Client '%s' failed, expecting signal %d, "
+				"got %d\n",
+				cl->name, signum, cl->kill_code);
+		}
+		else if (signum == 0 &&
+			 (cl->kill_code != 0 || cl->exit_code != 0)) {
 			++failed;
 			fprintf(stderr, "Client '%s' failed\n", cl->name);
 		}
 
 		close(cl->pipe);
+		close(cl->log_fd);
 		free(cl);
 	}
 
@@ -420,6 +467,12 @@
 	}
 }
 
+void
+display_destroy(struct display *d)
+{
+	display_destroy_expect_signal(d, 0);
+}
+
 /*
  * --- Client helper functions ---
  */

_service:tar_scm:wayland-1.21.0.tar.gz/tests/test-compositor.h -> _service:tar_scm:wayland-1.22.0.tar.xz/tests/test-compositor.h Changed

Changes of Revision 11