make/bsd/makefiles/dtrace.make

Print this page
rev 5733 : 8030812: Change the solaris DTrace implementation to use USDT2 instead of USDT1
Reviewed-by:


  51 JVMOFFS = JvmOffsets
  52 JVMOFFS.o = $(JVMOFFS).o
  53 GENOFFS = generate$(JVMOFFS)
  54 
  55 DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace
  56 DTRACE = dtrace
  57 DTRACE.o = $(DTRACE).o
  58 
  59 # to remove '-g' option which causes link problems
  60 # also '-z nodefs' is used as workaround
  61 GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
  62 
  63 ifdef LP64
  64 DTRACE_OPTS = -D_LP64
  65 endif
  66 
  67 # making libjvm_db
  68 
  69 # Use mapfile with libjvm_db.so
  70 LIBJVM_DB_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_db
  71 #LFLAGS_JVM_DB += $(MAPFLAG:FILENAME=$(LIBJVM_DB_MAPFILE))
  72 
  73 # Use mapfile with libjvm_dtrace.so
  74 LIBJVM_DTRACE_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_dtrace
  75 #LFLAGS_JVM_DTRACE += $(MAPFLAG:FILENAME=$(LIBJVM_DTRACE_MAPFILE))
  76 
  77 LFLAGS_JVM_DB += $(PICFLAG) # -D_REENTRANT
  78 LFLAGS_JVM_DTRACE += $(PICFLAG) # -D_REENTRANT
  79 
  80 ISA = $(subst i386,i486,$(BUILDARCH))
  81 
  82 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
  83 ifneq ("${ISA}","${BUILDARCH}")
  84 
  85 XLIBJVM_DIR = 64
  86 XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB)
  87 XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE)
  88 XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
  89 
  90 XLIBJVM_DB_DEBUGINFO       = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO)
  91 XLIBJVM_DB_DIZ             = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ)
  92 XLIBJVM_DTRACE_DEBUGINFO   = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
  93 XLIBJVM_DTRACE_DIZ         = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
  94 
  95 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)


 243         $(RM) -r $(LIBJVM_DTRACE_DEBUGINFO)
 244     endif
 245   else
 246         $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
 247         $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
 248     ifeq ($(STRIP_POLICY),all_strip)
 249         $(QUIETLY) $(STRIP) $@
 250     else
 251       ifeq ($(STRIP_POLICY),min_strip)
 252         $(QUIETLY) $(STRIP) -x $@
 253       # implied else here is no stripping at all
 254       endif
 255     endif
 256     ifeq ($(ZIP_DEBUGINFO_FILES),1)
 257         $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) 
 258         $(RM) $(LIBJVM_DTRACE_DEBUGINFO)
 259     endif
 260   endif
 261 endif
 262 
 263 #$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
 264 #             $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
 265 #       $(QUIETLY) cat $^ > $@
 266 
 267 $(DtraceOutDir):
 268         mkdir $(DtraceOutDir)
 269 
 270 $(DtraceOutDir)/hotspot.h: $(DTRACE_SRCDIR)/hotspot.d | $(DtraceOutDir)
 271         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot.d
 272 
 273 $(DtraceOutDir)/hotspot_jni.h: $(DTRACE_SRCDIR)/hotspot_jni.d | $(DtraceOutDir)
 274         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot_jni.d
 275 
 276 $(DtraceOutDir)/hs_private.h: $(DTRACE_SRCDIR)/hs_private.d | $(DtraceOutDir)
 277         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hs_private.d
 278 
 279 $(DtraceOutDir)/jhelper.h: $(DTRACE_SRCDIR)/jhelper.d $(JVMOFFS).o | $(DtraceOutDir)
 280         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/jhelper.d
 281 
 282 # jhelper currently disabled
 283 dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h 
 284 
 285 DTraced_Files = ciEnv.o \
 286                 classLoadingService.o \
 287                 compileBroker.o \
 288                 hashtable.o \
 289                 instanceKlass.o \
 290                 java.o \
 291                 jni.o \
 292                 jvm.o \
 293                 memoryManager.o \
 294                 nmethod.o \
 295                 objectMonitor.o \
 296                 runtimeService.o \
 297                 sharedRuntime.o \
 298                 synchronizer.o \
 299                 thread.o \
 300                 unsafe.o \
 301                 vmThread.o \
 302                 vmCMSOperations.o \
 303                 vmPSOperations.o \
 304                 vmGCOperations.o \
 305 
 306 # Dtrace is available, so we build $(DTRACE.o)  
 307 #$(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
 308 #       @echo Compiling $(DTRACE).d
 309 
 310 #       $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \
 311 #     $(DTraced_Files) ||\
 312 #  STATUS=$$?;\
 313 #       if [ x"$$STATUS" = x"1" -a \
 314 #       x`uname -r` = x"5.10" -a \
 315 #       x`uname -p` = x"sparc" ]; then\
 316 #    echo "*****************************************************************";\
 317 #    echo "* If you are building server compiler, and the error message is ";\
 318 #    echo "* \"incorrect ELF machine type...\", you have run into solaris bug ";\
 319 #    echo "* 6213962, \"dtrace -G doesn't work on sparcv8+ object files\".";\
 320 #    echo "* Either patch/upgrade your system (>= S10u1_15), or set the ";\
 321 #    echo "* environment variable HOTSPOT_DISABLE_DTRACE_PROBES to disable ";\
 322 #    echo "* dtrace probes for this build.";\
 323 #    echo "*****************************************************************";\
 324 #  fi;\
 325 #  exit $$STATUS
 326   # Since some DTraced_Files are in LIBJVM.o and they are touched by this
 327   # command, and libgenerateJvmOffsets.so depends on LIBJVM.o, 'make' will
 328   # think it needs to rebuild libgenerateJvmOffsets.so and thus JvmOffsets*
 329   # files, but it doesn't, so we touch the necessary files to prevent later
 330   # recompilation. Note: we only touch the necessary files if they already
 331   # exist in order to close a race where an empty file can be created
 332   # before the real build rule is executed.
 333   # But, we can't touch the *.h files:  This rule depends
 334   # on them, and that would cause an infinite cycle of rebuilding.
 335   # Neither the *.h or *.ccp files need to be touched, since they have
 336   # rules which do not update them when the generator file has not
 337   # changed their contents.
 338 #       $(QUIETLY) if [ -f lib$(GENOFFS).so ]; then touch lib$(GENOFFS).so; fi
 339 #       $(QUIETLY) if [ -f $(GENOFFS) ]; then touch $(GENOFFS); fi
 340 #       $(QUIETLY) if [ -f $(JVMOFFS.o) ]; then touch $(JVMOFFS.o); fi
 341 
 342 .PHONY: dtraceCheck
 343 
 344 #SYSTEM_DTRACE_H = /usr/include/dtrace.h
 345 SYSTEM_DTRACE_PROG = /usr/sbin/dtrace
 346 #PATCH_DTRACE_PROG = /opt/SUNWdtrd/sbin/dtrace
 347 systemDtraceFound := $(wildcard ${SYSTEM_DTRACE_PROG})
 348 #patchDtraceFound := $(wildcard ${PATCH_DTRACE_PROG})
 349 #systemDtraceHdrFound := $(wildcard $(SYSTEM_DTRACE_H))
 350 
 351 #ifneq ("$(systemDtraceHdrFound)", "") 
 352 #CFLAGS += -DHAVE_DTRACE_H
 353 #endif
 354 
 355 #ifneq ("$(patchDtraceFound)", "")
 356 #DTRACE_PROG=$(PATCH_DTRACE_PROG)
 357 #DTRACE_INCL=-I/opt/SUNWdtrd/include
 358 #else
 359 ifneq ("$(systemDtraceFound)", "")
 360 DTRACE_PROG=$(SYSTEM_DTRACE_PROG)
 361 else
 362 
 363 endif # ifneq ("$(systemDtraceFound)", "")
 364 #endif # ifneq ("$(patchDtraceFound)", "")
 365 
 366 ifneq ("${DTRACE_PROG}", "")
 367 ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
 368 
 369 DTRACE_OBJS = $(DTRACE.o) #$(JVMOFFS.o)
 370 CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)
 371 #clangCFLAGS += -DDTRACE_ENABLED -fno-optimize-sibling-calls
 372 #MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE)
 373 
 374 
 375 dtraceCheck:
 376 
 377 dtrace_stuff: dtrace_gen_headers
 378         $(QUIETLY) echo "dtrace headers generated"
 379 
 380 
 381 else # manually disabled
 382 
 383 dtraceCheck:
 384         $(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
 385 
 386 dtrace_stuff:
 387 
 388 endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
 389 
 390 else # No dtrace program found
 391 
 392 dtraceCheck:


  51 JVMOFFS = JvmOffsets
  52 JVMOFFS.o = $(JVMOFFS).o
  53 GENOFFS = generate$(JVMOFFS)
  54 
  55 DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace
  56 DTRACE = dtrace
  57 DTRACE.o = $(DTRACE).o
  58 
  59 # to remove '-g' option which causes link problems
  60 # also '-z nodefs' is used as workaround
  61 GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
  62 
  63 ifdef LP64
  64 DTRACE_OPTS = -D_LP64
  65 endif
  66 
  67 # making libjvm_db
  68 
  69 # Use mapfile with libjvm_db.so
  70 LIBJVM_DB_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_db

  71 
  72 # Use mapfile with libjvm_dtrace.so
  73 LIBJVM_DTRACE_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_dtrace

  74 
  75 LFLAGS_JVM_DB += $(PICFLAG) # -D_REENTRANT
  76 LFLAGS_JVM_DTRACE += $(PICFLAG) # -D_REENTRANT
  77 
  78 ISA = $(subst i386,i486,$(BUILDARCH))
  79 
  80 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
  81 ifneq ("${ISA}","${BUILDARCH}")
  82 
  83 XLIBJVM_DIR = 64
  84 XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB)
  85 XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE)
  86 XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
  87 
  88 XLIBJVM_DB_DEBUGINFO       = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO)
  89 XLIBJVM_DB_DIZ             = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ)
  90 XLIBJVM_DTRACE_DEBUGINFO   = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
  91 XLIBJVM_DTRACE_DIZ         = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
  92 
  93 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)


 241         $(RM) -r $(LIBJVM_DTRACE_DEBUGINFO)
 242     endif
 243   else
 244         $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
 245         $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
 246     ifeq ($(STRIP_POLICY),all_strip)
 247         $(QUIETLY) $(STRIP) $@
 248     else
 249       ifeq ($(STRIP_POLICY),min_strip)
 250         $(QUIETLY) $(STRIP) -x $@
 251       # implied else here is no stripping at all
 252       endif
 253     endif
 254     ifeq ($(ZIP_DEBUGINFO_FILES),1)
 255         $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) 
 256         $(RM) $(LIBJVM_DTRACE_DEBUGINFO)
 257     endif
 258   endif
 259 endif
 260 



 261 
 262 $(DtraceOutDir):
 263         mkdir $(DtraceOutDir)
 264 
 265 $(DtraceOutDir)/hotspot.h: $(DTRACE_SRCDIR)/hotspot.d | $(DtraceOutDir)
 266         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot.d
 267 
 268 $(DtraceOutDir)/hotspot_jni.h: $(DTRACE_SRCDIR)/hotspot_jni.d | $(DtraceOutDir)
 269         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot_jni.d
 270 
 271 $(DtraceOutDir)/hs_private.h: $(DTRACE_SRCDIR)/hs_private.d | $(DtraceOutDir)
 272         $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hs_private.d
 273 




 274 dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h 
 275 
























































 276 
 277 .PHONY: dtraceCheck
 278 

 279 SYSTEM_DTRACE_PROG = /usr/sbin/dtrace

 280 systemDtraceFound := $(wildcard ${SYSTEM_DTRACE_PROG})


 281 








 282 ifneq ("$(systemDtraceFound)", "")
 283 DTRACE_PROG=$(SYSTEM_DTRACE_PROG)
 284 else
 285 
 286 endif

 287 
 288 ifneq ("${DTRACE_PROG}", "")
 289 ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
 290 
 291 DTRACE_OBJS = $(DTRACE.o) #$(JVMOFFS.o)
 292 CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)


 293 
 294 
 295 dtraceCheck:
 296 
 297 dtrace_stuff: dtrace_gen_headers
 298         $(QUIETLY) echo "dtrace headers generated"
 299 
 300 
 301 else # manually disabled
 302 
 303 dtraceCheck:
 304         $(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
 305 
 306 dtrace_stuff:
 307 
 308 endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
 309 
 310 else # No dtrace program found
 311 
 312 dtraceCheck: