enable ServiceData on OSX

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

Closes #865
Esse commit está contido em:
Daniel Sloof
2013-07-19 10:19:09 -07:00
commit de Sara Golemon
commit cadddcd0d3
2 arquivos alterados com 1 adições e 11 exclusões
+1 -9
Ver Arquivo
@@ -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;
}
}
-2
Ver Arquivo
@@ -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,