Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-05-17 12:01:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[common] added a sleep to the framebuffer spinlock and a sane timeout

Browse Source
This commit is contained in:
Geoffrey McRae 2020-08-10 16:18:08 +10:00
parent 82e0b7b6ab
commit 90d0cd873d
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B2-rc2-33-g2e1b0f2550+1 B2-rc3-0-g82e0b7b6ab+1

27
common/src/framebuffer.c
View File

@ -24,8 +24,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdatomic.h> #include <stdatomic.h>
#include <emmintrin.h> #include <emmintrin.h>
#include <smmintrin.h> #include <smmintrin.h>
#include <unistd.h>
#define FB_CHUNK_SIZE 1048576 #define FB_CHUNK_SIZE 1048576 // 1MB
#define FB_SPIN_LIMIT 10000 // 10ms
struct stFrameBuffer struct stFrameBuffer
{ {
@ -40,7 +42,6 @@ void framebuffer_wait(const FrameBuffer * frame, size_t size)
while(atomic_load_explicit(&frame->wp, memory_order_acquire) != size) {} while(atomic_load_explicit(&frame->wp, memory_order_acquire) != size) {}
} }
bool framebuffer_read(const FrameBuffer * frame, void * restrict dst, bool framebuffer_read(const FrameBuffer * frame, void * restrict dst,
size_t dstpitch, size_t height, size_t width, size_t bpp, size_t pitch) size_t dstpitch, size_t height, size_t width, size_t bpp, size_t pitch)
{ {
@ -54,11 +55,18 @@ bool framebuffer_read(const FrameBuffer * frame, void * restrict dst,
while(y < height) while(y < height)
{ {
uint_least32_t wp; uint_least32_t wp;
int spinCount = 0;
/* spinlock */ /* spinlock */
do
wp = atomic_load_explicit(&frame->wp, memory_order_acquire); wp = atomic_load_explicit(&frame->wp, memory_order_acquire);
while(wp - rp < pitch); while(wp - rp < linewidth)
{
if (++spinCount == FB_SPIN_LIMIT)
return false;
usleep(1);
wp = atomic_load_explicit(&frame->wp, memory_order_acquire);
}
_mm_mfence(); _mm_mfence();
__m128i * restrict s = (__m128i *)(frame->data + rp); __m128i * restrict s = (__m128i *)(frame->data + rp);
@ -104,11 +112,18 @@ bool framebuffer_read_fn(const FrameBuffer * frame, size_t height, size_t width,
while(y < height) while(y < height)
{ {
uint_least32_t wp; uint_least32_t wp;
int spinCount = 0;
/* spinlock */ /* spinlock */
do
wp = atomic_load_explicit(&frame->wp, memory_order_acquire); wp = atomic_load_explicit(&frame->wp, memory_order_acquire);
while(wp - rp < pitch); while(wp - rp < linewidth)
{
if (++spinCount == FB_SPIN_LIMIT)
return false;
usleep(1);
wp = atomic_load_explicit(&frame->wp, memory_order_acquire);
}
if (!fn(opaque, frame->data + rp, linewidth)) if (!fn(opaque, frame->data + rp, linewidth))
return false; return false;