Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct return type of JVM_Sleep() #17504

Merged
merged 1 commit into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions runtime/j9vm/jvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -5906,16 +5906,14 @@ JVM_GetInterfaceVersion(void)

/* jclass parameter 2 is apparently not used */

jint JNICALL
void JNICALL
JVM_Sleep(JNIEnv* env, jclass thread, jlong timeout)
{
Trc_SC_Sleep_Entry(env, thread, timeout);

(*env)->CallStaticVoidMethod(env, jlThread, sleepMID, timeout);

Trc_SC_Sleep_Exit(env);

return 0;
}


Expand Down
2 changes: 1 addition & 1 deletion runtime/redirector/forwarders.m4
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ _X(JVM_RegisterUnsafeMethods,JNICALL,true,void,JNIEnv *env, jclass unsafeClz)
_X(JVM_Send,JNICALL,true,jint,jint descriptor, const char *buffer, jint numBytes, jint flags)
_X(JVM_SendTo,JNICALL,true,jint,jint descriptor, const char *buffer, jint length, jint flags, const struct sockaddr *toAddr, int toLength)
_X(JVM_SetLength,JNICALL,true,jint,jint fd, jlong length)
_X(JVM_Sleep,JNICALL,true,jint,JNIEnv *env, jclass thread, jlong timeout)
_X(JVM_Sleep,JNICALL,true,void,JNIEnv *env, jclass thread, jlong timeout)
_X(JVM_Socket,JNICALL,true,jint,jint domain, jint type, jint protocol)
_X(JVM_SocketAvailable,JNICALL,true,jint,jint descriptor, jint *result)
_X(JVM_SocketClose,JNICALL,true,jint,jint descriptor)
Expand Down