(libretro-common) Rename fifo_buffer to fifo_queue

inactive123 · inactive123 · commit ef4a1a3c0fa2 · 2016-03-20T14:06:21.000+01:00
diff --git a/Makefile.common b/Makefile.common
@@ -166,7 +166,7 @@ OBJ += frontend/frontend.o \
        tasks/task_overlay.o \
        input/input_overlay.o \
        patch.o \
-       libretro-common/queues/fifo_buffer.o \
+       libretro-common/queues/fifo_queue.o \
        core_options.o \
        libretro-common/compat/compat_fnmatch.o \
        libretro-common/compat/compat_posix_string.o \
diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 
 #include "audio_thread_wrapper.h"
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
@@ -19,7 +19,7 @@
 #include <alsa/asoundlib.h>
 
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c
@@ -27,7 +27,7 @@
 #include <AudioUnit/AUComponent.h>
 
 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <retro_endianness.h>
 #include <string/stdstring.h>
diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c
@@ -32,7 +32,7 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
diff --git a/audio/drivers/rsound.c b/audio/drivers/rsound.c
@@ -17,7 +17,7 @@
 
 #include <boolean.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
diff --git a/audio/drivers/rsound.h b/audio/drivers/rsound.h
@@ -32,7 +32,7 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #ifdef _WIN32
 #define RSD_DEFAULT_HOST "127.0.0.1" /* Stupid Windows. */
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
@@ -23,7 +23,7 @@
 
 #include <boolean.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <retro_inline.h>
 
 #include "../audio_driver.h"
diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 #include "libretro.h"
 #ifdef RARCH_INTERNAL
diff --git a/griffin/griffin.c b/griffin/griffin.c
@@ -479,7 +479,7 @@ STATE TRACKER
 /*============================================================
 FIFO BUFFER
 ============================================================ */
-#include "../libretro-common/queues/fifo_buffer.c"
+#include "../libretro-common/queues/fifo_queue.c"
 
 /*============================================================
 AUDIO RESAMPLER
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
@@ -20,7 +20,7 @@
 
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <string/stdstring.h>
 
 #include "../connect/joypad_connection.h"
diff --git a/libretro-common/include/queues/fifo_queue.h b/libretro-common/include/queues/fifo_queue.h
diff --git a/libretro-common/queues/fifo_queue.c b/libretro-common/queues/fifo_queue.c
@@ -23,12 +23,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 
 struct fifo_buffer
 {
    uint8_t *buffer;
-   size_t bufsize;
+   size_t size;
    size_t first;
    size_t end;
 };
@@ -46,7 +46,7 @@ fifo_buffer_t *fifo_new(size_t size)
       free(buf);
       return NULL;
    }
-   buf->bufsize = size + 1;
+   buf->size = size + 1;
 
    return buf;
 }
@@ -72,7 +72,7 @@ size_t fifo_read_avail(fifo_buffer_t *buffer)
    size_t end   = buffer->end;
 
    if (end < first)
-      end += buffer->bufsize;
+      end += buffer->size;
    return end - first;
 }
 
@@ -82,26 +82,26 @@ size_t fifo_write_avail(fifo_buffer_t *buffer)
    size_t end   = buffer->end;
 
    if (end < first)
-      end += buffer->bufsize;
+      end += buffer->size;
 
-   return (buffer->bufsize - 1) - (end - first);
+   return (buffer->size - 1) - (end - first);
 }
 
 void fifo_write(fifo_buffer_t *buffer, const void *in_buf, size_t size)
 {
    size_t first_write = size;
    size_t rest_write  = 0;
 
-   if (buffer->end + size > buffer->bufsize)
+   if (buffer->end + size > buffer->size)
    {
-      first_write = buffer->bufsize - buffer->end;
+      first_write = buffer->size - buffer->end;
       rest_write = size - first_write;
    }
 
    memcpy(buffer->buffer + buffer->end, in_buf, first_write);
    memcpy(buffer->buffer, (const uint8_t*)in_buf + first_write, rest_write);
 
-   buffer->end = (buffer->end + size) % buffer->bufsize;
+   buffer->end = (buffer->end + size) % buffer->size;
 }
 
 
@@ -110,15 +110,15 @@ void fifo_read(fifo_buffer_t *buffer, void *in_buf, size_t size)
    size_t first_read = size;
    size_t rest_read  = 0;
 
-   if (buffer->first + size > buffer->bufsize)
+   if (buffer->first + size > buffer->size)
    {
-      first_read = buffer->bufsize - buffer->first;
+      first_read = buffer->size - buffer->first;
       rest_read = size - first_read;
    }
 
    memcpy(in_buf, (const uint8_t*)buffer->buffer + buffer->first, first_read);
    memcpy((uint8_t*)in_buf + first_read, buffer->buffer, rest_read);
 
-   buffer->first = (buffer->first + size) % buffer->bufsize;
+   buffer->first = (buffer->first + size) % buffer->size;
 }
 
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
@@ -54,7 +54,7 @@ extern "C" {
 #include <compat/msvc.h>
 
 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <gfx/scaler/scaler.h>
 #include <file/config_file.h>

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@`
`23`	`23`	`#include <stdlib.h>`
`24`	`24`	`#include <string.h>`
`25`	`25`
`26`		`-#include <queues/fifo_buffer.h>`
	`26`	`+#include <queues/fifo_queue.h>`
`27`	`27`
`28`	`28`	`struct fifo_buffer`
`29`	`29`	`{`
`30`	`30`	`uint8_t *buffer;`
`31`		`- size_t bufsize;`
	`31`	`+ size_t size;`
`32`	`32`	`size_t first;`
`33`	`33`	`size_t end;`
`34`	`34`	`};`
`@@ -46,7 +46,7 @@ fifo_buffer_t *fifo_new(size_t size)`
`46`	`46`	`free(buf);`
`47`	`47`	`return NULL;`
`48`	`48`	`}`
`49`		`- buf->bufsize = size + 1;`
	`49`	`+ buf->size = size + 1;`
`50`	`50`
`51`	`51`	`return buf;`
`52`	`52`	`}`
`@@ -72,7 +72,7 @@ size_t fifo_read_avail(fifo_buffer_t *buffer)`
`72`	`72`	`size_t end = buffer->end;`
`73`	`73`
`74`	`74`	`if (end < first)`
`75`		`- end += buffer->bufsize;`
	`75`	`+ end += buffer->size;`
`76`	`76`	`return end - first;`
`77`	`77`	`}`
`78`	`78`
`@@ -82,26 +82,26 @@ size_t fifo_write_avail(fifo_buffer_t *buffer)`
`82`	`82`	`size_t end = buffer->end;`
`83`	`83`
`84`	`84`	`if (end < first)`
`85`		`- end += buffer->bufsize;`
	`85`	`+ end += buffer->size;`
`86`	`86`
`87`		`- return (buffer->bufsize - 1) - (end - first);`
	`87`	`+ return (buffer->size - 1) - (end - first);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void fifo_write(fifo_buffer_t buffer, const void in_buf, size_t size)`
`91`	`91`	`{`
`92`	`92`	`size_t first_write = size;`
`93`	`93`	`size_t rest_write = 0;`
`94`	`94`
`95`		`- if (buffer->end + size > buffer->bufsize)`
	`95`	`+ if (buffer->end + size > buffer->size)`
`96`	`96`	`{`
`97`		`- first_write = buffer->bufsize - buffer->end;`
	`97`	`+ first_write = buffer->size - buffer->end;`
`98`	`98`	`rest_write = size - first_write;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`memcpy(buffer->buffer + buffer->end, in_buf, first_write);`
`102`	`102`	`memcpy(buffer->buffer, (const uint8_t*)in_buf + first_write, rest_write);`
`103`	`103`
`104`		`- buffer->end = (buffer->end + size) % buffer->bufsize;`
	`104`	`+ buffer->end = (buffer->end + size) % buffer->size;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`
`@@ -110,15 +110,15 @@ void fifo_read(fifo_buffer_t buffer, void in_buf, size_t size)`
`110`	`110`	`size_t first_read = size;`
`111`	`111`	`size_t rest_read = 0;`
`112`	`112`
`113`		`- if (buffer->first + size > buffer->bufsize)`
	`113`	`+ if (buffer->first + size > buffer->size)`
`114`	`114`	`{`
`115`		`- first_read = buffer->bufsize - buffer->first;`
	`115`	`+ first_read = buffer->size - buffer->first;`
`116`	`116`	`rest_read = size - first_read;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`memcpy(in_buf, (const uint8_t*)buffer->buffer + buffer->first, first_read);`
`120`	`120`	`memcpy((uint8_t*)in_buf + first_read, buffer->buffer, rest_read);`
`121`	`121`
`122`		`- buffer->first = (buffer->first + size) % buffer->bufsize;`
	`122`	`+ buffer->first = (buffer->first + size) % buffer->size;`
`123`	`123`	`}`
`124`	`124`