kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

add assertion for mutex_lock. 

After do_mutex_lock(mutex), the mutex should be owned by the current
thread. Adding an assertion for this assumption.
This commit is contained in:
Koichi Sasada 2019-10-28 12:19:18 +09:00
parent 85d966af21
commit d8d581bfc4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
thread_sync.c
View File

@ -223,6 +223,17 @@ rb_mutex_trylock(VALUE self)
*/
static const rb_thread_t *patrol_thread = NULL;
static VALUE
mutex_owned_p(rb_thread_t *th, rb_mutex_t *mutex)
{
if (mutex->th == th) {
return Qtrue;
}
else {
return Qfalse;
}
}
static VALUE
do_mutex_lock(VALUE self, int interruptible_p)
{
@ -298,6 +309,10 @@ do_mutex_lock(VALUE self, int interruptible_p)
}
}
}
// assertion
if (mutex_owned_p(th, mutex) == Qfalse) rb_bug("do_mutex_lock: mutex is not owned.");
return self;
}
@ -329,14 +344,10 @@ rb_mutex_lock(VALUE self)
VALUE
rb_mutex_owned_p(VALUE self)
{
VALUE owned = Qfalse;
rb_thread_t *th = GET_THREAD();
rb_mutex_t *mutex = mutex_ptr(self);
if (mutex->th == th)
owned = Qtrue;
return owned;
return mutex_owned_p(th, mutex);
}
static const char *