Commit 33f4ead5 authored by Brian Cameron's avatar Brian Cameron

Minor fix for GTK+ mediaLib code.

After doing some performance analysis, it was found that the GTK+ mediaLib code
triggers unnecessary lazy loading of dependent libraries.  The current code
uses RTLD_DEFAULT, RTLD_PROBE, RTLD_NEXT, and RTLD_SELF.  However, RTLD_PROBE
is all that is necessary, and avoids triggering the lazy loading.  So this
commit fixes the code to just use RTLD_PROBE.  (Bug 580678)
parent dae20e25
......@@ -217,10 +217,7 @@ _pixops_use_medialib ()
* For x86 processors use of libumem conflicts with
* mediaLib, so avoid using it.
*/
if ((dlsym (RTLD_DEFAULT, "umem_alloc") != NULL) ||
(dlsym (RTLD_PROBE, "umem_alloc") != NULL) ||
(dlsym (RTLD_NEXT, "umem_alloc") != NULL) ||
(dlsym (RTLD_SELF, "umem_alloc") != NULL))
if (dlsym (RTLD_PROBE, "umem_alloc") != NULL)
{
use_medialib = FALSE;
return;
......
......@@ -104,10 +104,7 @@ _gdk_use_medialib (void)
* For x86 processors use of libumem conflicts with
* mediaLib, so avoid using it.
*/
if ((dlsym (RTLD_DEFAULT, "umem_alloc") != NULL) ||
(dlsym (RTLD_PROBE, "umem_alloc") != NULL) ||
(dlsym (RTLD_NEXT, "umem_alloc") != NULL) ||
(dlsym (RTLD_SELF, "umem_alloc") != NULL))
if (dlsym (RTLD_PROBE, "umem_alloc") != NULL)
{
return FALSE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment