rubinius · Jul 9, 2015 · Jul 9, 2015 · Jul 9, 2015
Showing with 3 additions and 1,460 deletions.

+1 −1 library/rubinius/configuration.rb

+1 −3 vm/gc/immix.cpp

+0 −3 vm/gc/immix.hpp

+1 −1 vm/system_diagnostics.cpp

+0 −224 vm/util/bert-test.cc

+0 −1,228 vm/util/bert.hpp
diff --git a/library/rubinius/configuration.rb b/library/rubinius/configuration.rb
@@ -4,7 +4,7 @@
 Rubinius::ConfigurationVariables.define do |c|
 
   c.section "gc" do |s|
-    s.vm_variable "young_bytes", (40 * 1024 * 1024),
+    s.vm_variable "young_bytes", (30 * 1024 * 1024),
       "The number of bytes the young generation of the GC should use"
 
     s.vm_variable "young_lifetime", 2,

diff --git a/vm/gc/immix.cpp b/vm/gc/immix.cpp
@@ -28,11 +28,10 @@ namespace rubinius {
         "bytes: %ld, " \
         "total_bytes: %ld, " \
         "chunks: %ld, " \
-        "blocks: %ld, " \
         "holes: %ld, " \
         "percentage: %f",
         collections_, objects_, bytes_, total_bytes_,
-        chunks_, blocks_, holes_, percentage_);
+        chunks_, holes_, percentage_);
   }
 
   void ImmixGC::ObjectDescriber::added_chunk(int count) {
@@ -319,7 +318,6 @@ namespace rubinius {
       diagnostics_.chunks_ = chunks.size();
 
       while(immix::Block* block = iter.next()) {
-        diagnostics_.blocks_++;
         diagnostics_.holes_ += block->holes();
         diagnostics_.objects_ += block->objects();
         diagnostics_.bytes_ += block->object_bytes();

diff --git a/vm/gc/immix.hpp b/vm/gc/immix.hpp
@@ -25,7 +25,6 @@ namespace rubinius {
       int64_t collections_;
       int64_t total_bytes_;
       int64_t chunks_;
-      int64_t blocks_;
       int64_t holes_;
       double percentage_;
 
@@ -34,7 +33,6 @@ namespace rubinius {
         , collections_(0)
         , total_bytes_(0)
         , chunks_(0)
-        , blocks_(0)
         , holes_(0)
         , percentage_(0.0)
       { }
@@ -44,7 +42,6 @@ namespace rubinius {
         , collections_(collections)
         , total_bytes_(0)
         , chunks_(0)
-        , blocks_(0)
         , holes_(0)
         , percentage_(0.0)
       { }

diff --git a/vm/system_diagnostics.cpp b/vm/system_diagnostics.cpp
@@ -18,7 +18,7 @@ namespace rubinius {
       if(summarize) {
         utilities::logger::write("object memory: diagnostics: total memory: %ld",
             baker_.bytes_ +
-            immix_.bytes_ +
+            immix_.total_bytes_ +
             mark_sweep_.bytes_ +
             headers_.bytes_ +
             handles_.bytes_ +

diff --git a/vm/util/bert-test.cc b/vm/util/bert-test.cc
diff --git a/vm/util/bert.hpp b/vm/util/bert.hpp