From 3ad041eedeb550f126749bd0882ffc33d6d6e364 Mon Sep 17 00:00:00 2001 From: Andrey Starodubtsev Date: Thu, 16 Jun 2016 19:02:53 +0300 Subject: [PATCH] a lot of memory leak (local refs) fixed --- Lib/java/java.swg | 26 ++++++++++++++++---------- Lib/java/javahead.swg | 5 +++-- Lib/java/std_wstring.i | 8 ++++++-- Lib/java/typemaps.i | 26 ++++++++++++-------------- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Lib/java/java.swg b/Lib/java/java.swg index d763c5e6f..66f0a7f5d 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -363,11 +363,13 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0); bigint = JCALL3(NewObject, jenv, clazz, mid, ba); + JCALL1(DeleteLocalRef, jenv, ba); $result = bigint; } /* Convert to BigInteger (see out typemap) */ -%typemap(directorin, descriptor="Ljava/math/BigInteger;") unsigned long long, const unsigned long long & { +%typemap(directorin, descriptor="Ljava/math/BigInteger;") unsigned long long, const unsigned long long & %{ +{ jbyteArray ba = JCALL1(NewByteArray, jenv, 9); jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0); jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger"); @@ -382,8 +384,10 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0); bigint = JCALL3(NewObject, jenv, clazz, mid, ba); + JCALL1(DeleteLocalRef, jenv, ba); $input = bigint; } +Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(javadirectorin) unsigned long long "$jniinput" %typemap(javadirectorout) unsigned long long "$javacall" @@ -405,14 +409,14 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { } } -%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * { +%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * %{ $input = 0; if ($1) { $input = JCALL1(NewStringUTF, jenv, (const char *)$1); if (!$input) return $null; } Swig::LocalRefGuard $1_refguard(jenv, $input); -} +%} %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } %typemap(out, noblock=1) char * { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } @@ -611,6 +615,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0); bigint = JCALL3(NewObject, jenv, clazz, mid, ba); + JCALL1(DeleteLocalRef, jenv, ba); $result = bigint; } @@ -738,14 +743,14 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { } } -%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char[ANY], char[] { +%typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char[ANY], char[] %{ $input = 0; if ($1) { $input = JCALL1(NewStringUTF, jenv, (const char *)$1); if (!$input) return $null; } Swig::LocalRefGuard $1_refguard(jenv, $input); -} +%} %typemap(argout) char[ANY], char[] "" %typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } @@ -1351,11 +1356,12 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) %typemap(argout) (char *STRING, size_t LENGTH) { if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0); } -%typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) { - jbyteArray jb = (jenv)->NewByteArray((jsize)$2); - (jenv)->SetByteArrayRegion(jb, 0, (jsize)$2, (jbyte *)$1); - $input = jb; -} +%typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) %{ + jbyteArray $1_jb = (jenv)->NewByteArray((jsize)$2); + (jenv)->SetByteArrayRegion($1_jb, 0, (jsize)$2, (jbyte *)$1); + $input = $1_jb; + Swig::LocalRefGuard $1_refguard(jenv, $input); +%} %typemap(directorargout) (char *STRING, size_t LENGTH) %{(jenv)->GetByteArrayRegion($input, 0, (jsize)$2, (jbyte *)$1); (jenv)->DeleteLocalRef($input);%} diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index 685bba198..43f21f863 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -4,11 +4,11 @@ * Java support code * ----------------------------------------------------------------------------- */ - +%insert(runtime) %{ /* JNI function calls require different calling conventions for C and C++. These JCALL macros are used so * that the same typemaps can be used for generating code for both C and C++. The SWIG preprocessor can expand * the macros thereby generating the correct calling convention. It is thus essential that all typemaps that - * use the macros are not within %{ %} brackets as they won't be run through the SWIG preprocessor. */ + * use the macros are not within SWIG brackets as they won't be run through the SWIG preprocessor. */ #ifdef __cplusplus # define JCALL0(func, jenv) jenv->func() # define JCALL1(func, jenv, ar1) jenv->func(ar1) @@ -28,6 +28,7 @@ # define JCALL6(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6) # define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) #endif +%} %insert(runtime) %{ /* Fix for jlong on some versions of gcc on Windows */ diff --git a/Lib/java/std_wstring.i b/Lib/java/std_wstring.i index 12d8fc14f..0137a2da5 100644 --- a/Lib/java/std_wstring.i +++ b/Lib/java/std_wstring.i @@ -59,7 +59,8 @@ class wstring; jenv->ReleaseStringChars($input, $1_pstr); %} -%typemap(directorin,descriptor="Ljava/lang/String;") wstring { +%typemap(directorin,descriptor="Ljava/lang/String;") wstring %{ +{ jsize $1_len = $1.length(); jchar *conv_buf = new jchar[$1_len]; for (jsize i = 0; i < $1_len; ++i) { @@ -68,6 +69,7 @@ class wstring; $input = jenv->NewString(conv_buf, $1_len); delete [] conv_buf; } +Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(out) wstring %{jsize $1_len = $1.length(); @@ -136,7 +138,8 @@ class wstring; $result = &$1_str; jenv->ReleaseStringChars($input, $1_pstr); %} -%typemap(directorin,descriptor="Ljava/lang/String;") const wstring & { +%typemap(directorin,descriptor="Ljava/lang/String;") const wstring & %{ +{ jsize $1_len = $1.length(); jchar *conv_buf = new jchar[$1_len]; for (jsize i = 0; i < $1_len; ++i) { @@ -145,6 +148,7 @@ class wstring; $input = jenv->NewString(conv_buf, $1_len); delete [] conv_buf; } +Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(out) const wstring & %{jsize $1_len = $1->length(); diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index b3b08867b..db7dd063d 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -212,10 +212,9 @@ There are no char *OUTPUT typemaps, however you can apply the signed char * type JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &jvalue); } -%typemap(directorin,descriptor=JNIDESC) TYPE &OUTPUT, TYPE *OUTPUT -{ +%typemap(directorin,descriptor=JNIDESC) TYPE &OUTPUT, TYPE *OUTPUT %{ $input = JCALL1(New##JAVATYPE##Array, jenv, 1); -} + Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(directorargout) TYPE &OUTPUT { @@ -283,6 +282,7 @@ OUTPUT_TYPEMAP(double, jdouble, double, Double, "[D", jdoubleArray); JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0); bigint = JCALL3(NewObject, jenv, clazz, mid, ba); + JCALL1(DeleteLocalRef, jenv, ba); JCALL3(SetObjectArrayElement, jenv, $input, 0, bigint); } @@ -371,19 +371,17 @@ There are no char *INOUT typemaps, however you can apply the signed char * typem %typemap(argout) TYPE *INOUT, TYPE &INOUT { JCALL3(Release##JAVATYPE##ArrayElements, jenv, $input, (JNITYPE *)$1, 0); } -%typemap(directorin,descriptor=JNIDESC) TYPE &INOUT -{ - $input = JCALL1(New##JAVATYPE##Array, jenv, 1); - const JNITYPE jvalue = (JNITYPE)$1; - JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &jvalue); -} +%typemap(directorin,descriptor=JNIDESC) TYPE &INOUT %{ + $input = JCALL1(New##JAVATYPE##Array, jenv, 1); + const JNITYPE $1_jvalue = (JNITYPE)$1; + JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue); + Swig::LocalRefGuard $1_refguard(jenv, $input); %} -%typemap(directorin,descriptor=JNIDESC) TYPE *INOUT -{ +%typemap(directorin,descriptor=JNIDESC) TYPE *INOUT %{ $input = JCALL1(New##JAVATYPE##Array, jenv, 1); - const JNITYPE jvalue = (JNITYPE)*$1; - JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &jvalue); -} + const JNITYPE $1_jvalue = (JNITYPE)*$1; + JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &$1_jvalue); + Swig::LocalRefGuard $1_refguard(jenv, $input); %} %typemap(directorargout) TYPE &INOUT {