diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
| commit | 1b197e65232e1a51b853db53985e8eda61f1b196 (patch) | |
| tree | 2d85ff67ba79e32256a20d2d2bee7222352007fd /src/ringbuf.h | |
| parent | 5a0216af3dc7c9dedc4dacb708191f0fd380bb73 (diff) | |
| parent | 508ae1c18d3bdc99a1bb06181762e5ec859cf072 (diff) | |
| download | mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.gz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.xz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.zip | |
Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd
* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
Remove ob_wait_sync and cleanup triggering in playlist
fix output buffer deadlock when daemonizing
log.c: thread-safety for warning log
core rewrite (decode,player,outputBuffer,playlist)
Diffstat (limited to '')
| -rw-r--r-- | src/ringbuf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ringbuf.h b/src/ringbuf.h index d4baffdbd..43ba83a7c 100644 --- a/src/ringbuf.h +++ b/src/ringbuf.h @@ -175,7 +175,8 @@ void ringbuf_reset(struct ringbuf * rb); /** * Reset the write pointer to the read pointer, making an empty buffer. * - * This should only be called by the writer + * This should only be called by the writer and only very carefully + * (it is subject to race conditions with vectors or peek) * * @param rb a pointer to the ringbuffer structure. */ @@ -184,7 +185,8 @@ void ringbuf_writer_reset(struct ringbuf * rb); /** * Reset the read pointer to the write pointer, making an empty buffer. * - * This should only be called by the reader + * This should only be called by the writer and only very carefully + * (it is subject to race conditions with vectors or peek) * * @param rb a pointer to the ringbuffer structure. */ |