Page MenuHomeFreeBSD
Differential D23643

graphics/wayland: Update to 1.18
ClosedPublic
Actions

Authored by jbeich on Feb 12 2020, 11:52 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Dec 5, 6:27 PM
Unknown Object (File)
Sat, Nov 30, 4:36 AM
Unknown Object (File)
Fri, Nov 29, 7:12 AM
Unknown Object (File)
Sun, Nov 24, 8:54 PM
Unknown Object (File)
Sun, Nov 24, 1:00 PM
Unknown Object (File)
Nov 23 2024, 5:22 AM
Unknown Object (File)
Nov 18 2024, 11:28 PM
Unknown Object (File)
Nov 7 2024, 7:01 AM
View All Files
Subscribers
imp
manu
zeising

Details

Reviewers
val_packett.cool
manu
bapt
zeising
Group Reviewers
x11
Commits
rP526103: Update to 1.18
Summary

ABI is compatible. Other changes:

  • Allow memfd_create on FreeBSD 13 for sealing
  • Drop ms_timeout workaround in favor of upstream fix
  • Drop posix_fallocate patch as it was disabled in rP455878
  • Adjust posix_fallocate comment for more clarity
  • Temporarily revert event loop update until epoll-shim#15 is fixed
Test Plan

Builds fine on:

  • 11.3 aarch64
  • 11.3 amd64
  • 11.3 armv6
  • 11.3 i386
  • 12.0 amd64
  • 12.0 i386
  • 12.1 aarch64
  • 12.1 amd64
  • 12.1 armv6
  • 12.1 armv7
  • 12.1 i386
  • 13.0 amd64
  • 13.0 i386
  • Base GCC 4.2.1 (mimics powerpc*, mips*, riscv64)

Works fine on:

  • multimedia/libva-intel-driver
  • multimedia/mpv
  • www/firefox + MOZ_ENABLE_WAYLAND
  • x11-servers/xwayland-devel
  • x11-wm/cage
  • x11-wm/sway
  • x11/wl-clipboard

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 29353
Build 27252: arc lint + arc unit

Event Timeline

jbeich created this revision.Feb 12 2020, 11:52 AM
Harbormaster completed remote builds in B29307: Diff 68171.Feb 12 2020, 11:52 AM
jbeich edited the summary of this revision. (Show Details)Feb 12 2020, 11:54 AM
jbeich updated this revision to Diff 68172.Feb 12 2020, 11:59 AM
  • Update TIMESTAMP in distinfo
  • Adjust commit message for review URL
Harbormaster completed remote builds in B29308: Diff 68172.Feb 12 2020, 11:59 AM
jbeich added a child revision: D23644: graphics/wayland: convert to USES=meson.Feb 12 2020, 12:31 PM
jbeich edited the summary of this revision. (Show Details)Feb 12 2020, 1:34 PM
jbeich edited the test plan for this revision. (Show Details)Feb 12 2020, 2:29 PM
imp added a subscriber: imp.Feb 12 2020, 11:10 PM

this looks promising...

One concern, though, is the sway using 100% of the CPU considered a show stopper? It sounds quite serious...

jbeich updated this revision to Diff 68235.EditedFeb 13 2020, 1:55 AM
  • Refresh unchanged patches to avoid confusion from context lines changes in D23644
In D23643#519264, @imp wrote:

One concern, though, is the sway using 100% of the CPU considered a show stopper? It sounds quite serious...

Only if someone can reproduce. Upstream commit is easy to revert (for now). Debugging this is outside of my domain i.e., not familar with the APIs used.

Harbormaster completed remote builds in B29336: Diff 68235.Feb 13 2020, 1:56 AM
val_packett.cool added a comment.EditedFeb 13 2020, 3:02 PM

1.17.0-60-g60a8d29

libwayland now uses only one file descriptor to keep track of all the timer event sources

Ha, and we've had to improve epoll-shim for the old way.. https://github.com/jiixyj/epoll-shim/issues/8

