-
Notifications
You must be signed in to change notification settings - Fork 88
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
Use 64-bit rownrs in Dysco #1166
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,21 +105,20 @@ void ThreadedDyscoColumn<DataType>::loadBlock(size_t blockIndex) { | |
|
||
template <typename DataType> | ||
void ThreadedDyscoColumn<DataType>::getValues( | ||
casacore::uInt rowNr, casacore::Array<DataType> *dataPtr) { | ||
casacore::rownr_t rowNr, casacore::Array<DataType> *dataArr) { | ||
// Make sure array storage is contiguous. | ||
casacore::Bool deleteIt; | ||
DataType* dataPtr = dataArr->getStorage (deleteIt); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sometime in the future, it would be better to do this using a RAII structure. There are all kind of exceptions possible in the code below, which would lead to leaks. Not really directly a concern now, so no changes required, but maybe for a future MR. |
||
if (!areOffsetsInitialized()) { | ||
// Trying to read before first block was written -- return zero | ||
// TODO if a few rows were written of the first block, those are | ||
// incorrectly returned. This is a rare case but can be fixed. | ||
for (typename casacore::Array<DataType>::contiter i = dataPtr->cbegin(); | ||
i != dataPtr->cend(); ++i) | ||
*i = DataType(); | ||
*dataPtr = DataType(); | ||
} else { | ||
size_t blockIndex = getBlockIndex(rowNr); | ||
if (blockIndex >= nBlocksInFile()) { | ||
// Trying to read a row that was not stored yet -- return zero | ||
for (typename casacore::Array<DataType>::contiter i = dataPtr->cbegin(); | ||
i != dataPtr->cend(); ++i) | ||
*i = DataType(); | ||
*dataPtr = DataType(); | ||
} else { | ||
std::unique_lock<std::mutex> lock(_mutex); | ||
// Wait until the block to be read is not in the write cache | ||
|
@@ -137,9 +136,10 @@ void ThreadedDyscoColumn<DataType>::getValues( | |
|
||
// The time block encoder is now initialized and contains the unpacked | ||
// block. | ||
_timeBlockBuffer->GetData(getRowWithinBlock(rowNr), dataPtr->data()); | ||
_timeBlockBuffer->GetData(getRowWithinBlock(rowNr), dataPtr); | ||
} | ||
} | ||
dataArr->putStorage (dataPtr, deleteIt); | ||
} | ||
|
||
template <typename DataType> | ||
|
@@ -168,7 +168,10 @@ void ThreadedDyscoColumn<DataType>::storeBlock() { | |
|
||
template <typename DataType> | ||
void ThreadedDyscoColumn<DataType>::putValues( | ||
casacore::uInt rowNr, const casacore::Array<DataType> *dataPtr) { | ||
casacore::rownr_t rowNr, const casacore::Array<DataType> *dataArr) { | ||
// Make sure array storage is contiguous. | ||
casacore::Bool deleteIt; | ||
const DataType* dataPtr = dataArr->getStorage (deleteIt); | ||
if (!areOffsetsInitialized()) { | ||
// If the manager did not initialize its offsets yet, then it is determined | ||
// from the first "time block" (a block with the same time, field and spw) | ||
|
@@ -207,11 +210,12 @@ void ThreadedDyscoColumn<DataType>::putValues( | |
// Load new block | ||
loadBlock(blockIndex); | ||
} | ||
_timeBlockBuffer->SetData(blockRow, ant1, ant2, dataPtr->data()); | ||
_timeBlockBuffer->SetData(blockRow, ant1, ant2, dataPtr); | ||
} else { | ||
_timeBlockBuffer->SetData(rowNr, ant1, ant2, dataPtr->data()); | ||
_timeBlockBuffer->SetData(rowNr, ant1, ant2, dataPtr); | ||
} | ||
_isCurrentBlockChanged = true; | ||
dataArr->freeStorage (dataPtr, deleteIt); | ||
} | ||
|
||
template <typename DataType> | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be possible to start using just
bool
for new code?