Cygwin: FIFO: support opening multiple readers
Although we can have multiple readers open because of dup/fork/exec, the current code does not support multiple readers opening a FIFO by explicitly calling 'open'. The main complication in supporting this is that when a blocking reader tries to open and there's already one open, it has to check whether there any writers open. It can't rely on the write_ready event, whose state hasn't changed since the first writer opened. To fix this, add two new named events, check_write_ready_evt and write_ready_ok_evt, and a new method, check_write_ready(). The first event signals the owner's reader thread to call check_write_ready(), which polls the fc_handler list to check for connected writers. If it finds none, it checks to see if there's a writer in the process and then sets/resets write_ready appropriately. When check_write_ready() finishes it sets write_ready_ok_evt to signal the reader that write_ready has been updated. The polling is done via fifo_client_handler::pipe_state(). As long as it's calling that function anyway, check_write_ready() updates the state of each handler. Also add a new lock to prevent a race if two readers are trying to open simultaneously.
This commit is contained in:
@@ -1324,7 +1324,7 @@ class fifo_shmem_t
|
||||
{
|
||||
LONG _nreaders;
|
||||
fifo_reader_id_t _owner, _prev_owner, _pending_owner;
|
||||
af_unix_spinlock_t _owner_lock, _reading_lock;
|
||||
af_unix_spinlock_t _owner_lock, _reading_lock, _reader_opening_lock;
|
||||
|
||||
/* Info about shared memory block used for temporary storage of the
|
||||
owner's fc_handler list. */
|
||||
@@ -1346,6 +1346,8 @@ public:
|
||||
void owner_unlock () { _owner_lock.unlock (); }
|
||||
void reading_lock () { _reading_lock.lock (); }
|
||||
void reading_unlock () { _reading_lock.unlock (); }
|
||||
void reader_opening_lock () { _reader_opening_lock.lock (); }
|
||||
void reader_opening_unlock () { _reader_opening_lock.unlock (); }
|
||||
|
||||
int get_shared_nhandlers () const { return (int) _sh_nhandlers; }
|
||||
void set_shared_nhandlers (int n) { InterlockedExchange (&_sh_nhandlers, n); }
|
||||
@@ -1371,6 +1373,8 @@ class fhandler_fifo: public fhandler_base
|
||||
HANDLE owner_needed_evt; /* The owner is closing. */
|
||||
HANDLE owner_found_evt; /* A new owner has taken over. */
|
||||
HANDLE update_needed_evt; /* shared_fc_handler needs updating. */
|
||||
HANDLE check_write_ready_evt; /* write_ready needs to be checked. */
|
||||
HANDLE write_ready_ok_evt; /* check_write_ready is done. */
|
||||
|
||||
/* Handles to non-shared events needed for fifo_reader_threads. */
|
||||
HANDLE cancel_evt; /* Signal thread to terminate. */
|
||||
@@ -1448,6 +1452,9 @@ class fhandler_fifo: public fhandler_base
|
||||
{ return shmem->shared_fc_handler_updated (); }
|
||||
void shared_fc_handler_updated (bool val)
|
||||
{ shmem->shared_fc_handler_updated (val); }
|
||||
void check_write_ready ();
|
||||
void reader_opening_lock () { shmem->reader_opening_lock (); }
|
||||
void reader_opening_unlock () { shmem->reader_opening_unlock (); }
|
||||
|
||||
public:
|
||||
fhandler_fifo ();
|
||||
|
Reference in New Issue
Block a user