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

Remove JobListReadLock and simplify JobQueue #6114

Merged
merged 5 commits into from
Sep 22, 2023

Conversation

andreas-el
Copy link
Contributor

@andreas-el andreas-el commented Sep 19, 2023

Remove unused JobListReadLock
Initialize struct members
Avoid state for JobQueue where alloc returns a not fully functional object before set_driver was executed
Update pybind signatures

Pre review checklist

  • Read through the code changes carefully after finishing work
  • Make sure tests pass locally (after every commit!)
  • Prepare changes in small commits for more convenient review (optional)
  • PR title captures the intent of the changes, and is fitting for release notes.
  • Updated documentation
  • Ensured that unit tests are added for all new behavior (See
    Ground Rules),
    and changes to existing code have good test coverage.

Pre merge checklist

  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.

@@ -89,10 +89,8 @@ def _queue_state_event_type(state: str) -> str:
# pylint: disable=too-many-public-methods
class JobQueue(BaseCClass): # type: ignore
TYPE_NAME = "job_queue"
_alloc = ResPrototype("void* job_queue_alloc()", bind=False)
_alloc = ResPrototype("void* job_queue_alloc(void*)", bind=False)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure if I got this CWrap thing correct here

@andreas-el andreas-el force-pushed the refactor_job_queue branch 4 times, most recently from 6d5aa68 to 129e822 Compare September 21, 2023 14:02
@andreas-el andreas-el changed the title Refactor job queue Remove JobQueueReadLock and simplify Job Queue Sep 21, 2023
@andreas-el andreas-el changed the title Remove JobQueueReadLock and simplify Job Queue Remove JobQueueReadLock and simplify JobQueue Sep 21, 2023
@andreas-el andreas-el changed the title Remove JobQueueReadLock and simplify JobQueue Remove JobListReadLock and simplify JobQueue Sep 21, 2023
@andreas-el andreas-el self-assigned this Sep 21, 2023
@andreas-el andreas-el added the release-notes:maintenance Automatically categorise as maintenance change in release notes label Sep 21, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #6114 (662e95a) into main (8a15332) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #6114   +/-   ##
=======================================
  Coverage   82.42%   82.42%           
=======================================
  Files         350      350           
  Lines       21457    21450    -7     
  Branches      839      839           
=======================================
- Hits        17685    17681    -4     
+ Misses       3474     3471    -3     
  Partials      298      298           
Files Changed Coverage Δ
src/clib/lib/job_queue/job_list.cpp 52.17% <ø> (ø)
src/clib/lib/job_queue/job_queue.cpp 47.61% <100.00%> (-6.55%) ⬇️
src/clib/lib/job_queue/job_queue_status.cpp 93.75% <100.00%> (-0.37%) ⬇️
src/ert/job_queue/queue.py 88.25% <100.00%> (-0.09%) ⬇️

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@andreas-el andreas-el merged commit 8b6b6c5 into equinor:main Sep 22, 2023
39 checks passed
@andreas-el andreas-el deleted the refactor_job_queue branch September 22, 2023 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:maintenance Automatically categorise as maintenance change in release notes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants