ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-30 22:24:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test/fs_packet: don't block

Browse Source 
This patch takes precautions against the use of blocking packet-stream
operations like 'submit_packet'.

With the change of issue #4388, the ready-to-submit signals are no
longer implicitly handled. Hence, a call of submit_packet to a
saturated submit queue blocks infinitely.

Issue #4390
This commit is contained in:
Norman Feske 2022-01-25 13:10:47 +01:00
parent 7e3828b726
commit 64af1d2d84
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
repos/os/src/test/fs_packet/component.cc
View File

@ -59,7 +59,8 @@ struct Fs_packet::Main
if (!(_packet_count % 10)) if (!(_packet_count % 10))
log(_packet_count, " packets remain"); log(_packet_count, " packets remain");
_tx.submit_packet(packet); if (_tx.ready_to_submit())
_tx.submit_packet(packet);
} }
} }
@ -67,17 +68,23 @@ struct Fs_packet::Main
{ {
_fs.sigh(_signal_handler); _fs.sigh(_signal_handler);
/********************** /*
** Stuff the buffer ** * Stuff the packet stream until the submit queue or the bulk buffer is
**********************/ * saturated.
*/
size_t const packet_size = size_t const packet_size =
_tx.bulk_buffer_size() / File_system::Session::TX_QUEUE_SIZE; _tx.bulk_buffer_size() / File_system::Session::TX_QUEUE_SIZE;
for (size_t i = 0; i < _tx.bulk_buffer_size(); i += packet_size) { for (size_t i = 0; i < _tx.bulk_buffer_size(); i += packet_size) {
File_system::Packet_descriptor packet( File_system::Packet_descriptor packet(
_tx.alloc_packet(packet_size), _file_handle, _tx.alloc_packet(packet_size), _file_handle,
File_system::Packet_descriptor::READ, packet_size, 0); File_system::Packet_descriptor::READ, packet_size, 0);
if (!_tx.ready_to_submit())
break;
_tx.submit_packet(packet); _tx.submit_packet(packet);
} }