gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:JohnSully/KeyDB into unstable

Browse Source 
Former-commit-id: 4056037cc220dc9216d8e8c24d1cf3fe41e0dae6
This commit is contained in:
Richard Silver 2019-03-21 16:19:45 -07:00
commit 9971f2247e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/hiredis/sds.h vendored
View File

@ -83,7 +83,7 @@ struct __attribute__ ((__packed__)) sdshdr64 {
#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)))) #define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS) #define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
inline size_t sdslen(const sds s) { static inline size_t sdslen(const sds s) {
unsigned char flags = s[-1]; unsigned char flags = s[-1];
switch(__builtin_expect((flags&SDS_TYPE_MASK), SDS_TYPE_5)) { switch(__builtin_expect((flags&SDS_TYPE_MASK), SDS_TYPE_5)) {

4
src/fastlock.cpp
View File

@ -113,7 +113,7 @@ extern "C" int fastlock_trylock(struct fastlock *lock)
struct ticket ticket_expect { active, active }; struct ticket ticket_expect { active, active };
struct ticket ticket_setiflocked { active, next }; struct ticket ticket_setiflocked { active, next };
if (__atomic_compare_exchange(&lock->m_ticket, &ticket_expect, &ticket_setiflocked, true /*strong*/, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE)) if (__atomic_compare_exchange(&lock->m_ticket, &ticket_expect, &ticket_setiflocked, false /*weak*/, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE))
{ {
lock->m_depth = 1; lock->m_depth = 1;
__atomic_store_4(&lock->m_pidOwner, gettid(), __ATOMIC_RELEASE); __atomic_store_4(&lock->m_pidOwner, gettid(), __ATOMIC_RELEASE);
@ -147,4 +147,4 @@ extern "C" void fastlock_free(struct fastlock *lock)
bool fastlock::fOwnLock() bool fastlock::fOwnLock()
{ {
return gettid() == m_pidOwner; return gettid() == m_pidOwner;
} }