perftools.rb 0.4.4 → 0.4.5

data/ext/perftools.c

@@ -1,3 +1,10 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
 #include <assert.h>
 #include <ruby.h>
 
@@ -261,13 +268,6 @@ cpuprofiler_gc_mark()
 
 /* ObjProfiler */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 600
-#endif
-
 #include <assert.h>
 #include <ucontext.h>
 #include <unistd.h>
@@ -281,7 +281,7 @@ static VALUE bObjProfilerRunning;
 #define NUM_ORIG_BYTES 2
 
 struct {
-  void *location;
+  char *location;
   unsigned char value;
 } orig_bytes[NUM_ORIG_BYTES];
 
@@ -292,14 +292,11 @@ page_align(void *addr) {
 }
 
 static void
-copy_instructions(void *dest, void *src, size_t count) {
-  assert(dest != NULL);
-  assert(src != NULL);
-
-  void *aligned_addr = page_align(dest);
-  if (mprotect(aligned_addr, (dest - aligned_addr) + count, PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
+unprotect_page(void *addr) {
+  assert(addr != NULL);
+  void *aligned_addr = page_align(addr);
+  if (mprotect(aligned_addr, (addr - aligned_addr), PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
     perror("mprotect");
-  memcpy(dest, src, count);
 }
 
 static inline void**
@@ -309,7 +306,11 @@ uc_get_ip(ucontext_t *uc) {
   #elif defined(__dietlibc__)
     return (void**)&uc->uc_mcontext.rip;
   #elif defined(__APPLE__)
-    return (void**)&uc->uc_mcontext->__ss.__rip;
+    #if defined(__LP64__)
+      return (void**)&uc->uc_mcontext->__ss.__rip;
+    #else
+      return (void**)&uc->uc_mcontext->__ss.__eip;
+    #endif
   #else
     return (void**)&uc->uc_mcontext.gregs[REG_RIP];
   #endif
@@ -326,10 +327,10 @@ trap_handler(int sig, siginfo_t *info, void *data) {
   for (i=0; i<NUM_ORIG_BYTES; i++) {
     if (orig_bytes[i].location == *ip-1) {
       // restore original byte
-      copy_instructions(orig_bytes[i].location, &orig_bytes[i].value, 1);
+      orig_bytes[i].location[0] = orig_bytes[i].value;
 
       // setup next breakpoint
-      copy_instructions(orig_bytes[(i+1)%NUM_ORIG_BYTES].location, "\xCC", 1);
+      orig_bytes[(i+1)%NUM_ORIG_BYTES].location[0] = '\xCC';
 
       // first breakpoint is the notification
       if (i == 0)
@@ -354,10 +355,12 @@ objprofiler_setup()
   sigemptyset(&sig.sa_mask);
   sigaction(SIGTRAP, &sig, NULL);
 
+  unprotect_page(rb_newobj);
+
   for (i=0; i<NUM_ORIG_BYTES; i++) {
-    orig_bytes[i].location = rb_newobj + i;
+    orig_bytes[i].location = (char *)(rb_newobj + i);
     orig_bytes[i].value    = ((unsigned char*)rb_newobj)[i];
-    copy_instructions(rb_newobj + i, "\xCC", 1);
+    orig_bytes[i].location[0] = '\xCC';
   }
 
   // setenv("CPUPROFILE_OBJECTS", "1", 1);
@@ -377,7 +380,7 @@ objprofiler_teardown()
   sigaction(SIGTRAP, &sig, NULL);
 
   for (i=0; i<NUM_ORIG_BYTES; i++) {
-    copy_instructions(orig_bytes[i].location, &orig_bytes[i].value, 1);
+    orig_bytes[i].location[0] = orig_bytes[i].value;
   }
 
   // unsetenv("CPUPROFILE_OBJECTS");

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.4.4'
-  s.date = '2010-08-01'
+  s.version = '0.4.5'
+  s.date = '2010-08-03'
   s.rubyforge_project = 'perftools-rb'
   s.summary = 'google-perftools for ruby code'
   s.description = 'A sampling profiler for ruby code based on patches to google-perftools'

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 -07:00
+date: 2010-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,27 +49,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: google-perftools for ruby code