1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
$FreeBSD$
This patch works around POSIX thread anomalies in the IcedTea6 plugin.
Somehow Linux can use mutexes and condition variables uninitialized.
--- icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-08-06 07:05:21.916103000 -0400
+++ icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-09-13 12:39:38.000000000 -0400
@@ -237,6 +237,7 @@ static guint appletviewer_watch_id = -1;
int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER;
// Functions prefixed by ITNP_ are instance functions. They are called
// by the browser and operate on instances of ITNPPluginData.
--- icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.h.orig 2010-08-06 07:05:21.942208000 -0400
+++ icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.h 2010-09-13 12:39:13.000000000 -0400
@@ -94,6 +94,7 @@ static pthread_t plugin_request_processo
// Condition on which the queue processor waits
extern pthread_cond_t cond_message_available;
+extern pthread_mutex_t wait_mutex;
// debug switch
extern int plugin_debug;
--- icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400
+++ icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-09-13 12:55:28.000000000 -0400
@@ -63,6 +63,11 @@ PluginRequestProcessor::PluginRequestPro
this->pendingRequests = new std::map<pthread_t, uintmax_t>();
internal_req_ref_counter = 0;
+ pthread_mutex_init(&message_queue_mutex, NULL);
+ pthread_mutex_init(&syn_write_mutex, NULL);
+ pthread_mutex_init(&tc_mutex, NULL);
+ pthread_mutex_init(&wait_mutex, NULL);
+ pthread_cond_init(&cond_message_available, NULL);
}
/**
@@ -77,6 +82,11 @@ PluginRequestProcessor::~PluginRequestPr
if (pendingRequests)
delete pendingRequests;
+ pthread_mutex_destroy(&message_queue_mutex);
+ pthread_mutex_destroy(&syn_write_mutex);
+ pthread_mutex_destroy(&tc_mutex);
+ pthread_mutex_destroy(&wait_mutex);
+ pthread_cond_destroy(&cond_message_available);
}
/**
@@ -709,7 +719,6 @@ queue_processor(void* data)
PluginRequestProcessor* processor = (PluginRequestProcessor*) data;
std::vector<std::string*>* message_parts = NULL;
std::string command;
- pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER; // This is needed for API compat. and is unused
PLUGIN_DEBUG("Queue processor initialized. Queue = %p\n", message_queue);
@@ -780,7 +789,9 @@ queue_processor(void* data)
} else
{
- pthread_cond_wait(&cond_message_available, &wait_mutex);
+ pthread_mutex_lock(&wait_mutex);
+ pthread_cond_wait(&cond_message_available, &wait_mutex);
+ pthread_mutex_unlock(&wait_mutex);
pthread_testcancel();
}
|
