1 files changed, 17 insertions, 3 deletions

diff --git a/linden/indra/llmessage/lliohttpserver.h b/linden/indra/llmessage/lliohttpserver.h
index 64dce63..8a6c8d4 100644
--- a/linden/indra/llmessage/lliohttpserver.h
+++ b/linden/indra/llmessage/lliohttpserver.h
@@ -36,7 +36,12 @@
 
 class LLPumpIO;
 
-LLHTTPNode& LLCreateHTTPServer(apr_pool_t* pool, LLPumpIO& pump, U16 port);
+class LLIOHTTPServer
+{
+public:
+        typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data);
+
+        static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port);
         /**< Creates an HTTP wire server on the pump for the given TCP port.
          *
          *   Returns the root node of the new server.  Add LLHTTPNode instances
@@ -51,14 +56,23 @@ LLHTTPNode& LLCreateHTTPServer(apr_pool_t* pool, LLPumpIO& pump, U16 port);
          *   for example), use the helper templates below.
          */
  
-void LLCreateHTTPPipe(LLPumpIO::chain_t& chain,
-                const LLHTTPNode& root, const LLSD& ctx);
+        static void createPipe(LLPumpIO::chain_t& chain, 
+            const LLHTTPNode& root, const LLSD& ctx);
         /**< Create a pipe on the chain that handles HTTP requests.
          *   The requests are served by the node tree given at root.
          *
          *   This is primarily useful for unit testing.
          */
 
+        static void setTimingCallback(timing_callback_t callback, void* data);
+        /**< Register a callback function that will be called every time
+        *    a GET, PUT, POST, or DELETE is handled.
+        *
+        * This is used to time the LLHTTPNode handler code, which often hits
+        * the database or does other, slow operations. JC
+        */
+};
+
 /* @name Helper Templates
  *
  * These templates make it easy to create nodes that use thier own protocol