diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 03:37:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 03:37:19 +0000 |
commit | b949447a495ee1438e6a483a20631ab855c7e68f (patch) | |
tree | 808379e7686f95b42384bfff55c8e61b37740ff0 | |
parent | 4a0cda64b2fb743b1cdcd00d2b57e452835d99e4 (diff) |
probes_helper.h: RUBY_DTRACE_HOOK
* probes_helper.h (RUBY_DTRACE_HOOK): surround with do..while.
* vm.c (vm_exec): supply semicolon.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | probes_helper.h | 2 | ||||
-rw-r--r-- | vm.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/probes_helper.h b/probes_helper.h index 91514b31ea..12a18dcb34 100644 --- a/probes_helper.h +++ b/probes_helper.h @@ -7,6 +7,7 @@ VALUE rb_class_path_no_cache(VALUE _klass); #define RUBY_DTRACE_HOOK(name, th, klazz, id) \ +do { \ if (RUBY_DTRACE_##name##_ENABLED()) { \ VALUE _klass = (klazz); \ VALUE _id = (id); \ @@ -49,6 +50,7 @@ VALUE rb_class_path_no_cache(VALUE _klass); } \ } \ } \ +} while (0) #define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \ RUBY_DTRACE_HOOK(METHOD_ENTRY, th, klass, id) @@ -1359,7 +1359,7 @@ vm_exec(rb_thread_t *th) switch (VM_FRAME_TYPE(th->cfp)) { case VM_FRAME_MAGIC_METHOD: - RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0) + RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, th->cfp->self, 0, 0, Qnil); break; case VM_FRAME_MAGIC_BLOCK: |