diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-03 15:36:17 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-03 15:36:17 +0000 |
commit | 72b199940d8a19d869bb9f0bb6065d15bbb030d7 (patch) | |
tree | a10f236e37c0e673ffc68fb8ab547608e34e9ccb /configure.in | |
parent | 0e8fae89ab921e1be06ee7285c5e919e386a1b26 (diff) |
* trace.h: new file. wraps tracing mechanisms.
* defs/dtrace.d: new file. defined a dtrace provider "ruby".
* include/ruby/ruby.h (LIKELY): moved from vm.c.
(UNLIKELY): ditto.
(OBJSETUP): probe "object-create".
(RUBY_EVENT_RESCUE): new event.
* vm_exec.c (DEBUG_ENTER_INSN): embeded a probe insn-entry into it.
(DEBUG_END_INSN): insn-return.
* vm.c (LIKELY): moved into ruby.h.
(UNLIKELY): ditto.
(Init_BareVM): embeded a probe "raise" into it.
* variable.c (rb_class2name_without_alloc): new utility function.
* tool/rbinstall.rb (install?(:ext, :arch, :'ext-arch')): installs
dtrace.d if necessary.
* thread_pthread.c (add_signal_thread_list): probe "raise".
(rb_thread_create_timer_thread): ditto.
* thread.c (rb_thread_schedule_rec): probes "thread-enter" and
"thread-leave",
(thread_start_func_2): ditto.
(thread_cleanup_func): probe "thread-term"
* lib/mkmf.rb: supports dtrace postprocessor on making an extension.
* iseq.c (rb_vm_insn_name): new utility function.
(rb_vm_insn_len): ditto.
* insns.def (hook): probes "method-etnry", "method-return", "line",
and "rescue".
* compile.c (iseq_compile_each): adds a trace op for "rescue" probe.
* gc.c (garbage_collect): probes "gc-begin" and "gc-end".
(obj_free): probe "object-free"
(garbage_collect_with_gvl): probe "raise"
(negative_size_allocation_error): ditto.
(rb_memerror): ditto.
* eval.c (rb_rescue2): probe "rescue"
(rb_longjmp): probe "raise"
* ext/probe/probe.c: new extension for application defined probes.
* ext/probe/extconf.rb: ditto.
* configure.in (--with-tracing-model): new option to choose a tracing
mechanism.
(DTRACE): new substitution. name of dtrace(1).
(RUBY_TRACING_MODEL): new substitution.
(DTRACE_OBJ): ditto.
(MINIDTRACE_OBJ): ditto.
(GOLFDTRACE_OBJ): ditto.
(LIBRUBY_DTRACE_OBJ): ditto.
(RUBY_DTRACE_POSTPROCESS): new macro. checks whether the dtrace on
the system needs postprocessing.
(RUBY_DTRACE_BSD_BROKEN): new macro. checks whether the dtrace
supports USDT.
* Makefile.in:
(DTRACE): new variable. name of dtrace(1).
(TRACING_MODEL): new variable. name of the chosen tracing mechanism.
(DTRACE_OBJ): same as the one in configure.in.
(MINIDTRACE_OBJ): ditto.
(GOLFDTRACE_OBJ): ditto.
(LIBRUBY_DTRACE_OBJ): ditto.
(CPPOUTFILE): new substitution. necessary for generating dtrace.d
(trace_none.h): new target for TRACING_MODEL=none
(RUBY_H_INCLUDES): appended a header for tracing.
(distclean-local): also removes preprocessed version of dtrace.d
($(LIBRUBY_A)): needs $(LIBRUBY_DTRACE_OBJ) if dtrace needs
postprocessing.
($(PROGRAM)): ditto.
(golf): ditto.
(miniruby): ditto.
($(arch_hdrdir)/ruby/dtrace.d): new target. preprocessed verson
of defs/dtrace.d. generated if necessary.
($(arch_hdrdir)/ruby/trace_dtrace.h): new target.
definition of probes.
($(LIBRUBY_DTRACE_OBJ)): new target. generated if dtrace needs
postprocessing.
($(DTRACE_OBJ)): ditto.
($(MINIDTRACE_OBJ)): ditto.
($(GOLFDTRACE_OBJ)): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/configure.in b/configure.in index d2a8228265..a092717b6f 100644 --- a/configure.in +++ b/configure.in @@ -357,6 +357,51 @@ fi MAKEDIRS="$MKDIR_P" AC_SUBST(MAKEDIRS) +AC_DEFUN([RUBY_DTRACE_POSTPROCESS], +[AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g, +[ + echo "int main(void){ return 0; }" > conftest.c + echo "provider conftest{};" > conftest_provider.d + $CC $CFLAGS -c -o conftest.o conftest.c + if $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null; then + rb_cv_prog_dtrace_g=yes + $1 + else + rb_cv_prog_dtrace_g=no + $2 + fi + rm -f conftest.o conftest.c conftest_provider.d conftest_provider.o +]) +]) + +AC_DEFUN([RUBY_DTRACE_BSD_BROKEN], +[AC_CACHE_CHECK(whether dtrace USDT is broken, rb_cv_dtrace_bsd_broken, +[ + cat <<EOF > conftest.c +#define _DTRACE_VERSION 1 +#include "conftest_provider.h" +int main(void) +{ + if (CONFTEST_FIRE_ENABLED()) CONFTEST_FIRE(); + return 0; +} +EOF + echo "provider conftest{ probe fire(); };" > conftest_provider.d + $DTRACE -h -o conftest_provider.h -s conftest_provider.d + $CC $CFLAGS -c -o conftest.o conftest.c + if $DTRACE -G -o conftest_provider.o -s conftest_provider.d conftest.o >/dev/null 2>/dev/null; then + rb_cv_dtrace_bsd_broken=no + $2 + else + rb_cv_dtrace_bsd_broken=yes + $1 + fi + rm -f conftest.[co] conftest_provider.[dho] +]) +]) + +AC_CHECK_TOOL(DTRACE, dtrace) + AC_CHECK_TOOL(DOT, dot) AC_CHECK_TOOL(DOXYGEN, doxygen) if test x"$DOXYGEN" = x; then @@ -1023,6 +1068,7 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\ ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \ net/socket.h sys/socket.h) + dnl Check additional types. RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [ #ifdef HAVE_SYS_TYPES_H @@ -2065,6 +2111,54 @@ case "$target_os" in ;; esac +AC_ARG_WITH(tracing-model, + AS_HELP_STRING([--with-tracing-model=MODEL], [use MODEL for tracing ruby's internal. [[auto]] (none|dtrace|auto)]), + [TRACING_MODEL=$withval], [TRACING_MODEL=auto]) + +if test "${TRACING_MODEL}" = "auto"; then + if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then + RUBY_DTRACE_POSTPROCESS() + if test "$rb_cv_prog_dtrace_g" = 'yes'; then + RUBY_DTRACE_BSD_BROKEN([TRACING_MODEL=none], [TRACING_MODEL=dtrace]) + else + TRACING_MODEL=dtrace + fi + else + TRACING_MODEL=none + fi +fi + +case "${TRACING_MODEL}" in + when(none) + AC_DEFINE(RUBY_TRACING_MODEL, RUBY_TRACING_MODEL_NONE, [none]) + ;; + when(dtrace) + if test -z "$DTRACE"; then + AC_MSG_ERROR([dtrace(1) is missing]) + elif test "$cross_compiling" = yes; then + AC_MSG_ERROR([--with-tracing-model=dtrace, however, cross compiling]) + else + RUBY_DTRACE_POSTPROCESS() + if test "$rb_cv_prog_dtrace_g" = 'yes'; then + RUBY_DTRACE_BSD_BROKEN([AC_MSG_ERROR([--with-tracing-model=dtrace, however, USDT is broken])], []) + DTRACE_OBJ='dtrace.$(OBJEXT)' + MINIDTRACE_OBJ='minidtrace.$(OBJEXT)' + GOLFDTRACE_OBJ='golfdtrace.$(OBJEXT)' + LIBRUBY_DTRACE_OBJ='libruby_dtrace.$(OBJEXT)' + fi + fi + AC_DEFINE(RUBY_TRACING_MODEL, RUBY_TRACING_MODEL_DTRACE, [dtrace]) + AC_SUBST(DTRACE_OBJ) + AC_SUBST(MINIDTRACE_OBJ) + AC_SUBST(GOLFDTRACE_OBJ) + AC_SUBST(LIBRUBY_DTRACE_OBJ) + ;; + when(*) + AC_MSG_ERROR([unknown tracing model: ${TRACING_MODEL}]) + ;; +esac +AC_SUBST(TRACING_MODEL) + AC_ARG_WITH(soname, AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) @@ -2712,4 +2806,5 @@ AC_CONFIG_FILES(Makefile, [{ [EXEEXT=$EXEEXT gnumake=$gnumake]) AC_OUTPUT dnl } + dnl } |