comparison src/share/vm/jvmci/jvmciRuntime.cpp @ 22544:b87d1bf3cd9a

renamed TraceJVMCI option to JVMCITraceLevel and ensured all tracing controlled by this option uses the TRACE_jvmci_* macros
author Doug Simon <doug.simon@oracle.com>
date Wed, 09 Sep 2015 20:29:40 +0200
parents 97ca867d3622
children 10a9e989850e
comparison
equal deleted inserted replaced
22543:97ca867d3622 22544:b87d1bf3cd9a
397 thread->set_vm_result(PENDING_EXCEPTION); 397 thread->set_vm_result(PENDING_EXCEPTION);
398 CLEAR_PENDING_EXCEPTION; 398 CLEAR_PENDING_EXCEPTION;
399 JRT_END 399 JRT_END
400 400
401 JRT_ENTRY_NO_ASYNC(void, JVMCIRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock)) 401 JRT_ENTRY_NO_ASYNC(void, JVMCIRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock))
402 if (TraceJVMCI >= 3) { 402 IF_TRACE_jvmci_3 {
403 char type[O_BUFLEN]; 403 char type[O_BUFLEN];
404 obj->klass()->name()->as_C_string(type, O_BUFLEN); 404 obj->klass()->name()->as_C_string(type, O_BUFLEN);
405 markOop mark = obj->mark(); 405 markOop mark = obj->mark();
406 tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock)); 406 TRACE_jvmci_3("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock));
407 tty->flush(); 407 tty->flush();
408 } 408 }
409 #ifdef ASSERT 409 #ifdef ASSERT
410 if (PrintBiasedLockingStatistics) { 410 if (PrintBiasedLockingStatistics) {
411 Atomic::inc(BiasedLocking::slow_path_entry_count_addr()); 411 Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
422 ObjectSynchronizer::slow_enter(h_obj, lock, THREAD); 422 ObjectSynchronizer::slow_enter(h_obj, lock, THREAD);
423 } else { 423 } else {
424 ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD); 424 ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD);
425 } 425 }
426 } 426 }
427 if (TraceJVMCI >= 3) { 427 TRACE_jvmci_3("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj));
428 tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj));
429 }
430 JRT_END 428 JRT_END
431 429
432 JRT_LEAF(void, JVMCIRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock)) 430 JRT_LEAF(void, JVMCIRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock))
433 assert(thread == JavaThread::current(), "threads must correspond"); 431 assert(thread == JavaThread::current(), "threads must correspond");
434 assert(thread->last_Java_sp(), "last_Java_sp must be set"); 432 assert(thread->last_Java_sp(), "last_Java_sp must be set");
451 // When using fast locking, the compiled code has already tried the fast case 449 // When using fast locking, the compiled code has already tried the fast case
452 ObjectSynchronizer::slow_exit(obj, lock, THREAD); 450 ObjectSynchronizer::slow_exit(obj, lock, THREAD);
453 } else { 451 } else {
454 ObjectSynchronizer::fast_exit(obj, lock, THREAD); 452 ObjectSynchronizer::fast_exit(obj, lock, THREAD);
455 } 453 }
456 if (TraceJVMCI >= 3) { 454 IF_TRACE_jvmci_3 {
457 char type[O_BUFLEN]; 455 char type[O_BUFLEN];
458 obj->klass()->name()->as_C_string(type, O_BUFLEN); 456 obj->klass()->name()->as_C_string(type, O_BUFLEN);
459 tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock)); 457 TRACE_jvmci_3("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock));
460 tty->flush(); 458 tty->flush();
461 } 459 }
462 JRT_END 460 JRT_END
463 461
464 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, jint flags)) 462 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, jint flags))