summaryrefslogtreecommitdiff
path: root/src/plugin.cpp
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
commit43c84a48550f71455582915c4881241a5e360ec2 (patch)
tree7c0c9cc0c281973694e61118d17840050c5a48b5 /src/plugin.cpp
parent9fd0b94c600a451726e4b2124516afe3d32f13bc (diff)
parent5fbc293d6c63eb3e74f00ffa791b4f4abd3e10c2 (diff)
downloadmobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.gz
mobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.bz2
Merge branch 'master' into gles
Conflicts: src/plugin.cpp
Diffstat (limited to 'src/plugin.cpp')
-rw-r--r--src/plugin.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 2dabcbd..16dfa7d 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -154,7 +154,12 @@ dlloaderLoadPlugin (CompPlugin *p,
return false;
}
- dlhand = dlopen (file.c_str (), RTLD_LAZY | RTLD_GLOBAL);
+ int open_flags = RTLD_LAZY | RTLD_GLOBAL;
+#ifdef DEBUG
+ // Do not unload the library during dlclose.
+ open_flags |= RTLD_NODELETE;
+#endif
+ dlhand = dlopen (file.c_str (), open_flags);
if (dlhand)
{
PluginGetInfoProc getInfo;