Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: remove mir cookie #3176

Merged
merged 7 commits into from
Jan 17, 2024
Merged

feature: remove mir cookie #3176

merged 7 commits into from
Jan 17, 2024

Conversation

mattkae
Copy link
Contributor

@mattkae mattkae commented Jan 5, 2024

What's new?

  • mircookie and its friends are removed
  • This breaks ABI

Copy link

codecov bot commented Jan 5, 2024

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (a632621) 77.85% compared to head (81449b8) 77.81%.

Files Patch % Lines
src/server/input/default_event_builder.cpp 44.44% 5 Missing ⚠️
src/common/events/event_builders.cpp 50.00% 1 Missing ⚠️
tests/unit-tests/scene/test_surface.cpp 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3176      +/-   ##
==========================================
- Coverage   77.85%   77.81%   -0.05%     
==========================================
  Files        1070     1062       -8     
  Lines       74893    74626     -267     
==========================================
- Hits        58311    58072     -239     
+ Misses      16582    16554      -28     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mattkae mattkae changed the title (WIP) feature: remove mir cookie feature: remove mir cookie Jan 8, 2024
@mattkae mattkae requested a review from AlanGriffiths January 8, 2024 15:57
@mattkae mattkae marked this pull request as ready for review January 8, 2024 15:58
@mattkae mattkae requested a review from RAOF January 8, 2024 20:29
Copy link
Contributor

@RAOF RAOF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me.

We might want something similar for xdg-activation, but since that has a client-requests-token -> server-generates-token loop we shouldn't need any of the cookie-for-every-event infrastructure this removes.

If some of the code turns out to be useful there, we can easily fish it out of history.

Copy link
Collaborator

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • This breaks ABI

We need to do some ABI bumping then. I don't mind if that is a separate PR, but needs to follow shortly.

As most of our libraries use events, I imagine they all need bumping. (mircore is probably OK)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this header belongs in include/common, not include/core - see where the function is implemented.

@@ -411,7 +411,6 @@ def _report(publish, symbol):
miral::toolkit::mir_input_event_get_pointer_event*;
miral::toolkit::mir_input_event_get_touch_event*;
miral::toolkit::mir_input_event_get_type*;
miral::toolkit::mir_input_event_has_cookie*;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be bumping ABI, not dropping symbols without changing soname

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this might be one that I don't understand. Should I leave all of the .map files unchanged, or am I supposed to remove the symbols from them now?

Also, is there any simple mechanism for bumping the so names that need to be bumped?

Copy link
Collaborator

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good except for the symbol/soname versioning. That is addressed in a dependent PR: #3178.

I think the best approach is to merge that into this PR before landing. But marking my approval

@mattkae
Copy link
Contributor Author

mattkae commented Jan 16, 2024

@AlanGriffiths FYI, it appears that the failing Fedora tests are failing on main too.

@AlanGriffiths AlanGriffiths added this pull request to the merge queue Jan 17, 2024
Merged via the queue into main with commit cf1bd4b Jan 17, 2024
22 of 25 checks passed
@AlanGriffiths AlanGriffiths deleted the feature/remove_mir_cookie branch January 17, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants