Refactor parts of block_fs.cpp
#3233
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
libres/lib/res_util/block_fs.cpp
Outdated
| @@ -1096,22 +1074,18 @@ void block_fs_fwrite_buffer(block_fs_type *block_fs, const char *filename, | |||
|
|
|||
| void block_fs_fread_realloc_buffer(block_fs_type *block_fs, | |||
| const char *filename, buffer_type *buffer) { | |||
| block_fs_aquire_rlock(block_fs); | |||
| std::lock_guard guard{block_fs->mutex}; | |||
| { | |||
There was a problem hiding this comment.
Remove extra block...?
libres/lib/res_util/block_fs.cpp
Outdated
| free(data_ext); | ||
| free(lock_ext); | ||
| } | ||
|
|
||
| /* | ||
| This function is called both when allocating a new block_fs | ||
| instance, and when an existing block_fs instance is 'rotated'. |
Note how the only place in production where the `block_level_lock` is set, it is fixed to `false`. The lock exists further up the stack inside `enkf_fs`. Therefore it is safe to remove this functionality. : w block_fs: remove unused `.lock` functionality Note how the only place in production where the `block_level_lock` is set, it is fixed to `false`. The lock exists further up the stack inside `enkf_fs`. Therefore it is safe to remove this functionality.
Note how this value is set only in one place, and it is set to `1.0`. The comment next to this line says that a fragmentation_limit of `1.0` means no fragmentation is run. Hence this is safe.
This is not necessary, as the paths are now only used for diagnostics and initialisation.
Codecov Report
@@ Coverage Diff @@
## main #3233 +/- ##
==========================================
- Coverage 65.68% 65.67% -0.02%
==========================================
Files 614 614
Lines 49045 48815 -230
Branches 4407 4405 -2
==========================================
- Hits 32216 32060 -156
+ Misses 15357 15271 -86
- Partials 1472 1484 +12
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
sondreso
added
the
release-notes:improvement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the commits from #3194 except for the controversial last one.