ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 14:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More opt stuff

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-23 12:34:45 -07:00
parent 8e87319925
commit b727e2a67a
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
node/Hashtable.hpp
View File

@ -370,14 +370,14 @@ public:
private: private:
template<typename O> template<typename O>
static inline unsigned long _hc(const O &obj) { return (unsigned long)obj.hashCode(); } static ZT_ALWAYS_INLINE unsigned long _hc(const O &obj) { return (unsigned long)obj.hashCode(); }
static inline unsigned long _hc(const uint64_t i) { return (unsigned long)(i ^ (i >> 32)); } static ZT_ALWAYS_INLINE unsigned long _hc(const uint64_t i) { return (unsigned long)(i ^ (i >> 32)); }
static inline unsigned long _hc(const uint32_t i) { return ((unsigned long)i * (unsigned long)0x9e3779b1); } static ZT_ALWAYS_INLINE unsigned long _hc(const uint32_t i) { return ((unsigned long)i * (unsigned long)0x9e3779b1); }
static inline unsigned long _hc(const uint16_t i) { return ((unsigned long)i * (unsigned long)0x9e3779b1); } static ZT_ALWAYS_INLINE unsigned long _hc(const uint16_t i) { return ((unsigned long)i * (unsigned long)0x9e3779b1); }
static inline unsigned long _hc(const int i) { return ((unsigned long)i * (unsigned long)0x9e3379b1); } static ZT_ALWAYS_INLINE unsigned long _hc(const int i) { return ((unsigned long)i * (unsigned long)0x9e3379b1); }
static inline unsigned long _hc(void *p) { return ((unsigned long)((uintptr_t)p) * (unsigned long)0x9e3779b1); } static ZT_ALWAYS_INLINE unsigned long _hc(void *p) { return ((unsigned long)((uintptr_t)p) * (unsigned long)0x9e3779b1); }
static inline unsigned long _hc(const void *p) { return ((unsigned long)((uintptr_t)p) * (unsigned long)0x9e3779b1); } static ZT_ALWAYS_INLINE unsigned long _hc(const void *p) { return ((unsigned long)((uintptr_t)p) * (unsigned long)0x9e3779b1); }
inline void _grow() inline void _grow()
{ {

26
node/Mutex.hpp
View File

@ -30,13 +30,13 @@ namespace ZeroTier {
class Mutex class Mutex
{ {
public: public:
inline Mutex() : ZT_ALWAYS_INLINE Mutex() :
nextTicket(0), nextTicket(0),
nowServing(0) nowServing(0)
{ {
} }
inline void lock() const ZT_ALWAYS_INLINE void lock() const
{ {
const uint16_t myTicket = __sync_fetch_and_add(&(const_cast<Mutex *>(this)->nextTicket),1); const uint16_t myTicket = __sync_fetch_and_add(&(const_cast<Mutex *>(this)->nextTicket),1);
while (nowServing != myTicket) { while (nowServing != myTicket) {
@ -45,7 +45,7 @@ public:
} }
} }
inline void unlock() const { ++(const_cast<Mutex *>(this)->nowServing); } ZT_ALWAYS_INLINE void unlock() const { ++(const_cast<Mutex *>(this)->nowServing); }
/** /**
* Uses C++ contexts and constructor/destructor to lock/unlock automatically * Uses C++ contexts and constructor/destructor to lock/unlock automatically
@ -53,9 +53,9 @@ public:
class Lock class Lock
{ {
public: public:
inline Lock(Mutex &m) : _m(&m) { m.lock(); } ZT_ALWAYS_INLINE Lock(Mutex &m) : _m(&m) { m.lock(); }
inline Lock(const Mutex &m) : _m(const_cast<Mutex *>(&m)) { _m->lock(); } ZT_ALWAYS_INLINE Lock(const Mutex &m) : _m(const_cast<Mutex *>(&m)) { _m->lock(); }
inline ~Lock() { _m->unlock(); } ZT_ALWAYS_INLINE ~Lock() { _m->unlock(); }
private: private:
Mutex *const _m; Mutex *const _m;
}; };
@ -74,22 +74,22 @@ private:
class Mutex class Mutex
{ {
public: public:
inline Mutex() ZT_ALWAYS_INLINE Mutex()
{ {
pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0); pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0);
} }
inline ~Mutex() ZT_ALWAYS_INLINE ~Mutex()
{ {
pthread_mutex_destroy(&_mh); pthread_mutex_destroy(&_mh);
} }
inline void lock() const ZT_ALWAYS_INLINE void lock() const
{ {
pthread_mutex_lock(&((const_cast <Mutex *> (this))->_mh)); pthread_mutex_lock(&((const_cast <Mutex *> (this))->_mh));
} }
inline void unlock() const ZT_ALWAYS_INLINE void unlock() const
{ {
pthread_mutex_unlock(&((const_cast <Mutex *> (this))->_mh)); pthread_mutex_unlock(&((const_cast <Mutex *> (this))->_mh));
} }
@ -97,19 +97,19 @@ public:
class Lock class Lock
{ {
public: public:
inline Lock(Mutex &m) : ZT_ALWAYS_INLINE Lock(Mutex &m) :
_m(&m) _m(&m)
{ {
m.lock(); m.lock();
} }
inline Lock(const Mutex &m) : ZT_ALWAYS_INLINE Lock(const Mutex &m) :
_m(const_cast<Mutex *>(&m)) _m(const_cast<Mutex *>(&m))
{ {
_m->lock(); _m->lock();
} }
inline ~Lock() ZT_ALWAYS_INLINE ~Lock()
{ {
_m->unlock(); _m->unlock();
} }