ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: fix race in generic block driver component 

Fixes #1023
This commit is contained in:
Stefan Kalkowski 2014-01-08 15:05:01 +01:00 committed by Norman Feske
parent 65291902e0
commit 23ce0b2071
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/include/block/component.h
View File

@ -39,6 +39,7 @@ class Block::Session_component : public Block::Session_rpc_object
Signal_dispatcher<Session_component> _sink_ack;
Signal_dispatcher<Session_component> _sink_submit;
bool _req_queue_full;
bool _ack_queue_full;
Packet_descriptor _p_to_handle;
unsigned _p_in_fly;
@ -124,9 +125,11 @@ class Block::Session_component : public Block::Session_rpc_object
* them, and the driver's request queue isn't full,
* direct the packet request to the driver backend
*/
for (; !_req_queue_full && tx_sink()->packet_avail() &&
!(_p_in_fly >= tx_sink()->ack_slots_free()); _p_in_fly++)
_handle_packet(tx_sink()->get_packet());
for (_ack_queue_full = (_p_in_fly >= tx_sink()->ack_slots_free());
!_req_queue_full && !_ack_queue_full
&& tx_sink()->packet_avail();
_ack_queue_full = (++_p_in_fly >= tx_sink()->ack_slots_free()))
_handle_packet(tx_sink()->get_packet());
}
/**
@ -176,12 +179,10 @@ class Block::Session_component : public Block::Session_rpc_object
*/
void ack_packet(Packet_descriptor &packet, bool success = true)
{
bool ack_queue_full = _p_in_fly >= tx_sink()->ack_slots_free();
packet.succeeded(success);
_ack_packet(packet);
if (!_req_queue_full && !ack_queue_full)
if (!_req_queue_full && !_ack_queue_full)
return;
/*