6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Corrects end_data thread safety; permits caller not to have reached new_modals before a machine starts trying to push data.

Browse Source
This commit is contained in:
Thomas Harte
2020-11-25 23:32:37 -05:00
parent eec27c3406
commit c6c12209e8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Outputs/ScanTargets/BufferingScanTarget.cpp
View File

@@ -38,8 +38,8 @@ uint8_t *BufferingScanTarget::begin_data(size_t required_length, size_t required
// If allocation has already failed on this line, continue the trend. // If allocation has already failed on this line, continue the trend.
if(allocation_has_failed_) return nullptr; if(allocation_has_failed_) return nullptr;
// If there isn't yet a write area then mark allocation as failed and finish. // If there isn't yet a write area or data size then mark allocation as failed and finish.
if(!write_area_) { if(!write_area_ || !data_type_size_) {
allocation_has_failed_ = true; allocation_has_failed_ = true;
return nullptr; return nullptr;
} }
@@ -90,9 +90,6 @@ uint8_t *BufferingScanTarget::begin_data(size_t required_length, size_t required
} }
template <typename DataUnit> void BufferingScanTarget::end_data(size_t actual_length) { template <typename DataUnit> void BufferingScanTarget::end_data(size_t actual_length) {
// Acquire the producer lock.
std::lock_guard lock_guard(producer_mutex_);
// Do nothing if no data write is actually ongoing. // Do nothing if no data write is actually ongoing.
if(!data_is_allocated_) return; if(!data_is_allocated_) return;
data_is_allocated_ = false; data_is_allocated_ = false;
@@ -115,9 +112,15 @@ template <typename DataUnit> void BufferingScanTarget::end_data(size_t actual_le
} }
void BufferingScanTarget::end_data(size_t actual_length) { void BufferingScanTarget::end_data(size_t actual_length) {
// Acquire the producer lock.
std::lock_guard lock_guard(producer_mutex_);
// Just dispatch appropriately. // Just dispatch appropriately.
switch(data_type_size_) { switch(data_type_size_) {
default: break; default: assert(false);
case 0:
// This just means that modals haven't been grabbed yet.
break;
case 1: end_data<uint8_t>(actual_length); break; case 1: end_data<uint8_t>(actual_length); break;
case 2: end_data<uint16_t>(actual_length); break; case 2: end_data<uint16_t>(actual_length); break;
case 4: end_data<uint32_t>(actual_length); break; case 4: end_data<uint32_t>(actual_length); break;
@@ -379,6 +382,7 @@ const Outputs::Display::ScanTarget::Modals *BufferingScanTarget::new_modals() {
// But either way it's now appropriate to start treating the data size as implied by the data type. // But either way it's now appropriate to start treating the data size as implied by the data type.
std::lock_guard lock_guard(producer_mutex_); std::lock_guard lock_guard(producer_mutex_);
data_type_size_ = Outputs::Display::size_for_data_type(modals_.input_data_type); data_type_size_ = Outputs::Display::size_for_data_type(modals_.input_data_type);
assert((data_type_size_ == 1) || (data_type_size_ == 2) || (data_type_size_ == 4));
return &modals_; return &modals_;
} }