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

Z-Mimic: Synchronize with upstream #3365

Merged
merged 9 commits into from
Feb 11, 2024
Merged

Conversation

Lohikar
Copy link
Member

@Lohikar Lohikar commented Sep 22, 2023

Updates Z-Mimic to the latest (in-dev) version. This should fix several edge case issues, as well as close the discovery loophole without ruining performance like 3-phase ZM. Support is also added for handling of long/wide atoms. ZM performance logging code is present, but define gated off for now.

This is currently not well tested, though the diff changes less than it appears to.

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Sep 22, 2023
@MistakeNot4892 MistakeNot4892 added the stale One week from the time of labelling, this PR will be closed as inactive. label Jan 17, 2024
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed stale One week from the time of labelling, this PR will be closed as inactive. work in progress This PR is under development and shouldn't be merged. labels Jan 28, 2024
@MistakeNot4892 MistakeNot4892 marked this pull request as ready for review January 28, 2024 08:39
MistakeNot4892
MistakeNot4892 previously approved these changes Jan 28, 2024
@Lohikar
Copy link
Member Author

Lohikar commented Jan 28, 2024

DNM: OVERRIDE needs some changes.

@Lohikar Lohikar added the do not merge This PR is on hold, do not merge it. label Jan 28, 2024
@@ -1,7 +1,28 @@
#define ZM_DESTRUCTION_TIMER(TARGET) addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suspect this should be TARGET not src.

@MistakeNot4892 MistakeNot4892 added this to the r5 milestone Feb 5, 2024
@Lohikar Lohikar removed the do not merge This PR is on hold, do not merge it. label Feb 6, 2024
@Lohikar
Copy link
Member Author

Lohikar commented Feb 6, 2024

This should be good to go -- I'm not sure about the utility of some of those flags, but they should all work.

@out-of-phaze out-of-phaze merged commit 039c6f9 into NebulaSS13:dev Feb 11, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants