Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use LLAPRPool

Browse Source 
apr_pool_t* should not be used anywhere, except where a comment
explicitely says it's ok. This one apparently sneeked in in the
meantime.
This commit is contained in:
Aleric Inglewood
2012-03-06 17:04:05 +01:00
parent 0450358df3
commit c1133cb932
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llaprpool.cpp
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLAPRPool.cpp * @file llaprpool.cpp
* *
* Copyright (c) 2010, Aleric Inglewood. * Copyright (c) 2010, Aleric Inglewood.
* *

2
indra/llcommon/llaprpool.h
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLAPRPool.h * @file llaprpool.h
* @brief Implementation of LLAPRPool. * @brief Implementation of LLAPRPool.
* *
* Copyright (c) 2010, Aleric Inglewood. * Copyright (c) 2010, Aleric Inglewood.

23
indra/newview/llappviewerlinux_api_dbus.cpp
View File

@@ -38,6 +38,7 @@
#endif #endif
#include "linden_common.h" #include "linden_common.h"
#include "llaprpool.h"
extern "C" { extern "C" {
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
@@ -55,8 +56,8 @@ extern "C" {
#undef LL_DBUS_SYM #undef LL_DBUS_SYM
static bool sSymsGrabbed = false; static bool sSymsGrabbed = false;
static apr_pool_t *sSymDBUSDSOMemoryPool = NULL; static LLAPRPool sSymDBUSDSOMemoryPool; // Used for sSymDBUSDSOHandleG (and what it is pointing at?)
static apr_dso_handle_t *sSymDBUSDSOHandleG = NULL; static apr_dso_handle_t* sSymDBUSDSOHandleG = NULL;
bool grab_dbus_syms(std::string dbus_dso_name) bool grab_dbus_syms(std::string dbus_dso_name)
{ {
@@ -74,12 +75,12 @@ bool grab_dbus_syms(std::string dbus_dso_name)
#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##DBUSSYM, sSymDBUSDSOHandle, #DBUSSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #DBUSSYM); if (REQUIRED) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #DBUSSYM, (void*)ll##DBUSSYM);}while(0) #define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##DBUSSYM, sSymDBUSDSOHandle, #DBUSSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #DBUSSYM); if (REQUIRED) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #DBUSSYM, (void*)ll##DBUSSYM);}while(0)
//attempt to load the shared library //attempt to load the shared library
apr_pool_create(&sSymDBUSDSOMemoryPool, NULL); sSymDBUSDSOMemoryPool.create();
#ifdef LL_STANDALONE #ifdef LL_STANDALONE
void *dso_handle = dlopen(dbus_dso_name.c_str(), RTLD_NOW | RTLD_GLOBAL); void *dso_handle = dlopen(dbus_dso_name.c_str(), RTLD_NOW | RTLD_GLOBAL);
rv = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&sSymDBUSDSOHandle, rv = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&sSymDBUSDSOHandle,
dso_handle, sSymDBUSDSOMemoryPool); dso_handle, sSymDBUSDSOMemoryPool());
if ( APR_SUCCESS == rv ) if ( APR_SUCCESS == rv )
#else #else
@@ -113,6 +114,10 @@ bool grab_dbus_syms(std::string dbus_dso_name)
#undef LL_DBUS_SYM #undef LL_DBUS_SYM
sSymsGrabbed = rtn; sSymsGrabbed = rtn;
if (!sSymsGrabbed)
{
sSymDBUSDSOMemoryPool.destroy();
}
return rtn; return rtn;
} }
@@ -127,13 +132,9 @@ void ungrab_dbus_syms()
apr_dso_unload(sSymDBUSDSOHandleG); apr_dso_unload(sSymDBUSDSOHandleG);
sSymDBUSDSOHandleG = NULL; sSymDBUSDSOHandleG = NULL;
} }
if ( sSymDBUSDSOMemoryPool ) sSymDBUSDSOMemoryPool.destroy();
{
apr_pool_destroy(sSymDBUSDSOMemoryPool);
sSymDBUSDSOMemoryPool = NULL;
}
// NULL-out all of the symbols we'd grabbed // NULL-out all of the symbols we'd grabbed
#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{ll##DBUSSYM = NULL;}while(0) #define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{ll##DBUSSYM = NULL;}while(0)
#include "llappviewerlinux_api_dbus_syms_raw.inc" #include "llappviewerlinux_api_dbus_syms_raw.inc"