diff --git a/deps/hiredis/sds.h b/deps/hiredis/sds.h index 404f246c4..6b46297c2 100644 --- a/deps/hiredis/sds.h +++ b/deps/hiredis/sds.h @@ -83,7 +83,7 @@ struct __attribute__ ((__packed__)) sdshdr64 { #define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)))) #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]; switch(__builtin_expect((flags&SDS_TYPE_MASK), SDS_TYPE_5)) { diff --git a/src/fastlock.cpp b/src/fastlock.cpp index 1a8d51165..dcbcff688 100644 --- a/src/fastlock.cpp +++ b/src/fastlock.cpp @@ -113,7 +113,7 @@ extern "C" int fastlock_trylock(struct fastlock *lock) struct ticket ticket_expect { active, active }; 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; __atomic_store_4(&lock->m_pidOwner, gettid(), __ATOMIC_RELEASE); @@ -147,4 +147,4 @@ extern "C" void fastlock_free(struct fastlock *lock) bool fastlock::fOwnLock() { return gettid() == m_pidOwner; -} \ No newline at end of file +}