/hg/icedtea-web: Fixed memory leak detector to correctly handle ...

[jvanek at icedtea.classpath.org]

changeset 8983d8c01896 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8983d8c01896
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jan 15 15:11:22 2014 +0100

	Fixed memory leak detector to correctly handle pre_init_messages queue.


diffstat:

 ChangeLog                                 |  9 +++++++++
 plugin/icedteanp/IcedTeaPluginUtils.cc    |  4 ++++
 plugin/icedteanp/IcedTeaPluginUtils.h     |  1 +
 tests/cpp-unit-tests/MemoryLeakDetector.h |  2 ++
 4 files changed, 16 insertions(+), 0 deletions(-)

diffs (53 lines):

diff -r 6d8b0bd9402f -r 8983d8c01896 ChangeLog
--- a/ChangeLog	Thu Jan 09 12:54:00 2014 -0500
+++ b/ChangeLog	Wed Jan 15 15:11:22 2014 +0100
@@ -1,3 +1,12 @@
+2014-01-15  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixed memory leak detector to correctly handle pre_init_messages queue.
+	* plugin/icedteanp/IcedTeaPluginUtils.cc: implemented (reset_pre_init_messages)
+	method.
+	* plugin/icedteanp/IcedTeaPluginUtils.h: declared (reset_pre_init_messages).
+	* tests/cpp-unit-tests/MemoryLeakDetector.h: (reset_global_state) called
+	(reset_pre_init_messages).	
+
 2014-01-09  Andrew Azores  <aazores at redhat.com>
 
 	* html-gen.sh: made more idiomatic and removed some bashisms
diff -r 6d8b0bd9402f -r 8983d8c01896 plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Thu Jan 09 12:54:00 2014 -0500
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Wed Jan 15 15:11:22 2014 +0100
@@ -85,6 +85,10 @@
   pthread_mutex_unlock(&debug_pipe_lock);
 }
 
+void reset_pre_init_messages(){
+    pre_jvm_message = std::queue<std::string>();
+  }
+
 /**
  * Given a context number, constructs a message prefix to send to Java
  *
diff -r 6d8b0bd9402f -r 8983d8c01896 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Thu Jan 09 12:54:00 2014 -0500
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Wed Jan 15 15:11:22 2014 +0100
@@ -68,6 +68,7 @@
 
 void *flush_pre_init_messages(void* data);
 void push_pre_init_messages(char * ldm);
+void reset_pre_init_messages();
 
 // debugging macro.
 #define initialize_debug()                                                    \
diff -r 6d8b0bd9402f -r 8983d8c01896 tests/cpp-unit-tests/MemoryLeakDetector.h
--- a/tests/cpp-unit-tests/MemoryLeakDetector.h	Thu Jan 09 12:54:00 2014 -0500
+++ b/tests/cpp-unit-tests/MemoryLeakDetector.h	Wed Jan 15 15:11:22 2014 +0100
@@ -75,6 +75,8 @@
         IcedTeaPluginUtilities::clearInstanceIDs();
         /* Clears allocations caused by storeObjectMapping */
         IcedTeaPluginUtilities::clearObjectMapping();
+        /*reset messages*/
+        reset_pre_init_messages();
     }
 
     int initial_cpp_allocations;