RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fifo: Make writes atomic. 

Prior to this a X bytes write could be seen as less than X bytes being
available if the check was done at an unfortunate moment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-23 00:18:36 +01:00
parent dd1fb65287
commit 9eb0d8bab1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavutil/fifo.c
View File

@ -83,22 +83,27 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size)
int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
{
int total = size;
uint32_t wndx= f->wndx;
uint8_t *wptr= f->wptr;
do {
int len = FFMIN(f->end - f->wptr, size);
int len = FFMIN(f->end - wptr, size);
if (func) {
if (func(src, f->wptr, len) <= 0)
if (func(src, wptr, len) <= 0)
break;
} else {
memcpy(f->wptr, src, len);
memcpy(wptr, src, len);
src = (uint8_t*)src + len;
}
// Write memory barrier needed for SMP here in theory
f->wptr += len;
if (f->wptr >= f->end)
f->wptr = f->buffer;
f->wndx += len;
wptr += len;
if (wptr >= f->end)
wptr = f->buffer;
wndx += len;
size -= len;
} while (size > 0);
f->wndx= wndx;
f->wptr= wptr;
return total - size;
}