Commit f34cecbf authored by Xavier Thompson's avatar Xavier Thompson

Implement a contention-logging recursive rwlock

parent ea0b8c13
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
class RecursiveUpgradeableRWLock { class RecursiveUpgradeableRWLock {
protected:
pthread_mutex_t guard; pthread_mutex_t guard;
pthread_cond_t wait_readers_depart; pthread_cond_t wait_readers_depart;
pthread_cond_t wait_writer_depart; pthread_cond_t wait_writer_depart;
...@@ -69,6 +70,12 @@ ...@@ -69,6 +70,12 @@
int trywlock(); int trywlock();
}; };
class LogLock : public RecursiveUpgradeableRWLock {
public:
void wlock();
void rlock();
};
struct CyPyObject { struct CyPyObject {
PyObject_HEAD PyObject_HEAD
}; };
...@@ -76,7 +83,7 @@ ...@@ -76,7 +83,7 @@
class CyObject : public CyPyObject { class CyObject : public CyPyObject {
private: private:
CyObject_ATOMIC_REFCOUNT_TYPE nogil_ob_refcnt; CyObject_ATOMIC_REFCOUNT_TYPE nogil_ob_refcnt;
RecursiveUpgradeableRWLock ob_lock; LogLock ob_lock;
public: public:
CyObject(): nogil_ob_refcnt(1) {} CyObject(): nogil_ob_refcnt(1) {}
virtual ~CyObject() {} virtual ~CyObject() {}
...@@ -499,6 +506,129 @@ void RecursiveUpgradeableRWLock::unwlock() { ...@@ -499,6 +506,129 @@ void RecursiveUpgradeableRWLock::unwlock() {
pthread_cond_broadcast(&this->wait_writer_depart); pthread_cond_broadcast(&this->wait_writer_depart);
} }
pthread_mutex_unlock(&this->guard); pthread_mutex_unlock(&this->guard);
CyObject_FETCH_CONTENDERS_SUB_WRITER(this->contenders);
}
void LogLock::rlock() {
pid_t caller_id = syscall(SYS_gettid);
int contenders = CyObject_FETCH_CONTENDERS_ADD_READER(this->contenders);
if (this->owner_id == caller_id) {
++this->readers_nb;
return;
}
pthread_mutex_lock(&this->guard);
if (CyObject_HAS_WRITER_CONTENDERS(contenders)) {
if (this->write_count > 0) {
pid_t lock_owner = this->owner_id;
printf(
"Contention with a writer detected while rlocking lock [%p] in thread #%d:\n"
" - lock was already wlocked by thread %d\n"
"\n"
,this, caller_id, lock_owner
);
}
else {
printf(
"Contention with a writer detected while rlocking lock [%p] in thread #%d:\n"
" - the writer was already gone by the time we could inspect who owned the thread\n"
"\n"
,this, caller_id
);
}
}
while (this->write_count > 0) {
pthread_cond_wait(&this->wait_writer_depart, &this->guard);
}
this->owner_id = this->readers_nb++ ? CyObject_MANY_OWNERS : caller_id;
pthread_mutex_unlock(&this->guard);
}
void LogLock::wlock() {
pid_t caller_id = syscall(SYS_gettid);
uint32_t contenders = CyObject_FETCH_CONTENDERS_ADD_WRITER(this->contenders);
if (this->owner_id == caller_id) {
if (this->write_count) {
++this->write_count;
return;
}
}
pthread_mutex_lock(&this->guard);
if ((CyObject_HAS_WRITER_CONTENDERS(contenders) > 0) && (this->write_count > 0)) {
pid_t lock_owner = this->owner_id;
printf(
"Contention with another writer detected while wlocking lock [%p] in thread #%d:\n"
" - lock owner is thread %d\n"
"\n"
,this, caller_id, lock_owner
);
}
else if (CyObject_READERS_FROM_CONTENDERS(contenders) > 0) {
pid_t lock_owner = this->owner_id;
if (lock_owner > 0) {
printf(
"Contention with a reader thread detected while wlocking lock [%p] in thread #%d:\n"
" - reader thread is %d\n"
"\n"
,this, caller_id, lock_owner
);
}
else if (lock_owner == CyObject_MANY_OWNERS) {
printf(
"Contention with several other reader threads detected while wlocking lock [%p] in thread #%d:\n"
"\n"
,this, caller_id
);
}
else {
printf(
"Contention with unidentified readers detected while wlocking lock [%p] in thread #%d:\n"
" - the readers were already gone by the time we could inspect lock ownership\n"
"\n"
,this, caller_id
);
}
}
else if (contenders > 0) {
printf(
"Contention with another writer detected while wlocking lock [%p] in thread #%d:\n"
" - the writer was already gone by the time we could inspect who owned the thread\n"
"\n"
,this, caller_id
);
}
if (this->owner_id != caller_id) {
while (this->readers_nb > 0) {
pthread_cond_wait(&this->wait_readers_depart, &this->guard);
}
while (this->write_count > 0) {
pthread_cond_wait(&this->wait_writer_depart, &this->guard);
}
this->owner_id = caller_id;
}
this->write_count = 1;
pthread_mutex_unlock(&this->guard);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment