RFC: PR599: Plug-in mutex and memory leak

[Deepak Bhole]

Hi,

This patch fixes part of PR599. There is a patch attached in the bug but
I used a different approach to make it more consistent with other mutex
declarations instead:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=599

ChangeLog:
2012-05-23  Deepak Bhole <dbhole at redhat.com>

   PR599: Plug-in mutex and memory leak
   * plugin/icedteanp/IcedTeaNPPlugin.cc: Make vm_start_mutex static/global
   and initialize it at start.
   (start_jvm_if_needed): Make vm_start_mutex static/global and unlock if VM
   is already up.
   (NP_Shutdown): Free vm_start_mutex when shutting down.

OK for head?

Thanks,
Deepak
-------------- next part --------------
diff -r f6eddd071004 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed May 23 13:02:58 2012 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed May 23 14:53:20 2012 -0400
@@ -247,6 +247,10 @@
 // Global instance counter.
 // Mutex to protect plugin_instance_counter.
 static GMutex* plugin_instance_mutex = NULL;
+
+// Mutex to lock vm startup
+static GMutex* vm_start_mutex = g_mutex_new();
+
 // A global variable for reporting GLib errors.  This must be free'd
 // and set to NULL after each use.
 static GError* channel_error = NULL;
@@ -483,6 +487,7 @@
   if (jvm_up)
   {
       PLUGIN_DEBUG("JVM is up. Returning.\n");
+      g_mutex_unlock(vm_start_mutex);
       return;
   }
 
@@ -2359,13 +2364,19 @@
 {
   PLUGIN_DEBUG ("NP_Shutdown\n");
 
-  // Free mutex.
+  // Free mutexes
   if (plugin_instance_mutex)
     {
       g_mutex_free (plugin_instance_mutex);
       plugin_instance_mutex = NULL;
     }
 
+  if (vm_start_mutex)
+    {
+      g_mutex_free (vm_start_mutex);
+      vm_start_mutex = NULL;
+    }
+
   if (data_directory)
     {
       g_free (data_directory);