Skip to content

Commit

Permalink
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 6 additions & 2 deletions vm/environment.cpp
Original file line number Diff line number Diff line change
@@ -104,6 +104,8 @@ namespace rubinius {
}

Environment::~Environment() {
stop_logging(state);

delete signal_handler_;
delete finalizer_handler_;

@@ -115,8 +117,6 @@ namespace rubinius {
delete[] argv_[i];
}
delete[] argv_;

utilities::logger::close();
}

void cpp_exception_bug() {
@@ -144,6 +144,10 @@ namespace rubinius {
}
}

void Environment::stop_logging(state) {
utilities::logger::close();
}

void Environment::stop_jit(STATE) {
utilities::thread::SpinLock::LockGuard lg(state->shared().llvm_state_lock());

1 change: 1 addition & 0 deletions vm/environment.hpp
Original file line number Diff line number Diff line change
@@ -123,6 +123,7 @@ namespace rubinius {
void start_logging(STATE);
void start_jit(STATE);

void stop_logging(STATE);
void stop_jit(STATE);
};

3 changes: 3 additions & 0 deletions vm/shared_state.cpp
Original file line number Diff line number Diff line change
@@ -251,6 +251,9 @@ namespace rubinius {

env_->set_fsapi_path();

env_->stop_logging(state);
env_->start_logging(state);

world_->reinit();

om->after_fork_child(state);

0 comments on commit 1d3ebe5

Please sign in to comment.