Skip to content

Commit

Permalink
Revert "Lock when calling Console::stop_threads()"
Browse files Browse the repository at this point in the history
This reverts commit 646b214.

There was a problem in the conditional that made it appear as if this commit
actually solved the problem. I could make up a number of excuses as to why this
slipped past my eye, but the reality is that I'm just a dumbass for missing
this.
Yorick Peterse committed Sep 21, 2014
1 parent 646b214 commit 34cc556
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions vm/console.cpp
Original file line number Diff line number Diff line change
@@ -188,13 +188,6 @@ namespace rubinius {
SYNC(state);

if(request_vm_) {
file::LockGuard guard(request_fd_, LOCK_EX);

if(guard.status() == file::eLockSucceeded) {
logger::error("%s: console: unable to lock request file", strerror(errno));
return;
}

wakeup();

pthread_t os = request_vm_->os_thread();
@@ -207,13 +200,6 @@ namespace rubinius {
}

if(response_vm_) {
file::LockGuard guard(response_fd_, LOCK_EX);

if(guard.status() != file::eLockSucceeded) {
logger::error("%s: unable to lock response file", strerror(errno));
return;
}

pthread_t os = response_vm_->os_thread();
response_exit_ = true;

0 comments on commit 34cc556

Please sign in to comment.