- MFH:

 - remove double lock (tween colors cache is created in each thread, the
   cache mutex is already locked earlier)
 - #40858, other TS improvements for gd freetype cache management
   cache initialization and shutdown is now done in MINIT and MSHUTDOWN.

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index aae67cbd5aa15a5b981dd30272ec74e7712c8d24..509d97aeae35a2983677e3ac3cf3eb78dde9c1fb 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -284,6 +284,7 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
   PHP_CHECK_LIBRARY(gd, gdCacheCreate,          [AC_DEFINE(HAVE_GD_CACHE_CREATE,     1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,    [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdFreeFontCache,        [AC_DEFINE(HAVE_GD_FREEFONTCACHE,    1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdFontCacheMutexSetup,  [AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,      [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
 ])
 
@@ -336,6 +337,7 @@ dnl These are always available with bundled library
   AC_DEFINE(HAVE_GD_GIF_CREATE,       1, [ ])
   AC_DEFINE(HAVE_GD_IMAGEELLIPSE,     1, [ ])
   AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
+  AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])
   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
   AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])
 

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 56e0f9e40585357459fbff26c430f22be49e4e4c..f738863b74cf665cd3788b4ff69169ec23481f64 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1147,11 +1147,7 @@ zend_module_entry gd_module_entry = {
        "gd",
        gd_functions,
        PHP_MINIT(gd),
-#if HAVE_LIBT1
        PHP_MSHUTDOWN(gd),
-#else
-       NULL,
-#endif
        NULL,
 #if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)
        PHP_RSHUTDOWN(gd),
@@ -1195,16 +1191,20 @@ static void php_free_gd_font(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 }
 /* }}} */
 
-#if HAVE_LIBT1
+
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
 PHP_MSHUTDOWN_FUNCTION(gd)
 {
+#if HAVE_LIBT1
        T1_CloseLib();
+#endif
+#if HAVE_GD_FONTMUTEX
+       gdFontCacheMutexShutdown();
+#endif
        return SUCCESS;
 }
 /* }}} */
-#endif
 
 
 /* {{{ PHP_MINIT_FUNCTION
@@ -1213,6 +1213,9 @@ PHP_MINIT_FUNCTION(gd)
 {
        le_gd = zend_register_list_destructors_ex(php_free_gd_image, NULL, "gd", module_number);
        le_gd_font = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number);
+#if HAVE_GD_FONTMUTEX
+       gdFontCacheMutexSetup();
+#endif
 #if HAVE_LIBT1
        T1_SetBitmapPad(8);
        T1_InitLib(NO_LOGFILE | IGNORE_CONFIGFILE | IGNORE_FONTDATABASE);

diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index 751a1e74e857b6db7a31424ed736c89ada2e5368..09accd78b3ba2c899f5dd8df4e020c4dd9109e00 100644 (file)
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -301,6 +301,14 @@ void gdImageStringUp(gdImagePtr im, gdFontPtr f, int x, int y, unsigned char *s,
 void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
 void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
 
+/*
+ * The following functions are required to be called prior to the
+ * use of any sort of threads in a module load / shutdown function
+ * respectively.
+ */
+void gdFontCacheMutexSetup();
+void gdFontCacheMutexShutdown();
+
 /* 2.0.16: for thread-safe use of gdImageStringFT and friends,
  * call this before allowing any thread to call gdImageStringFT.
  * Otherwise it is invoked by the first thread to invoke

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 499de8637b2d51036efaa1f073c6ce05312178d9..414f5e28ebbace5d469e1b952bb73fd5295dbe0d 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -698,10 +698,8 @@ static char * gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImage * im, int fg,
                                } else {
                                        /* find antialised color */
                                        tc_key.bgcolor = *pixel;
-                                       gdMutexLock(gdFontCacheMutex);
                                        tc_elem = (tweencolor_t *) gdCacheGet(tc_cache, &tc_key);
                                        *pixel = tc_elem->tweencolor;
-                                       gdMutexUnlock(gdFontCacheMutex);
                                }
                        }
                }
@@ -722,7 +720,6 @@ void gdFontCacheShutdown()
                gdCacheDelete(fontCache);
                fontCache = NULL;
                gdMutexUnlock(gdFontCacheMutex);
-               gdMutexShutdown(gdFontCacheMutex);
                FT_Done_FreeType(library);
        }
 }
@@ -732,15 +729,23 @@ void gdFreeFontCache()
        gdFontCacheShutdown();
 }
 
+void gdFontCacheMutexSetup()
+{
+       gdMutexSetup(gdFontCacheMutex);
+}
+
+void gdFontCacheMutexShutdown()
+{
+       gdMutexShutdown(gdFontCacheMutex);
+}
+
 int gdFontCacheSetup(void)
 {
        if (fontCache) {
                /* Already set up */
                return 0;
        }
-       gdMutexSetup(gdFontCacheMutex);
        if (FT_Init_FreeType(&library)) {
-               gdMutexShutdown(gdFontCacheMutex);
                return -1;
        }
        fontCache = gdCacheCreate (FONTCACHESIZE, fontTest, fontFetch, fontRelease);
@@ -803,15 +808,16 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
 
        /***** initialize font library and font cache on first call ******/
 
+       gdMutexLock(gdFontCacheMutex);
        if (!fontCache) {
                if (gdFontCacheSetup() != 0) {
                        gdCacheDelete(tc_cache);
+                       gdMutexUnlock(gdFontCacheMutex);
                        return "Failure to initialize font library";
                }
        }
        /*****/
 
-       gdMutexLock(gdFontCacheMutex);
        /* get the font (via font cache) */
        fontkey.fontlist = fontlist;
        fontkey.library = &library;

diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index 11c92879a4d9cc8b56a4503c6b408e5a195f83b1..a3fdc4aa5f9424df1329783c422420156b314907 100644 (file)
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -66,9 +66,7 @@ extern zend_module_entry gd_module_entry;
 /* gd.c functions */
 PHP_MINFO_FUNCTION(gd);
 PHP_MINIT_FUNCTION(gd);
-#if HAVE_LIBT1
 PHP_MSHUTDOWN_FUNCTION(gd);
-#endif
 #if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd);
 #endif