[oe-commits] Zhai Edwin : libical: Fix deadlock in pthread
git at git.openembedded.org
git at git.openembedded.org
Fri Dec 16 16:10:49 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 584abc5f3d6cbaf8f8bf09123e8abc421f0699a8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=584abc5f3d6cbaf8f8bf09123e8abc421f0699a8
Author: Zhai Edwin <edwin.zhai at intel.com>
Date: Fri Dec 16 15:53:23 2011 +0800
libical: Fix deadlock in pthread
libical introduce pthread support after 0.47, but lead deadlock with missing
some unlock code. This makes dates start hang.
Add new patch to properly release mutex.
[YOCTO #1825] got fixed.
Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-sato/libical/files/pthread-fix.patch | 52 +++++++++++++++++++++
meta/recipes-sato/libical/libical_0.47.bb | 5 ++-
2 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-sato/libical/files/pthread-fix.patch b/meta/recipes-sato/libical/files/pthread-fix.patch
new file mode 100644
index 0000000..aa7767f
--- /dev/null
+++ b/meta/recipes-sato/libical/files/pthread-fix.patch
@@ -0,0 +1,52 @@
+New added pthread feathre leads some deadlock with some unlock code missing.
+This patch fix it.
+
+Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
+
+Upstream-Status: Pending
+
+Index: libical-0.47/src/libical/icaltimezone.c
+===================================================================
+--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800
++++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800
+@@ -1773,7 +1773,7 @@
+ filename = (char*) malloc (filename_len);
+ if (!filename) {
+ icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+- return;
++ goto out;
+ }
+
+ snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
+@@ -1783,7 +1783,7 @@
+ free (filename);
+ if (!fp) {
+ icalerror_set_errno(ICAL_FILE_ERROR);
+- return;
++ goto out;
+ }
+
+
+@@ -1807,7 +1807,7 @@
+
+ if (!subcomp) {
+ icalerror_set_errno(ICAL_PARSE_ERROR);
+- return;
++ goto out;
+ }
+
+ icaltimezone_get_vtimezone_properties (zone, subcomp);
+@@ -1817,10 +1817,12 @@
+ icalcomponent_free(comp);
+ }
+ #endif
+-#ifdef HAVE_PTHREAD
++
+ out:
++#ifdef HAVE_PTHREAD
+ pthread_mutex_unlock(&builtin_mutex);
+ #endif
++ return;
+ }
+
+
diff --git a/meta/recipes-sato/libical/libical_0.47.bb b/meta/recipes-sato/libical/libical_0.47.bb
index d711d5f..ee4351a 100644
--- a/meta/recipes-sato/libical/libical_0.47.bb
+++ b/meta/recipes-sato/libical/libical_0.47.bb
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
SECTION = "libs"
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\
+ file://pthread-fix.patch"
SRC_URI[md5sum] = "21f7f8a21e3d857c9476be732e52dc32"
SRC_URI[sha256sum] = "af4cbb4bb13d9ed3f2262181da9199823feba70802b15cc3e89b263d95da2888"
More information about the Openembedded-commits
mailing list