IMP-590: Added a thread-safe and robust wrapper for APR pools.

See http://redmine.imprudenceviewer.org/issues/590

1 files changed, 5 insertions, 12 deletions

diff --git a/linden/indra/llmessage/llares.cpp b/linden/indra/llmessage/llares.cpp
index fe37fe8..5a6794e 100644
--- a/linden/indra/llmessage/llares.cpp
+++ b/linden/indra/llmessage/llares.cpp
@@ -43,6 +43,7 @@
 
 #include "llapr.h"
 #include "llares.h"
+#include "llscopedvolatileaprpool.h"
 
 #if defined(LL_WINDOWS)
 # define ns_c_in 1
@@ -463,11 +464,6 @@ void LLAres::search(const std::string &query, LLResType type,
 
 bool LLAres::process(U64 timeout)
 {
-        if (!gAPRPoolp)
-        {
-                ll_init_apr();
-        }
-
         int socks[ARES_GETSOCK_MAXNUM];
         apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
         apr_int32_t nsds = 0;   
@@ -481,10 +477,7 @@ bool LLAres::process(U64 timeout)
                 return nsds > 0;
         }
 
-        apr_status_t status;
-        LLAPRPool pool;
-        status = pool.getStatus() ;
-        ll_apr_assert_status(status);
+        LLScopedVolatileAPRPool scoped_pool;
 
         for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
         {
@@ -501,7 +494,7 @@ bool LLAres::process(U64 timeout)
 
                 apr_socket_t *aprSock = NULL;
 
-                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool.getAPRPool());
+                apr_status_t status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], scoped_pool);
                 if (status != APR_SUCCESS)
                 {
                         ll_apr_warn_status(status);
@@ -510,7 +503,7 @@ bool LLAres::process(U64 timeout)
 
                 aprFds[nactive].desc.s = aprSock;
                 aprFds[nactive].desc_type = APR_POLL_SOCKET;
-                aprFds[nactive].p = pool.getAPRPool();
+                aprFds[nactive].p = scoped_pool;
                 aprFds[nactive].rtnevents = 0;
                 aprFds[nactive].client_data = &socks[i];
 
@@ -519,7 +512,7 @@ bool LLAres::process(U64 timeout)
 
         if (nactive > 0)
         {
-                status = apr_poll(aprFds, nactive, &nsds, timeout);
+                apr_status_t status = apr_poll(aprFds, nactive, &nsds, timeout);
 
                 if (status != APR_SUCCESS && status != APR_TIMEUP)
                 {