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

Fix/23 change mutex lock conditionally #33

Merged
merged 5 commits into from
Feb 20, 2024

Conversation

Crambor
Copy link
Collaborator

@Crambor Crambor commented Dec 1, 2023

Mostly minor changes here - just #23 (unique_lock replaces the original lockguard) and #24 (added a conditional for error checking)

Most of the line changes are whitespace, because I brought in the original lib/umbridge.h into the hpc directory. This has also therefore inherited the lastest commits, such as the additional logging.

@linusseelinger
Copy link
Member

I think we should merge all changes into the main lib/umbridge.h and get rid of the copy in hpc/. The only reason the copy in hpc/ is around is because it holds the disabled mutex which we need for the load balancer. Could you apply your changes to the main library and remove the hpc copy?

hpc/lib/umbridge.h Outdated Show resolved Hide resolved
@linusseelinger
Copy link
Member

Looks good so far! Going forward, I think we should either

  • only modify the hpc/lib/ version here and proceed with merging in a separate PR
  • or fully merge with lib/, completely eliminating hpc/lib/ and adapting the load balancer appropriately

@annereinarz annereinarz merged commit 01e9c1e into main Feb 20, 2024
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