Second Life viewer sources 1.15.1.3

1 files changed, 37 insertions, 7 deletions

diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 9ea7272..d7fc54e 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -29,9 +29,8 @@
  */
 
 #include "linden_common.h"
-#include "lliohttpserver.h"
 
-#include "boost/tokenizer.hpp"
+#include "lliohttpserver.h"
 
 #include "llapr.h"
 #include "llbuffer.h"
@@ -46,9 +45,12 @@
 #include "llsd.h"
 #include "llsdserialize_xml.h"
 #include "llstl.h"
+#include "lltimer.h"
 
 #include <sstream>
 
+#include "boost/tokenizer.hpp"
+
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
 static const std::string CONTEXT_REQUEST("request");
 static const std::string HTTP_VERB_GET("GET");
@@ -56,6 +58,8 @@ static const std::string HTTP_VERB_PUT("PUT");
 static const std::string HTTP_VERB_POST("POST");
 static const std::string HTTP_VERB_DELETE("DELETE");
 
+static LLIOHTTPServer::timing_callback_t sTimingCallback = NULL;
+static void* sTimingCallbackData = NULL;
 
 class LLHTTPPipe : public LLIOPipe
 {
@@ -151,6 +155,12 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                 // TODO: Babbage: Parameterize parser?
                 LLBufferStream istr(channels, buffer.get());
 
+                static LLTimer timer;
+                if (sTimingCallback)
+                {
+                        timer.reset();
+                }
+
                 std::string verb = context[CONTEXT_REQUEST]["verb"];
                 if(verb == HTTP_VERB_GET)
                 {
@@ -179,6 +189,18 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                     mResponse->methodNotAllowed();
                 }
 
+                if (sTimingCallback)
+                {
+                        LLHTTPNode::Description desc;
+                        mNode.describe(desc);
+                        LLSD info = desc.getInfo();
+                        std::string timing_name = info["description"];
+                        timing_name += " ";
+                        timing_name += verb;
+                        F32 delta = timer.getElapsedTimeF32();
+                        sTimingCallback(timing_name.c_str(), delta, sTimingCallbackData);
+                }
+
                 // Log Internal Server Errors
                 if(mStatusCode == 500)
                 {
@@ -819,9 +841,9 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 }
 
 
-
-void LLCreateHTTPPipe(LLPumpIO::chain_t& chain,
-                const LLHTTPNode& root, const LLSD& ctx)
+// static 
+void LLIOHTTPServer::createPipe(LLPumpIO::chain_t& chain, 
+        const LLHTTPNode& root, const LLSD& ctx)
 {
         chain.push_back(LLIOPipe::ptr_t(new LLHTTPResponder(root, ctx)));
 }
@@ -832,7 +854,7 @@ class LLHTTPResponseFactory : public LLChainIOFactory
 public:
         bool build(LLPumpIO::chain_t& chain, LLSD ctx) const
         {
-                LLCreateHTTPPipe(chain, mTree, ctx);
+                LLIOHTTPServer::createPipe(chain, mTree, ctx);
                 return true;
         }
 
@@ -843,7 +865,8 @@ private:
 };
 
 
-LLHTTPNode& LLCreateHTTPServer(
+// static
+LLHTTPNode& LLIOHTTPServer::create(
         apr_pool_t* pool, LLPumpIO& pump, U16 port)
 {
         LLSocket::ptr_t socket = LLSocket::create(
@@ -867,3 +890,10 @@ LLHTTPNode& LLCreateHTTPServer(
         return factory->getRootNode();
 }
 
+// static
+void LLIOHTTPServer::setTimingCallback(timing_callback_t callback,
+                                                                           void* data)
+{
+        sTimingCallback = callback;
+        sTimingCallbackData = data;
+}