Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-26 15:33:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[all] cleanup use of atomic locking and switch to C11 stdatomic

Browse Source
This commit is contained in:
Geoffrey McRae 2020-01-29 19:06:09 +11:00
parent cc2c49644d
commit 939bb07603
4 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-140-g4c185799f6+1
B1-140-gcc2c49644d+1

6
c-host/platform/Windows/capture/DXGI/src/dxgi.c
View File

@ -61,7 +61,7 @@ struct iface
IDXGIOutput * output;
ID3D11Device * device;
ID3D11DeviceContext * deviceContext;
volatile int deviceContextLock;
LG_Lock deviceContextLock;
bool useAcquireLock;
D3D_FEATURE_LEVEL featureLevel;
IDXGIOutputDuplication * dup;
@ -335,7 +335,8 @@ static bool dxgi_init()
&this->device,
&this->featureLevel,
&this->deviceContext);
this->deviceContextLock = 0;
LG_LOCK_INIT(this->deviceContextLock);
IDXGIAdapter_Release(tmp);
@ -588,6 +589,7 @@ static bool dxgi_deinit()
}
}
LG_LOCK_FREE(this->deviceContextLock);
this->initialized = false;
return true;
}

1
client/spice/src/spice.c
View File

@ -27,7 +27,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdatomic.h>
#include <sys/types.h>
#include <sys/socket.h>

34
common/include/common/locking.h
View File

@ -20,27 +20,21 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "time.h"
#define INTERLOCKED_AND8 __sync_fetch_and_and
#define INTERLOCKED_OR8 __sync_fetch_and_or
#define INTERLOCKED_INC(x) __sync_fetch_and_add((x), 1)
#define INTERLOCKED_DEC(x) __sync_fetch_and_sub((x), 1)
#define INTERLOCKED_GET(x) __sync_fetch_and_add((x), 0)
#define INTERLOCKED_CE(x, c, v) __sync_val_compare_and_swap((x), (c), (v))
#include <stdatomic.h>
#define INTERLOCKED_ENTER(lock) \
while(__sync_lock_test_and_set(&(lock), 1)) while((lock));
#define LG_LOCK_MODE "Atomic"
typedef atomic_flag LG_Lock;
#define LG_LOCK_INIT(x) atomic_flag_clear(&(x))
#define LG_LOCK(x) \
while(atomic_flag_test_and_set_explicit(&(x), memory_order_acquire)) { ; }
#define LG_UNLOCK(x) \
atomic_flag_clear_explicit(&(x), memory_order_release);
#define LG_LOCK_FREE(x)
#define INTERLOCKED_EXIT(lock) \
__sync_lock_release(&(lock));
#define INTERLOCKED_INC(x) atomic_fetch_add((x), 1)
#define INTERLOCKED_DEC(x) atomic_fetch_sub((x), 1)
#define INTERLOCKED_SECTION(lock, x) \
while(__sync_lock_test_and_set(&(lock), 1)) while((lock)); \
x\
__sync_lock_release(&(lock));
#define LG_LOCK_MODE "Atomic"
typedef volatile int LG_Lock;
#define LG_LOCK_INIT(x) (x) = 0
#define LG_LOCK(x) while(__sync_lock_test_and_set(&(x), 1)) {nsleep(100);}
#define LG_UNLOCK(x) __sync_lock_release(&x)
#define LG_LOCK_FREE(x)
LG_LOCK(lock) \
x \
LG_UNLOCK(lock)