diff options
| -rw-r--r-- | debian/patches/libports-per-bucket-hashtable.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/debian/patches/libports-per-bucket-hashtable.patch b/debian/patches/libports-per-bucket-hashtable.patch index e1406f02..98d3f31d 100644 --- a/debian/patches/libports-per-bucket-hashtable.patch +++ b/debian/patches/libports-per-bucket-hashtable.patch @@ -1,4 +1,4 @@ -commit 74ecfb7e8b9249f60deaaf1f516d35a4f825b9dc +commit 60e4ccf4cfd4e67fa7b0a51d95d87a1791e34788 Author: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sat May 3 03:53:41 2014 +0200 @@ -51,7 +51,7 @@ index 142af98..de58b06 100644 return 0; } diff --git a/libports/bucket-iterate.c b/libports/bucket-iterate.c -index 38a9f7a..8a306f0 100644 +index 9230b1f..5a6a56b 100644 --- a/libports/bucket-iterate.c +++ b/libports/bucket-iterate.c @@ -35,11 +35,11 @@ _ports_bucket_class_iterate (struct port_bucket *bucket, @@ -68,7 +68,16 @@ index 38a9f7a..8a306f0 100644 return 0; } -@@ -60,7 +60,7 @@ _ports_bucket_class_iterate (struct port_bucket *bucket, +@@ -47,7 +47,7 @@ _ports_bucket_class_iterate (struct port_bucket *bucket, + p = malloc (nr_items * sizeof *p); + if (p == NULL) + { +- pthread_mutex_unlock (&_ports_lock); ++ pthread_mutex_unlock (&bucket->lock); + return ENOMEM; + } + +@@ -63,7 +63,7 @@ _ports_bucket_class_iterate (struct port_bucket *bucket, n++; } } @@ -342,7 +351,7 @@ index b5dcb3a..9134822 100644 + pthread_mutex_unlock (&_ports_global_lock); } diff --git a/libports/get-right.c b/libports/get-right.c -index 42bfa2b..e0c7853 100644 +index 42bfa2b..6fe68f5 100644 --- a/libports/get-right.c +++ b/libports/get-right.c @@ -29,11 +29,11 @@ ports_get_right (void *port) @@ -350,12 +359,12 @@ index 42bfa2b..e0c7853 100644 error_t err; - pthread_mutex_lock (&_ports_lock); -+ pthread_mutex_lock (&pi->bucket->lock); ++ pthread_mutex_lock (&_ports_global_lock); if (pi->port_right == MACH_PORT_NULL) { - pthread_mutex_unlock (&_ports_lock); -+ pthread_mutex_unlock (&pi->bucket->lock); ++ pthread_mutex_unlock (&_ports_global_lock); return MACH_PORT_NULL; } @@ -364,7 +373,7 @@ index 42bfa2b..e0c7853 100644 mach_port_deallocate (mach_task_self (), foo); } - pthread_mutex_unlock (&_ports_lock); -+ pthread_mutex_unlock (&pi->bucket->lock); ++ pthread_mutex_unlock (&_ports_global_lock); return pi->port_right; } diff --git a/libports/import-port.c b/libports/import-port.c |