Yep, wayfire consumes 100% CPU for me. Here's a flamegraph, probably should've used pmcstat instead of dtrace but timerfd_settime looks like a place to look. Looks like the kqueue fast path is not being used, but either way this shouldn't happen..

Created issue: https://github.com/jiixyj/epoll-shim/issues/15

zeising added a subscriber: zeising.Feb 13 2020, 3:05 PM
In D23643#519404, @greg_unrelenting.technology wrote:

Yep, wayfire consumes 100% CPU for me. Here's a flamegraph, probably should've used pmcstat instead of dtrace but timerfd_settime looks like a place to look. Looks like the kqueue fast path is not being used, but either way this shouldn't happen..

Sounds like this at least warrants some investigating before merging this. @greg_unrelenting.technology , sounds like you've started looking into this, any chance you can spend some more time digging into it?
Thanks!

val_packett.cool added a comment.Feb 13 2020, 3:08 PM
In D23643#519412, @zeising wrote:

sounds like you've started looking into this, any chance you can spend some more time digging into it?

I am looking. For now we can just revert that change and commit.

jbeich updated this revision to Diff 68259.Feb 13 2020, 5:29 PM
jbeich edited the summary of this revision. (Show Details)
  • Revert regressing change to unblock progress, as suggested by Greg

Now it's ready to land (without D23644). I've actually been dogfooding the revert since yesterday without issues.

Harbormaster completed remote builds in B29353: Diff 68259.Feb 13 2020, 5:29 PM
jbeich edited the summary of this revision. (Show Details)Feb 13 2020, 5:36 PM
jbeich edited the summary of this revision. (Show Details)
jbeich edited the summary of this revision. (Show Details)
manu accepted this revision as: manu.Feb 14 2020, 9:09 AM
manu added a subscriber: manu.

LGTM
I've started a build to test on my laptops later today.
ping @zeising for x11 approval.

This revision is now accepted and ready to land.Feb 14 2020, 9:09 AM
bapt accepted this revision.Feb 14 2020, 9:51 AM
zeising accepted this revision.Feb 14 2020, 9:57 AM

I'm not a fan of ripping out that commit, I rather we wait for https://github.com/jiixyj/epoll-shim/issues/15, but go ahead, we can fix that later.

manu added a comment.Feb 14 2020, 11:06 AM

Build finished, tested ok with sway so I think we're good to go.

Closed by commit rP526103: Update to 1.18 (authored by bapt). · Explain WhyFeb 14 2020, 11:09 AM
This revision was automatically updated to reflect the committed changes.
bapt added a commit: rP526103: Update to 1.18.
jbeich added a comment.EditedFeb 14 2020, 11:49 AM

@zeising, epoll-shim fix may have increased risk if something wasn't covered by tests. Seemed like a recipe to unnecessarily delay libwayland update for one bugfix that doesn't affect API/ABI. If devel/libepoll-shim is aggressively updated then any risk would be short-lived.

Now that @bapt landed this change we can take time to test epoll-shim fix.

Revision Contents
Changeset List

Diff 68259

View Options

graphics/wayland/Makefile

Loading...
View Options

graphics/wayland/distinfo

Loading...
View Options

graphics/wayland/files/patch-Makefile.am

Loading...
View Options

graphics/wayland/files/patch-configure.ac

Loading...
View Options

graphics/wayland/files/patch-cursor_os-compatibility.c

Loading...
View Options

graphics/wayland/files/patch-src_event-loop.c

Loading...
View Options

graphics/wayland/files/patch-src_wayland-server.c

Loading...
View Options

graphics/wayland/files/patch-src_wayland-shm.c

Loading...
View Options

graphics/wayland/files/patch-tests_event-loop-test.c

Loading...
View Options

graphics/wayland/files/patch-tests_test-helpers.c

Loading...
View Options

graphics/wayland/files/patch-tests_test-runner.c

Loading...