Skip to content

v4.1.x: two cleanups #10407

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 24, 2022
Merged

v4.1.x: two cleanups #10407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b42a0c8
configure.ac: update directory space check
jsquyres Apr 8, 2022
1a10507
java: avoid name conflicts with jni.h
jsquyres Apr 8, 2022
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
23 changes: 2 additions & 21 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,29 +125,10 @@ AC_DEFUN([OMPI_CHECK_DIR_FOR_SPACES],[
AC_MSG_ERROR([Cannot continue.])])
])

AC_DEFUN([OMPI_CANONICALIZE_PATH],[
case $host_os in
darwin*)
# MacOS does not have "readlink -f" or realpath (at least as
# of MacOS Cataline / 10.15). Instead, use Python, because we
# know MacOS comes with a /usr/bin/python that has
# os.path.realpath.
$2=`/usr/bin/python -c 'import os; print os.path.realpath("'$1'")'`
;;
*)
$2=`readlink -f $1`
;;
esac
])

OMPI_CHECK_DIR_FOR_SPACES([$srcdir], [a], [source tree])
OMPI_CANONICALIZE_PATH([$srcdir], [ompi_dir])
OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [an], [absolute source tree])
OMPI_CANONICALIZE_PATH([.], [ompi_dir])
ompi_dir=`pwd`
OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [a], [build tree])
OMPI_CHECK_DIR_FOR_SPACES([$srcdir], [a], [source tree])
OMPI_CHECK_DIR_FOR_SPACES([$prefix], [a], [prefix])
OMPI_CANONICALIZE_PATH([$prefix], [ompi_dir])
OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [an], [absolute prefix])

opal_show_subtitle "Checking versions"

Expand Down
20 changes: 13 additions & 7 deletions ompi/mpi/java/c/mpi_Info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,20 @@ JNIEXPORT jlong JNICALL Java_mpi_Info_getNull(JNIEnv *env, jclass clazz)
return (jlong)MPI_INFO_NULL;
}

// At least some versions of jni.h have a global named "jvalue", and
// we get a compiler warning if we have a parameter or variable of the
// same name. So use "ljvalue" instead.
JNIEXPORT void JNICALL Java_mpi_Info_set(
JNIEnv *env, jobject jthis, jlong handle, jstring jkey, jstring jvalue)
JNIEnv *env, jobject jthis, jlong handle, jstring jkey, jstring ljvalue)
{
const char *key = (*env)->GetStringUTFChars(env, jkey, NULL),
*value = (*env)->GetStringUTFChars(env, jvalue, NULL);
const char *key = (*env)->GetStringUTFChars(env, jkey, NULL),
*value = (*env)->GetStringUTFChars(env, ljvalue, NULL);

int rc = MPI_Info_set((MPI_Info)handle, (char*)key, (char*)value);
ompi_java_exceptionCheck(env, rc);

(*env)->ReleaseStringUTFChars(env, jkey, key);
(*env)->ReleaseStringUTFChars(env, jvalue, value);
(*env)->ReleaseStringUTFChars(env, jkey, key);
(*env)->ReleaseStringUTFChars(env, ljvalue, value);
}

JNIEXPORT jstring JNICALL Java_mpi_Info_get(
Expand Down Expand Up @@ -83,9 +86,12 @@ JNIEXPORT jstring JNICALL Java_mpi_Info_get(
return NULL;
}

jstring jvalue = (*env)->NewStringUTF(env, value);
// At least some versions of jni.h have a global named "jvalue",
// and we get a compiler warning if we have a parameter or
// variable of the same name. So use "ljvalue" instead.
jstring ljvalue = (*env)->NewStringUTF(env, value);
free(value);
return jvalue;
return ljvalue;
}

JNIEXPORT void JNICALL Java_mpi_Info_delete(
Expand Down