kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* Makefile.in (probes.o): add -C to ignore #include in probes.d.

Browse source 
* probes.d: include vm_opts.h instead of vm_core.h.

* vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-22 09:03:43 +00:00
parent 59c41661a7
commit 1dec7384d1
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Nov 22 18:01:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* Makefile.in (probes.o): add -C to ignore #include in probes.d.
* probes.d: include vm_opts.h instead of vm_core.h.
* vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.
Thu Nov 22 17:45:17 2012 NARUSE, Yui <naruse@ruby-lang.org> Thu Nov 22 17:45:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5. * ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5.

2
Makefile.in
View file

@ -350,7 +350,7 @@ probes.@OBJEXT@: $(srcdir)/probes.d
fi; \ fi; \
touch "$$stamp" touch "$$stamp"
$(RM) $@ $(RM) $@
$(Q) $(DTRACE) -G -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS) $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
# DTrace static library hacks described here: # DTrace static library hacks described here:
# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html

2
probes.d
View file

@ -1,4 +1,4 @@
#include "vm_core.h" #include "vm_opts.h"
provider ruby { provider ruby {
probe function__entry(const char *, const char *, const char *, int); probe function__entry(const char *, const char *, const char *, int);

4
vm_core.h
View file

@ -14,10 +14,6 @@
#define RUBY_VM_THREAD_MODEL 2 #define RUBY_VM_THREAD_MODEL 2
#ifndef VM_COLLECT_USAGE_DETAILS
#define VM_COLLECT_USAGE_DETAILS 0
#endif
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/st.h" #include "ruby/st.h"

4
vm_opts.h
View file

@ -49,4 +49,8 @@
/* misc */ /* misc */
#define SUPPORT_JOKE 0 #define SUPPORT_JOKE 0
#ifndef VM_COLLECT_USAGE_DETAILS
#define VM_COLLECT_USAGE_DETAILS 0
#endif
#endif /* RUBY_VM_OPTS_H */ #endif /* RUBY_VM_OPTS_H */