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

AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs.

Browse Source
This commit is contained in:
Shyotl
2011-09-20 22:08:48 -05:00
parent d917bf6b06
commit 244e30297f
25 changed files with 486 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llplugin/llplugininstance.cpp
View File

@@ -36,7 +36,7 @@
#include "linden_common.h"
#include "llplugininstance.h"
#include "aiaprpool.h"
#include "llaprpool.h"
/** Virtual destructor. */
LLPluginInstanceMessageListener::~LLPluginInstanceMessageListener()
@@ -85,7 +85,7 @@ int LLPluginInstance::load(std::string &plugin_file)
int result = apr_dso_load(&mDSOHandle,
plugin_file.c_str(),
AIAPRRootPool::get()());
LLAPRRootPool::get()());
if(result != APR_SUCCESS)
{
char buf[1024];

4
indra/llplugin/llpluginprocessparent.cpp
View File

@@ -52,7 +52,7 @@ LLPluginProcessParentOwner::~LLPluginProcessParentOwner()
bool LLPluginProcessParent::sUseReadThread = false;
apr_pollset_t *LLPluginProcessParent::sPollSet = NULL;
AIAPRPool LLPluginProcessParent::sPollSetPool;
LLAPRPool LLPluginProcessParent::sPollSetPool;
bool LLPluginProcessParent::sPollsetNeedsRebuild = false;
LLMutex *LLPluginProcessParent::sInstancesMutex;
std::list<LLPluginProcessParent*> LLPluginProcessParent::sInstances;
@@ -285,7 +285,7 @@ void LLPluginProcessParent::idle(void)
APR_INET,
0, // port 0 = ephemeral ("find me a port")
0,
AIAPRRootPool::get()());
LLAPRRootPool::get()());
if(ll_apr_warn_status(status))
{

4
indra/llplugin/llpluginprocessparent.h
View File

@@ -192,9 +192,9 @@ private:
static bool sUseReadThread;
apr_pollfd_t mPollFD;
AIAPRPool mPollFDPool;
LLAPRPool mPollFDPool;
static apr_pollset_t *sPollSet;
static AIAPRPool sPollSetPool;
static LLAPRPool sPollSetPool;
static bool sPollsetNeedsRebuild;
static LLMutex *sInstancesMutex;
static std::list<LLPluginProcessParent*> sInstances;

4
indra/llplugin/llpluginsharedmemory.h
View File

@@ -35,7 +35,7 @@
#ifndef LL_LLPLUGINSHAREDMEMORY_H
#define LL_LLPLUGINSHAREDMEMORY_H
#include "aiaprpool.h"
#include "llaprpool.h"
class LLPluginSharedMemoryPlatformImpl;
@@ -117,7 +117,7 @@ private:
bool close(void);
bool unlink(void);
AIAPRPool mPool;
LLAPRPool mPool;
std::string mName;
size_t mSize;
void *mMappedAddress;