Skip to content

Commit

Permalink
Showing 9 changed files with 15 additions and 61 deletions.
5 changes: 0 additions & 5 deletions machine/capi/handles.cpp
Original file line number Diff line number Diff line change
@@ -12,10 +12,6 @@
namespace rubinius {
namespace capi {
void Handles::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("C-API handles: diagnostics: " \
"objects: %ld, bytes: %ld, collections: %ld\n",
objects_, bytes_, collections_);
@@ -153,7 +149,6 @@ namespace rubinius {
allocator_->rebuild_freelist(&chunk_marks);

diagnostics_.bytes_ = allocator_->in_use_ * sizeof(Handle);
diagnostics_.modify();
}
}
}
15 changes: 0 additions & 15 deletions machine/diagnostics.hpp
Original file line number Diff line number Diff line change
@@ -16,27 +16,12 @@ namespace rubinius {
class DiagnosticsData {
rapidjson::Document* document_;

bool modified_;

public:
DiagnosticsData()
: document_(NULL)
, modified_(false)
{ }
virtual ~DiagnosticsData();


bool modified_p() {
return modified_;
}

void modify() {
modified_ = true;
}

void log() {
}

void to_string(rapidjson::StringBuffer buffer);
};

6 changes: 0 additions & 6 deletions machine/memory/code_manager.cpp
Original file line number Diff line number Diff line change
@@ -8,10 +8,6 @@
namespace rubinius {
namespace memory {
void CodeManager::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("code manager: diagnostics: " \
"collections: %ld, chunks: %ld, objects: %ld, bytes: %ld",
collections_, chunks_, objects_, bytes_);
@@ -142,8 +138,6 @@ namespace memory {
diagnostics_.chunks_++;
}
}

diagnostics_.modify();
}

void CodeManager::clear_marks() {
8 changes: 1 addition & 7 deletions machine/memory/immix_collector.cpp
Original file line number Diff line number Diff line change
@@ -19,10 +19,6 @@
namespace rubinius {
namespace memory {
void ImmixGC::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("immix: diagnostics: " \
"collections: %ld, " \
"objects: %ld, " \
@@ -358,9 +354,7 @@ namespace memory {

diagnostics_.collections_++;

if(memory_->shared().diagnostics()) {
memory_->shared().diagnostics()->report(&diagnostics_);
}
memory_->shared().diagnostics()->report(&diagnostics_);
}

allocator_.restart(diagnostics_.percentage_,
5 changes: 0 additions & 5 deletions machine/memory/inflated_headers.cpp
Original file line number Diff line number Diff line change
@@ -9,10 +9,6 @@
namespace rubinius {
namespace memory {
void InflatedHeaders::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("inflated headers: diagnostics: " \
"objects: %ld, bytes: %ld, collections: %ld\n",
objects_, bytes_, collections_);
@@ -59,7 +55,6 @@ namespace memory {
allocator_->rebuild_freelist(&chunk_marks);

diagnostics_.bytes_ = allocator_->in_use_ * sizeof(InflatedHeader);
diagnostics_.modify();
}
}
}
6 changes: 0 additions & 6 deletions machine/memory/mark_sweep.cpp
Original file line number Diff line number Diff line change
@@ -32,10 +32,6 @@ namespace memory {
MarkSweepGC::~MarkSweepGC() { }

void MarkSweepGC::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("large objects: diagnostics: objects: %ld, bytes: %ld",
objects_, bytes_);
}
@@ -147,8 +143,6 @@ namespace memory {
i = entries.erase(i);
}
}

diagnostics_.modify();
}

ObjectPosition MarkSweepGC::validate_object(Object* obj) {
24 changes: 13 additions & 11 deletions machine/shared_state.cpp
Original file line number Diff line number Diff line change
@@ -32,18 +32,19 @@ namespace rubinius {

SharedState::SharedState(Environment* env, Configuration& config, ConfigParser& cp)
: thread_nexus_(new ThreadNexus())
, internal_threads_(0)
, signals_(0)
, finalizer_thread_(0)
, console_(0)
, metrics_(0)
, internal_threads_(NULL)
, signals_(NULL)
, finalizer_thread_(NULL)
, console_(NULL)
, metrics_(NULL)
, diagnostics_(NULL)
, method_count_(1)
, class_count_(1)
, global_serial_(1)
, initialized_(false)
, check_global_interrupts_(false)
, check_gc_(false)
, root_vm_(0)
, root_vm_(NULL)
, env_(env)
, tool_broker_(new tooling::ToolBroker)
, codedb_lock_(true)
@@ -57,11 +58,11 @@ namespace rubinius {
, type_info_lock_()
, code_resource_lock_()
, use_capi_lock_(false)
, om(0)
, om(NULL)
, global_cache(new GlobalCache)
, config(config)
, user_variables(cp)
, llvm_state(0)
, llvm_state(NULL)
, username("")
, pid("")
{
@@ -153,9 +154,10 @@ namespace rubinius {
}

diagnostics::Diagnostics* SharedState::start_diagnostics(STATE) {
if(state->shared().config.system_diagnostics_target.value.compare("none")) {
if(!diagnostics_) {
diagnostics_ = new diagnostics::Diagnostics(state);
if(!diagnostics_) {
diagnostics_ = new diagnostics::Diagnostics(state);

if(state->shared().config.system_diagnostics_target.value.compare("none")) {
diagnostics_->start(state);
}
}
2 changes: 1 addition & 1 deletion machine/shared_state.hpp
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ namespace rubinius {
class Metrics;
}

namespace diagnostics_ {
namespace diagnostics {
class Diagnostics;
}

5 changes: 0 additions & 5 deletions machine/symbol_table.cpp
Original file line number Diff line number Diff line change
@@ -19,10 +19,6 @@

namespace rubinius {
void SymbolTable::Diagnostics::log() {
if(!modified_p()) return;

diagnostics::DiagnosticsData::log();

logger::write("symbol table: diagnostics: symbols: %ld, bytes: %ld",
objects_, bytes_);
}
@@ -97,7 +93,6 @@ namespace rubinius {
size_t bytes = (str.size() + sizeof(std::string) + sizeof(int) + sizeof(Kind));
diagnostics_.objects_++;
diagnostics_.bytes_ += bytes;
diagnostics_.modify();

strings.push_back(str);
encodings.push_back(enc);

0 comments on commit 972fd34

Please sign in to comment.