diff options
author | Sebastian Dröge <slomo@coaxion.net> | 2019-06-03 10:44:32 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@coaxion.net> | 2019-06-03 10:44:32 +0000 |
commit | 41f68f8b19de60b6793e4e0ff90d75c5ac30211c (patch) | |
tree | 52250800294e85e6417fdcea11dba61e8772748f /glib | |
parent | a4d01fcd4b0474738588c5446398b5e99a836222 (diff) | |
parent | 231661e46c865881aa5bf5da05756622da5baa58 (diff) | |
download | glib-41f68f8b19de60b6793e4e0ff90d75c5ac30211c.tar.gz |
Merge branch '590-rwlock-docs' into 'master'
gthread: Fix g_rw_lock_reader_lock() documentation
Closes #590
See merge request GNOME/glib!882
Diffstat (limited to 'glib')
-rw-r--r-- | glib/gthread-posix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 1e2fdb59a..8b8561639 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c @@ -587,8 +587,10 @@ g_rw_lock_writer_unlock (GRWLock *rw_lock) * @rw_lock: a #GRWLock * * Obtain a read lock on @rw_lock. If another thread currently holds - * the write lock on @rw_lock or blocks waiting for it, the current - * thread will block. Read locks can be taken recursively. + * the write lock on @rw_lock, the current thread will block. If another thread + * does not hold the write lock, but is waiting for it, it is implementation + * defined whether the reader or writer will block. Read locks can be taken + * recursively. * * It is implementation-defined how many threads are allowed to * hold read locks on the same lock simultaneously. If the limit is hit, |