Using shared ptr to track iodesc use - #698
Open
jayeshkrishna wants to merge 14 commits into
Open
Conversation
Adding test that writes and immediately frees (before file close/sync) I/O decompositions. The decomposition used for read is freed after the file is closed/deleted
We no longer use custom linked lists for I/O decomposition lists. Removing unused/stale remnants (ptr to next) of the old linked list in io_desc_t.
Moving some util functions related to I/O decomposition from pioc_support.cpp to a new file (spio_iodesc_utils.cpp) No change in source code
jayeshkrishna
force-pushed
the
jayeshkrishna/track_iodesc_via_sptr
branch
2 times, most recently
from
July 28, 2026 18:37
fb0d84b to
32ff469
Compare
Converting io_desc_t from a C struct to a simple C++ struct with constructor/destructor/util functions. The io_desc_t is still not a "full fledged" C++ class (this will be done in a future PR). However this minimum change is required to use shared pointers with I/O decomps. * Adding a constructor that manages constructing the io_desc_t object (instead of custom functions that alloc memory and initialize fields) * Also adding a destructor to free decomp and some util functions to free up resources. * All members of the io_desc_t struct is still public since a lot of the code base access the members directly * The member arrays/pointers are still allocated memory explicitly using malloc/calloc (these will be changed in future PRs) * A shared pointer to the io_desc_t, stored in the global io_desc list, now manages the lifetime of I/O decomps * Modified tests accordingly * Modified asserts to account for zero sized local decomp maps
Using C++ constructors and destructors for write cache info. The members are all still public (since other parts of the code access them directly) and will be changed in a future PR
I/O decompositions are separate from files and is used by files when rearranging data (before writing the data out). Since I/O decompositions can be potentially freed before it gets used by a file, we now cache a reference to the I/O decomposition in the file. * I/O decomposition objects are ref counted using shared ptrs * Using a map to cache I/O decomps in files * In the async case cache a ref to I/O decomp in the write info object
Since we now ref count I/O decompositions correctly we no longer need the hack to sync all files before freeing decomps.
jayeshkrishna
force-pushed
the
jayeshkrishna/track_iodesc_via_sptr
branch
from
July 28, 2026 18:45
32ff469 to
2c59543
Compare
There was a problem hiding this comment.
Pull request overview
This PR changes SCORPIO’s internal I/O decomposition (iodesc) lifetime management to use std::shared_ptr, allowing decompositions to be freed by the user before file sync/close without forcing an unconditional file-level sync in PIO_freedecomp.
Changes:
- Introduces an
io_desc_tconstructor/destructor and stores iodescs in the global list asstd::shared_ptr. - Adds per-file tracking of iodesc references so pending buffered writes can safely flush even after
PIO_freedecomp. - Updates async-HDF5 write op caching and expands unit/integration tests to cover “free decomp before close/sync” scenarios.
Reviewed changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/general/pio_decomp_tests.F90.in | Adds a regression test that frees decomps before sync/close and verifies readback. |
| tests/cunit/test_spio_decomp_logger.cpp | Updates test allocation/free of io_desc_t to use new/delete with the new ctor/dtor. |
| tests/cunit/test_rearr.cpp | Updates rearranger unit tests to construct io_desc_t with the new ctor and avoid double-frees. |
| tests/cunit/test_pioc.cpp | Updates iodesc list tests to use std::shared_ptr<io_desc_t> and member cleanup helpers. |
| src/flib/spio_decomp.F90.in | Removes unconditional PIOc_sync() from PIO_freedecomp Fortran wrapper. |
| src/clib/pio_types.hpp | Converts io_desc_t to a C++ struct with ctor/dtor and adds file_desc_t::io_desc_refs for per-file iodesc refs. |
| src/clib/pio_internal.h | Updates iodesc list APIs to shared_ptr and declares per-file iodesc ref helpers. |
| src/clib/core/util/spio_iosys_utils.hpp | Adds iosystem utility header (async-service detection). |
| src/clib/core/util/spio_iosys_utils.cpp | Implements iosystem utility helper. |
| src/clib/core/util/pio_lists.cpp | Stores iodescs in the global list as std::shared_ptr and adds shared_ptr lookup API. |
| src/clib/core/util/CMakeLists.txt | Adds new util compilation unit. |
| src/clib/core/spio_iodesc_utils.cpp | Adds new iodesc utilities/implementation (region alloc + io_desc_t ctor/dtor + PIOc_freedecomp_impl). |
| src/clib/core/rearr/pio_rearrange.cpp | Tightens/adjusts input assertions for ndims/map handling. |
| src/clib/core/pioc.cpp | Reworks initdecomp() to create/store iodesc via std::make_shared. |
| src/clib/core/pioc_support.cpp | Removes legacy malloc_iodesc and related iodesc/region free routines; initializes file->io_desc_refs on open/create. |
| src/clib/core/pio_file.cpp | Adds per-file iodesc ref cache add/get helpers guarded by the file mutex. |
| src/clib/core/pio_darray.cpp | Caches iodesc refs per file on write; uses shared_ptr in async-HDF5 write enqueue. |
| src/clib/core/iolib/hdf5/spio_async_hdf5_utils.hpp | Updates async-HDF5 enqueue API to take std::shared_ptr<io_desc_t>. |
| src/clib/core/iolib/hdf5/spio_async_hdf5_utils.cpp | Stores iodesc as shared_ptr in write cache and cleans up allocation to new/delete. |
| src/clib/core/CMakeLists.txt | Adds new core compilation unit. |
Suppressed comments (1)
src/clib/core/pio_file.cpp:518
- When an iodesc ref is found, this function only erases the entry for varids[0] before returning. Any other varid->ioid entries remain, keeping the iodesc alive unnecessarily and preventing PIO_freedecomp from actually releasing the decomposition until file close.
if(iter != siter->second.end()){
assert(iter->second->ioid == ioid);
/* The caller now has ownership of this iodesc */
std::shared_ptr<io_desc_t> sp = iter->second;
siter->second.erase(iter);
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+172
to
+175
| std::shared_ptr<io_desc_t> sp_iodesc = nullptr; | ||
| /* First try to get cached iodesc. */ | ||
| sp_iodesc = spio_get_iodesc_ref_from_file(file, std::vector<int>{varids, varids+nvars}, ioid); | ||
| if(!sp_iodesc){ |
Contributor
Author
There was a problem hiding this comment.
Fixed and rebased branch
Comment on lines
+39
to
+43
| if (!(region->start = (PIO_Offset *) calloc(ndims, sizeof(PIO_Offset)))) | ||
| { | ||
| return pio_err(ios, NULL, PIO_ENOMEM, __FILE__, __LINE__, | ||
| "Internal error while allocating region. Out of memory allocating %lld bytes for start array in the I/O region", (unsigned long long) (ndims * sizeof(PIO_Offset))); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Fixed and rebased branch
Comment on lines
+490
to
+494
| /* Don't add duplicates, just one ref per variable to iodesc used by file. | ||
| * Note: A variable could however have multiple iodescs associated with it | ||
| */ | ||
| std::shared_ptr<io_desc_t> iodesc = pio_get_iodesc_sptr_from_id(ioid); | ||
| (*(file->io_desc_refs))[varid][ioid] = iodesc; |
Contributor
Author
There was a problem hiding this comment.
Fixed and rebased branch
Instead of caching the I/O decomp once per file, now caching the decomp per variable per file. This change supports multiple variables using the same I/O decomposition but written out separately (g.g. 3D and 4D vars using the same I/O decomposition)
Adding a simple util function to check if I/O system is using asynchronous I/O as a service
When writes are offloaded to async I/O procs the I/O desc is not cached in the I/O procs (since PIOc_write_darray() is not offloaded). So when async I/O (as a service) is used directly get the iodesc from ioid (instead of trying to use a cached iodesc)
jayeshkrishna
force-pushed
the
jayeshkrishna/track_iodesc_via_sptr
branch
from
July 31, 2026 16:28
673f8b9 to
3236839
Compare
Although not common a variable can use multiple I/O decomps. So add support for multiple I/O descs per variable when tracking I/O desc usage via a shared ptr. Instead of caching a single shared ptr to an I/O desc per variable we now cache multiple I/O descs (shared pointers to) per variable
Instead of handling the special case of async I/O service (where I/O desc is not cached), always fall back to querying the I/O desc from the global list when its not cached. Some unit tests call the PIOc_write_darray_multi() function directly (instead of calling PIOc_write_darray() where the I/O desc is cached), so to handle these unit tests (and async I/O service case) always fall back to looking for the I/O desc in the global list when looking for cached I/O desc fails
Code reformatting alloc_region() func No change in source code (apart from formatting)
Allocate memory for start/count arrays iff ndims > 0 (Avoid callocing 0 byte arrays)
jayeshkrishna
force-pushed
the
jayeshkrishna/track_iodesc_via_sptr
branch
from
July 31, 2026 16:41
0aa454b to
94e9f66
Compare
jayeshkrishna
marked this pull request as ready for review
July 31, 2026 19:34
This file contains hidden or 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
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.
Using a shared pointer to track I/O decomposition
usage.
This avoids the unnecessary syncs required, to flush
data, when freeing I/O decompositions