Merge remote-tracking branch 'origin' into 1.8.7

brixen · brixen · commit 4de3a0086da9 · 2015-06-24T20:35:09.000-07:00
diff --git a/vm/builtin/location.cpp b/vm/builtin/location.cpp
@@ -8,6 +8,7 @@
 #include "builtin/variable_scope.hpp"
 #include "call_frame.hpp"
 #include "ontology.hpp"
+#include "on_stack.hpp"
 
 namespace rubinius {
   void Location::init(STATE) {
@@ -82,11 +83,22 @@ namespace rubinius {
     return loc;
   }
 
-  Array* Location::from_call_stack(STATE, CallFrame* start_call_frame,
+  Array* Location::from_call_stack(STATE, CallFrame* call_frame,
                                    bool include_vars, bool on_ip)
   {
-    Array* bt = Array::create(state, 5);
-    CallFrame* call_frame = start_call_frame;
+    size_t count = 0;
+
+    CallFrame* c = call_frame;
+    while(c) {
+      if(c->compiled_code) count++;
+      c = c->previous;
+    }
+
+    Array* bt = 0;
+    Location* loc = 0;
+    OnStack<2> os(state, bt, loc);
+
+    bt = Array::create(state, count);
 
     // Initial edge.
     if(!call_frame) return bt;
@@ -98,7 +110,7 @@ namespace rubinius {
       if(!call_frame) return bt;
     }
 
-    Location* loc = Location::create(state, call_frame, include_vars);
+    loc = Location::create(state, call_frame, include_vars);
     if(on_ip) loc->set_ip_on_current(state);
 
     bt->append(state, loc);
@@ -110,7 +122,7 @@ namespace rubinius {
       if(call_frame->compiled_code) {
         bt->append(state, Location::create(state, call_frame, include_vars));
       } else if(NativeMethodFrame* nmf = call_frame->native_method_frame()) {
-        Location* loc = Location::create(state, nmf);
+        loc = Location::create(state, nmf);
         if(loc) bt->append(state, loc);
       }
 
@@ -121,6 +133,9 @@ namespace rubinius {
   }
 
   Array* Location::mri_backtrace(STATE, CallFrame* call_frame) {
+    Array* bt = 0;
+    OnStack<1> os(state, bt);
+
     size_t count = 0;
 
     CallFrame* c = call_frame;
@@ -129,7 +144,7 @@ namespace rubinius {
       c = c->previous;
     }
 
-    Array* bt = Array::create(state, count);
+    bt = Array::create(state, count);
 
     while(call_frame) {
       // Ignore synthetic frames
diff --git a/vm/metrics.cpp b/vm/metrics.cpp
@@ -78,7 +78,7 @@ namespace rubinius {
       cleanup();
     }
 
-#define RBX_METRICS_FILE_BUFLEN   22
+#define RBX_METRICS_FILE_BUFLEN   256
 
     void FileEmitter::send_metrics() {
       char buf[RBX_METRICS_FILE_BUFLEN];
@@ -93,7 +93,10 @@ namespace rubinius {
           logger::error("%s: unable to write file metrics", strerror(errno));
         }
       }
-      write(fd_, "\n", 1);
+
+      if(write(fd_, "\n", 1)) {
+        logger::error("%s: unable to write file metrics", strerror(errno));
+      }
     }
 
     void FileEmitter::initialize() {
@@ -102,14 +105,22 @@ namespace rubinius {
       }
 
       if(lseek(fd_, 0, SEEK_END) == 0) {
+        char buf[RBX_METRICS_FILE_BUFLEN];
+
         for(MetricsMap::iterator i = metrics_map_.begin();
             i != metrics_map_.end();
             ++i)
         {
-          if(i != metrics_map_.begin()) write(fd_, ", ", 2);
-          write(fd_, (*i)->first.c_str(), (*i)->first.size());
+          snprintf(buf, RBX_METRICS_FILE_BUFLEN, "%s%s",
+              i == metrics_map_.begin() ? "" : ", ", (*i)->first.c_str());
+          if(write(fd_, buf, strlen(buf)) < 0) {
+            logger::error("%s: unable to write file metrics", strerror(errno));
+          }
+        }
+
+        if(write(fd_, "\n", 1)) {
+          logger::error("%s: unable to write file metrics", strerror(errno));
         }
-        write(fd_, "\n", 1);
       }
     }
 
@@ -196,7 +207,7 @@ namespace rubinius {
           i != metrics_map_.end();
           ++i)
       {
-        snprintf(buf, RBX_METRICS_STATSD_BUFLEN, "%s%s:%lld|c",
+        snprintf(buf, RBX_METRICS_STATSD_BUFLEN, "%s%s:%lld|g",
             prefix_.c_str(), (*i)->first.c_str(), (long long unsigned int)(*i)->second);
         if(send(socket_fd_, buf, strlen(buf), 0) < 0) {
           logger::error("%s: unable to send StatsD metrics", strerror(errno));

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace rubinius {`
`78`	`78`	`cleanup();`
`79`	`79`	`}`
`80`	`80`
`81`		`-#define RBX_METRICS_FILE_BUFLEN 22`
	`81`	`+#define RBX_METRICS_FILE_BUFLEN 256`
`82`	`82`
`83`	`83`	`void FileEmitter::send_metrics() {`
`84`	`84`	`char buf[RBX_METRICS_FILE_BUFLEN];`
`@@ -93,7 +93,10 @@ namespace rubinius {`
`93`	`93`	`logger::error("%s: unable to write file metrics", strerror(errno));`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`- write(fd_, "\n", 1);`
	`96`	`+`
	`97`	`+ if(write(fd_, "\n", 1)) {`
	`98`	`+ logger::error("%s: unable to write file metrics", strerror(errno));`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`
`99`	`102`	`void FileEmitter::initialize() {`
`@@ -102,14 +105,22 @@ namespace rubinius {`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`if(lseek(fd_, 0, SEEK_END) == 0) {`
	`108`	`+ char buf[RBX_METRICS_FILE_BUFLEN];`
	`109`	`+`
`105`	`110`	`for(MetricsMap::iterator i = metrics_map_.begin();`
`106`	`111`	`i != metrics_map_.end();`
`107`	`112`	`++i)`
`108`	`113`	`{`
`109`		`- if(i != metrics_map_.begin()) write(fd_, ", ", 2);`
`110`		`- write(fd_, (i)->first.c_str(), (i)->first.size());`
	`114`	`+ snprintf(buf, RBX_METRICS_FILE_BUFLEN, "%s%s",`
	`115`	`+ i == metrics_map_.begin() ? "" : ", ", (*i)->first.c_str());`
	`116`	`+ if(write(fd_, buf, strlen(buf)) < 0) {`
	`117`	`+ logger::error("%s: unable to write file metrics", strerror(errno));`
	`118`	`+ }`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ if(write(fd_, "\n", 1)) {`
	`122`	`+ logger::error("%s: unable to write file metrics", strerror(errno));`
`111`	`123`	`}`
`112`		`- write(fd_, "\n", 1);`
`113`	`124`	`}`
`114`	`125`	`}`
`115`	`126`
`@@ -196,7 +207,7 @@ namespace rubinius {`
`196`	`207`	`i != metrics_map_.end();`
`197`	`208`	`++i)`
`198`	`209`	`{`
`199`		`- snprintf(buf, RBX_METRICS_STATSD_BUFLEN, "%s%s:%lld\|c",`
	`210`	`+ snprintf(buf, RBX_METRICS_STATSD_BUFLEN, "%s%s:%lld\|g",`
`200`	`211`	`prefix_.c_str(), (i)->first.c_str(), (long long unsigned int)(i)->second);`
`201`	`212`	`if(send(socket_fd_, buf, strlen(buf), 0) < 0) {`
`202`	`213`	`logger::error("%s: unable to send StatsD metrics", strerror(errno));`