Skip to content
Permalink
Browse files
Remove stepControl_enable/disableStepping(). Get rid of broken assert…
… when single stepping. Some minor edits.
  • Loading branch information
plummercj committed Feb 27, 2021
1 parent 2b2d5f4 commit bcc8ffed79e72ecb2c41b2a2a4ac3b9a2e56a71a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
@@ -743,8 +743,7 @@ event_callback_helper(JNIEnv *env, EventInfo *evinfo)
* resources can be allocated. This must be done before
* grabbing any locks.
*/
eventBag = threadControl_onEventHandlerEntry(
eventSessionID, evinfo, currentException);
eventBag = threadControl_onEventHandlerEntry(eventSessionID, evinfo, currentException);
if ( eventBag == NULL ) {
jboolean invoking;
do {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,14 +86,6 @@ disableStepping(jthread thread)
}
}

void stepControl_enableStepping(jthread thread) {
enableStepping(thread);
}

void stepControl_disableStepping(jthread thread) {
disableStepping(thread);
}

static jvmtiError
getFrameLocation(jthread thread,
jclass *pclazz, jmethodID *pmethod, jlocation *plocation)
@@ -358,13 +350,12 @@ handleFramePopEvent(JNIEnv *env, EventInfo *evinfo,
* Resume stepping in the original frame.
*/
LOG_STEP(("handleFramePopEvent: starting singlestep, have methodEnter handler && depth==INTO && fromDepth >= afterPopDepth (%d>=%d)", fromDepth, afterPopDepth));
enableStepping(thread);
(void)eventHandler_free(step->methodEnterHandlerNode);
step->methodEnterHandlerNode = NULL;
} else {
LOG_STEP(("handleFramePopEvent: starting singlestep, have methodEnter handler && depth==INTO && fromDepth < afterPopDepth (%d<%d)", fromDepth, afterPopDepth));
JDI_ASSERT(fromDepth >= afterPopDepth);
}
enableStepping(thread);
(void)eventHandler_free(step->methodEnterHandlerNode);
step->methodEnterHandlerNode = NULL;
}
LOG_STEP(("handleFramePopEvent: finished"));
}
@@ -613,7 +604,7 @@ stepControl_handleStep(JNIEnv *env, jthread thread,
"installing event method enter handler");
}
}
LOG_STEP(("stepControl_handleStep: NotifyFramePop, (fromDepth currentDepth)(%d %d) ",
LOG_STEP(("stepControl_handleStep: NotifyFramePop (fromDepth=%d currentDepth=%d)",
fromDepth, currentDepth));

error = JVMTI_FUNC_PTR(gdata->jvmti,NotifyFramePop)
@@ -65,9 +65,6 @@ jvmtiError stepControl_endStep(jthread thread);
void stepControl_clearRequest(jthread thread, StepRequest *step);
void stepControl_resetRequest(jthread thread);

void stepControl_enableStepping(jthread thread);
void stepControl_disableStepping(jthread thread);

void stepControl_lock(void);
void stepControl_unlock(void);

0 comments on commit bcc8ffe

Please sign in to comment.