svn merge -r113780:113785

svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732

QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge

1 files changed, 93 insertions, 0 deletions

diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h
new file mode 100644
index 0000000000..11c5cc07fc
--- /dev/null
+++ b/indra/llmessage/tests/networkio.h
@@ -0,0 +1,93 @@
+/**
+ * @file   networkio.h
+ * @author Nat Goodspeed
+ * @date   2009-01-09
+ * @brief  
+ * 
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * Copyright (c) 2009, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_NETWORKIO_H)
+#define LL_NETWORKIO_H
+
+#include "llmemory.h"               // LLSingleton
+#include "llapr.h"
+#include "llares.h"
+#include "llpumpio.h"
+#include "llhttpclient.h"
+
+/*****************************************************************************
+*   NetworkIO
+*****************************************************************************/
+// Doing this initialization in a class constructor makes sense. But we don't
+// want to redo it for each different test. Nor do we want to do it at static-
+// init time. Use the lazy, on-demand initialization we get from LLSingleton.
+class NetworkIO: public LLSingleton<NetworkIO>
+{
+public:
+    NetworkIO():
+        mServicePump(NULL),
+        mDone(false)
+    {
+        ll_init_apr();
+        if (! gAPRPoolp)
+        {
+            throw std::runtime_error("Can't initialize APR");
+        }
+
+        // Create IO Pump to use for HTTP Requests.
+        mServicePump = new LLPumpIO(gAPRPoolp);
+        LLHTTPClient::setPump(*mServicePump);
+        if (ll_init_ares() == NULL || !gAres->isInitialized())
+        {
+            throw std::runtime_error("Can't start DNS resolver");
+        }
+
+        // You can interrupt pump() without waiting the full timeout duration
+        // by posting an event to the LLEventPump named "done".
+        LLEventPumps::instance().obtain("done").listen("self",
+                                                       boost::bind(&NetworkIO::done, this, _1));
+    }
+
+    bool pump(F32 timeout=10)
+    {
+        // Reset the done flag so we don't pop out prematurely
+        mDone = false;
+        // Evidently the IO structures underlying LLHTTPClient need to be
+        // "pumped". Do some stuff normally performed in the viewer's main
+        // loop.
+        LLTimer timer;
+        while (timer.getElapsedTimeF32() < timeout)
+        {
+            if (mDone)
+            {
+//              std::cout << "NetworkIO::pump(" << timeout << "): breaking loop after "
+//                        << timer.getElapsedTimeF32() << " seconds\n";
+                return true;
+            }
+            pumpOnce();
+        }
+        return false;
+    }
+
+    void pumpOnce()
+    {
+        gAres->process();
+        mServicePump->pump();
+        mServicePump->callback();
+    }
+
+    bool done(const LLSD&)
+    {
+        mDone = true;
+        return false;
+    }
+
+private:
+    LLPumpIO* mServicePump;
+    bool mDone;
+};
+
+#endif /* ! defined(LL_NETWORKIO_H) */