Permalink
Browse files

object.c: suppress warning

* object.c (rb_obj_alloc): suppress unused variable warning.

* tool/gen_dummy_probes.rb: define dtrace disabling macro.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
nobu committed Nov 16, 2012
1 parent ed86cd0 commit 7bd638b7a4062d774da7c96d3e926733b6a103ad
Showing with 4 additions and 1 deletion.
  1. +2 −0 object.c
  2. +2 −1 tool/gen_dummy_probes.rb
View
@@ -1686,12 +1686,14 @@ rb_obj_alloc(VALUE klass)
klass);
}
+#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED
if (RUBY_DTRACE_OBJECT_CREATE_ENABLED()) {
const char * file = rb_sourcefile();
RUBY_DTRACE_OBJECT_CREATE(rb_class2name(klass),
file ? file : "",
rb_sourceline());
}
+#endif
obj = (*allocator)(klass);
View
3 tool/gen_dummy_probes.rb 100644 → 100755
@@ -1,4 +1,5 @@
#!/usr/bin/ruby
+# -*- coding: us-ascii -*-
text = ARGF.read
text.upcase!
@@ -7,7 +8,7 @@
text.gsub!(/^#PRAGMA.*$/, '')
# replace the provider section with the start of the header file
-text.gsub!(/PROVIDER RUBY \{/, "#ifndef\t_PROBES_H\n#define\t_PROBES_H")
+text.gsub!(/PROVIDER RUBY \{/, "#ifndef\t_PROBES_H\n#define\t_PROBES_H\n#define DTRACE_PROBES_DISABLED 1\n")
# finish up the #ifndef sandwich
text.gsub!(/\};/, "#endif\t/* _PROBES_H */")

0 comments on commit 7bd638b

Please sign in to comment.