equal
deleted
inserted
replaced
492 </xsl:if> |
492 </xsl:if> |
493 <xsl:text> return JVMTI_ERROR_WRONG_PHASE; |
493 <xsl:text> return JVMTI_ERROR_WRONG_PHASE; |
494 }</xsl:text> |
494 }</xsl:text> |
495 |
495 |
496 <xsl:text> |
496 <xsl:text> |
497 Thread* this_thread = (Thread*)ThreadLocalStorage::thread(); </xsl:text> |
497 Thread* this_thread = Thread::current_or_null(); </xsl:text> |
498 |
498 |
499 <xsl:apply-templates select="." mode="transition"/> |
499 <xsl:apply-templates select="." mode="transition"/> |
500 </xsl:when> |
500 </xsl:when> |
501 <xsl:otherwise> |
501 <xsl:otherwise> |
502 <xsl:if test="contains(@phase,'onload')"> |
502 <xsl:if test="contains(@phase,'onload')"> |
526 } |
526 } |
527 </xsl:text> |
527 </xsl:text> |
528 </xsl:if> |
528 </xsl:if> |
529 <xsl:text> return JVMTI_ERROR_WRONG_PHASE; |
529 <xsl:text> return JVMTI_ERROR_WRONG_PHASE; |
530 } |
530 } |
531 Thread* this_thread = (Thread*)ThreadLocalStorage::thread(); </xsl:text> |
531 Thread* this_thread = Thread::current_or_null(); </xsl:text> |
532 <xsl:apply-templates select="." mode="transition"/> |
532 <xsl:apply-templates select="." mode="transition"/> |
533 </xsl:if> |
533 </xsl:if> |
534 </xsl:otherwise> |
534 </xsl:otherwise> |
535 </xsl:choose> |
535 </xsl:choose> |
536 |
536 |
556 <xsl:choose> |
556 <xsl:choose> |
557 <xsl:when test="count(@phase)=1 and not(contains(@phase,'live')) and not(contains(@phase,'start'))"> |
557 <xsl:when test="count(@phase)=1 and not(contains(@phase,'live')) and not(contains(@phase,'start'))"> |
558 <xsl:choose> |
558 <xsl:choose> |
559 <xsl:when test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))"> |
559 <xsl:when test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))"> |
560 <xsl:text> if (Threads::number_of_threads() != 0) { |
560 <xsl:text> if (Threads::number_of_threads() != 0) { |
561 Thread* this_thread = (Thread*)ThreadLocalStorage::thread();</xsl:text> |
561 Thread* this_thread = Thread::current_or_null();</xsl:text> |
562 </xsl:when> |
562 </xsl:when> |
563 <xsl:otherwise> |
563 <xsl:otherwise> |
564 |
564 |
565 <xsl:text> Thread* this_thread = NULL; |
565 <xsl:text> Thread* this_thread = NULL; |
566 bool transition; |
566 bool transition; |
567 if (Threads::number_of_threads() == 0) { |
567 if (Threads::number_of_threads() == 0) { |
568 transition = false; |
568 transition = false; |
569 } else { |
569 } else { |
570 this_thread = (Thread*)ThreadLocalStorage::thread(); |
570 this_thread = Thread::current_or_null(); |
571 transition = ((this_thread != NULL) && !this_thread->is_VM_thread() && !this_thread->is_ConcurrentGC_thread()); |
571 transition = ((this_thread != NULL) && !this_thread->is_VM_thread() && !this_thread->is_ConcurrentGC_thread()); |
572 } |
572 } |
573 if (transition) {</xsl:text> |
573 if (transition) {</xsl:text> |
574 </xsl:otherwise> |
574 </xsl:otherwise> |
575 |
575 |