Attachment 602233 Details for Bug 845318 – Use the new GMutex API

[patch] Use the new GMutex API

icedtea-web-1.2-gmutex-fix.patch (text/plain), 2.95 KB, created by Zoltan Boszormenyi on 2012-08-04 09:43:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zoltan Boszormenyi

Created: 2012-08-04 09:43:17 UTC

Size: 2.95 KB

patch

obsolete

>--- icedtea-web-1.2/plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2012-03-05 17:04:20.000000000 +0100
>+++ icedtea-web-1.2/plugin/icedteanp/IcedTeaNPPlugin.cc	2012-08-04 10:58:30.631707122 +0200
>@@ -387,9 +387,9 @@
>   g_mutex_unlock (plugin_instance_mutex);
> 
>   // data->appletviewer_mutex
>-  data->appletviewer_mutex = g_mutex_new ();
>+  g_mutex_init(&data->appletviewer_mutex);
> 
>-  g_mutex_lock (data->appletviewer_mutex);
>+  g_mutex_lock(&data->appletviewer_mutex);
> 
>   // Documentbase retrieval.
>   documentbase = plugin_get_documentbase (instance);
>@@ -409,7 +409,7 @@
>       data->is_applet_instance = false;
>     }
> 
>-  g_mutex_unlock (data->appletviewer_mutex);
>+  g_mutex_unlock (&data->appletviewer_mutex);
> 
>   // If initialization succeeded entirely then we store the plugin
>   // data in the instance structure and return.  Otherwise we free the
>@@ -427,8 +427,7 @@
>   goto cleanup_done;
> 
>  cleanup_appletviewer_mutex:
>-  g_free (data->appletviewer_mutex);
>-  data->appletviewer_mutex = NULL;
>+  g_mutex_clear (&data->appletviewer_mutex);
> 
>   // cleanup_instance_string:
>   g_free (data->instance_id);
>@@ -763,7 +762,7 @@
> 
>           // Critical region.  Read data->appletviewer_mutex and send
>           // a message to the appletviewer.
>-          g_mutex_lock (data->appletviewer_mutex);
>+          g_mutex_lock (&data->appletviewer_mutex);
> 
>       if (jvm_up)
>         {
>@@ -808,7 +807,7 @@
>           PLUGIN_DEBUG ("ITNP_SetWindow: appletviewer is not running.\n");
>         }
> 
>-          g_mutex_unlock (data->appletviewer_mutex);
>+          g_mutex_unlock (&data->appletviewer_mutex);
>     }
>       else
>     {
>@@ -824,7 +823,7 @@
>       PLUGIN_DEBUG ("ITNP_SetWindow: setting window.\n");
> 
>       // Critical region.  Send messages to appletviewer.
>-      g_mutex_lock (data->appletviewer_mutex);
>+      g_mutex_lock (&data->appletviewer_mutex);
> 
>       // Store the window handle and dimensions
>       data->window_handle = window->window;
>@@ -836,7 +835,7 @@
>     		  data->instance_id, (gulong) data->window_handle,
>     		  data->window_width, data->window_height, data->applet_tag);
> 
>-      g_mutex_unlock (data->appletviewer_mutex);
>+      g_mutex_unlock (&data->appletviewer_mutex);
> 
>     }
> 
>@@ -2000,8 +1999,7 @@
>   tofree->window_width = 0;
> 
>   // cleanup_appletviewer_mutex:
>-  g_free (tofree->appletviewer_mutex);
>-  tofree->appletviewer_mutex = NULL;
>+  g_mutex_clear (&tofree->appletviewer_mutex);
> 
>   // cleanup_instance_string:
>   g_free (tofree->instance_id);
>--- icedtea-web-1.2/plugin/icedteanp/IcedTeaNPPlugin.h.orig	2012-03-02 22:45:39.000000000 +0100
>+++ icedtea-web-1.2/plugin/icedteanp/IcedTeaNPPlugin.h	2012-08-04 10:55:07.839376370 +0200
>@@ -69,7 +69,7 @@
>   // The applet tag sent to Java side
>   gchar* applet_tag;
>   // Mutex to protect appletviewer_alive.
>-  GMutex* appletviewer_mutex;
>+  GMutex appletviewer_mutex;
>   // Back-pointer to the plugin instance to which this data belongs.
>   // This should not be freed but instead simply set to NULL.
>   NPP owner;

Actions: View | Diff

Attachments on bug 845318: 602232 | 602233