RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

util\serialization_ext.cpp: Fixup

Browse Source
This commit is contained in:
Eladash 2024-03-27 15:34:14 +02:00 committed by Elad Ashkenazi
parent 7468d96c51
commit 787e79c687
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/savestate_utils.hpp
View File

@ -21,7 +21,7 @@ struct hle_locks_t
finalized = -2, finalized = -2,
}; };
void lock(); [[noreturn]] void lock();
bool try_lock(); bool try_lock();
void unlock(); void unlock();
bool try_finalize(std::function<bool()> test); bool try_finalize(std::function<bool()> test);

20
rpcs3/util/serialization_ext.cpp
View File

@ -619,11 +619,6 @@ void compressed_serialization_file_handler::stream_data_prepare_thread_op()
if (data.empty()) if (data.empty())
{ {
// Abort is requested, flush data and exit // Abort is requested, flush data and exit
if (!m_stream_data.empty())
{
stream.m_queued_data_to_write.push(std::move(m_stream_data));
}
stream.m_queued_data_to_write.push(std::vector<u8>()); stream.m_queued_data_to_write.push(std::vector<u8>());
return; return;
} }
@ -665,11 +660,6 @@ void compressed_serialization_file_handler::stream_data_prepare_thread_op()
return; return;
} }
if (!buffer_offset)
{
continue;
}
// Forward for file write // Forward for file write
const usz queued_size = data.size(); const usz queued_size = data.size();
@ -686,6 +676,16 @@ void compressed_serialization_file_handler::stream_data_prepare_thread_op()
// Ensure wait bit state has not changed by the update // Ensure wait bit state has not changed by the update
ensure(~((new_val - size_diff) ^ new_val) & pending_data_wait_bit); ensure(~((new_val - size_diff) ^ new_val) & pending_data_wait_bit);
if (!buffer_offset)
{
if (m_pending_signal)
{
m_pending_bytes.notify_all();
}
continue;
}
m_stream_data.resize(buffer_offset); m_stream_data.resize(buffer_offset);
stream.m_queued_data_to_write.push(std::move(m_stream_data)); stream.m_queued_data_to_write.push(std::move(m_stream_data));
} }