Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11526. Memory leak in Bzip2Compressor and Bzip2Decompressor. Contributed by Anu Engineer. 

(cherry picked from commit 6583ad148b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
This commit is contained in:
cnauroth 2015-02-05 16:53:34 -08:00
parent 44d800b353
commit a9ea7cff31
3 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -491,6 +491,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that
causes incorrect results. (Sangjin Lee via junping_du)
HADOOP-11526. Memory leak in Bzip2Compressor and Bzip2Decompressor.
(Anu Engineer via cnauroth)
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES

28
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/bzip2/Bzip2Compressor.c
View File

@ -43,15 +43,25 @@ JNIEXPORT void JNICALL
Java_org_apache_hadoop_io_compress_bzip2_Bzip2Compressor_initIDs(
JNIEnv *env, jclass class, jstring libname)
{
const char* bzlib_name = (*env)->GetStringUTFChars(env, libname, NULL);
if (strcmp(bzlib_name, "system-native") == 0)
bzlib_name = HADOOP_BZIP2_LIBRARY;
const char *bzlib_name = NULL;
const char *java_lib_name = (*env)->GetStringUTFChars(env, libname, NULL);
if (java_lib_name == NULL) {
// Java code will get OutOfMemoryException thrown by GetStringUTFChars
goto cleanup;
}
if (strcmp(java_lib_name, "system-native") == 0) {
bzlib_name = HADOOP_BZIP2_LIBRARY;
} else {
bzlib_name = java_lib_name;
}
// Load the native library.
void *libbz2 = dlopen(bzlib_name, RTLD_LAZY | RTLD_GLOBAL);
if (!libbz2) {
THROW(env, "java/lang/UnsatisfiedLinkError",
"Cannot load bzip2 native library");
return;
goto cleanup;
}
// Locate the requisite symbols from libbz2.so.
@ -83,6 +93,11 @@ Java_org_apache_hadoop_io_compress_bzip2_Bzip2Compressor_initIDs(
"Ljava/nio/Buffer;");
Bzip2Compressor_directBufferSize = (*env)->GetFieldID(env, class,
"directBufferSize", "I");
cleanup:
if(java_lib_name != NULL) {
(*env)->ReleaseStringUTFChars(env,libname,java_lib_name);
java_lib_name = NULL;
}
}
JNIEXPORT jlong JNICALL
@ -234,9 +249,10 @@ Java_org_apache_hadoop_io_compress_bzip2_Bzip2Compressor_end(
{
if (dlsym_BZ2_bzCompressEnd(BZSTREAM(stream)) != BZ_OK) {
THROW(env, "java/lang/InternalError", NULL);
} else {
free(BZSTREAM(stream));
}
free(BZSTREAM(stream));
}
JNIEXPORT jstring JNICALL

28
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/bzip2/Bzip2Decompressor.c
View File

@ -42,15 +42,25 @@ JNIEXPORT void JNICALL
Java_org_apache_hadoop_io_compress_bzip2_Bzip2Decompressor_initIDs(
JNIEnv *env, jclass class, jstring libname)
{
const char* bzlib_name = (*env)->GetStringUTFChars(env, libname, NULL);
if (strcmp(bzlib_name, "system-native") == 0)
bzlib_name = HADOOP_BZIP2_LIBRARY;
const char *bzlib_name = NULL;
const char *java_lib_name = (*env)->GetStringUTFChars(env, libname, NULL);
if (java_lib_name == NULL) {
// Java code will get OutOfMemoryException thrown by GetStringUTFChars
goto cleanup;
}
if (strcmp(java_lib_name, "system-native") == 0) {
bzlib_name = HADOOP_BZIP2_LIBRARY;
} else {
bzlib_name = java_lib_name;
}
// Load the native library.
void *libbz2 = dlopen(bzlib_name, RTLD_LAZY | RTLD_GLOBAL);
if (!libbz2) {
THROW(env, "java/lang/UnsatisfiedLinkError",
"Cannot load bzip2 native library");
return;
goto cleanup;
}
// Locate the requisite symbols from libbz2.so.
@ -80,6 +90,11 @@ Java_org_apache_hadoop_io_compress_bzip2_Bzip2Decompressor_initIDs(
"Ljava/nio/Buffer;");
Bzip2Decompressor_directBufferSize = (*env)->GetFieldID(env, class,
"directBufferSize", "I");
cleanup:
if(java_lib_name != NULL) {
(*env)->ReleaseStringUTFChars(env,libname,java_lib_name);
java_lib_name = NULL;
}
}
JNIEXPORT jlong JNICALL
@ -237,9 +252,10 @@ Java_org_apache_hadoop_io_compress_bzip2_Bzip2Decompressor_end(
{
if (dlsym_BZ2_bzDecompressEnd(BZSTREAM(stream)) != BZ_OK) {
THROW(env, "java/lang/InternalError", 0);
} else {
free(BZSTREAM(stream));
}
free(BZSTREAM(stream));
}
/**