From cadddcd0d34c03fc745db99a11168747c3ceab0a Mon Sep 17 00:00:00 2001
From: Daniel Sloof <goapsychadelic@gmail.com>
Date: Fri, 19 Jul 2013 10:19:09 -0700
Subject: [PATCH] enable ServiceData on OSX

- re-enable servicedata on OSX now that jemalloc is fixed

Closes #865
---
 hphp/runtime/server/http_request_handler.cpp | 10 +---------
 hphp/runtime/server/http_request_handler.h   |  2 --
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/hphp/runtime/server/http_request_handler.cpp b/hphp/runtime/server/http_request_handler.cpp
index 025354277..40fae646a 100644
--- a/hphp/runtime/server/http_request_handler.cpp
+++ b/hphp/runtime/server/http_request_handler.cpp
@@ -32,9 +32,7 @@
 #include "hphp/runtime/base/datetime.h"
 #include "hphp/runtime/debugger/debugger.h"
 #include "hphp/util/alloc.h"
-#ifndef __APPLE__
 #include "hphp/util/service_data.h"
-#endif
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,13 +45,9 @@ AccessLog HttpRequestHandler::s_accessLog(
 
 HttpRequestHandler::HttpRequestHandler()
     : m_pathTranslation(true)
-#ifndef __APPLE__
      ,m_requestTimedOutOnQueue(ServiceData::createTimeseries(
                                  "requests_timed_out_on_queue",
-                                 {ServiceData::StatsType::COUNT}))
-#endif
-{
-}
+                                 {ServiceData::StatsType::COUNT})) { }
 
 void HttpRequestHandler::sendStaticContent(Transport *transport,
                                            const char *data, int len,
@@ -151,9 +145,7 @@ void HttpRequestHandler::handleRequest(Transport *transport) {
 
     if (gettime_diff_us(queueTime, now) > requestTimeoutSeconds * 1000000) {
       transport->sendString("Service Unavailable", 503);
-#ifndef __APPLE__
       m_requestTimedOutOnQueue->addValue(1);
-#endif
       return;
     }
   }
diff --git a/hphp/runtime/server/http_request_handler.h b/hphp/runtime/server/http_request_handler.h
index 1ef581d48..83b83b9e3 100644
--- a/hphp/runtime/server/http_request_handler.h
+++ b/hphp/runtime/server/http_request_handler.h
@@ -48,9 +48,7 @@ public:
 
 private:
   bool m_pathTranslation;
-#ifndef __APPLE__
   ServiceData::ExportedTimeSeries* m_requestTimedOutOnQueue;
-#endif
 
   bool handleProxyRequest(Transport *transport, bool force);
   void sendStaticContent(Transport *transport, const char *data, int len,