rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert temp logging.

This commit is contained in:
Nick Bolton 2013-04-11 05:09:17 +00:00
parent 7dcc1151c7
commit 90bd08d86c
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/server/CClientProxy.cpp
View File

@ -61,7 +61,6 @@ CClientProxy::getStream() const
CEvent::Type CEvent::Type
CClientProxy::getReadyEvent() CClientProxy::getReadyEvent()
{ {
LOG((CLOG_DEBUG4 "getReadyEvent"));
return EVENTQUEUE->registerTypeOnce(s_readyEvent, return EVENTQUEUE->registerTypeOnce(s_readyEvent,
"CClientProxy::ready"); "CClientProxy::ready");
} }
@ -69,7 +68,6 @@ CClientProxy::getReadyEvent()
CEvent::Type CEvent::Type
CClientProxy::getDisconnectedEvent() CClientProxy::getDisconnectedEvent()
{ {
LOG((CLOG_DEBUG4 "getDisconnectedEvent"));
return EVENTQUEUE->registerTypeOnce(s_disconnectedEvent, return EVENTQUEUE->registerTypeOnce(s_disconnectedEvent,
"CClientProxy::disconnected"); "CClientProxy::disconnected");
} }
@ -77,7 +75,6 @@ CClientProxy::getDisconnectedEvent()
CEvent::Type CEvent::Type
CClientProxy::getClipboardChangedEvent() CClientProxy::getClipboardChangedEvent()
{ {
LOG((CLOG_DEBUG4 "getClipboardChangedEvent"));
return EVENTQUEUE->registerTypeOnce(s_clipboardChangedEvent, return EVENTQUEUE->registerTypeOnce(s_clipboardChangedEvent,
"CClientProxy::clipboardChanged"); "CClientProxy::clipboardChanged");
} }

2
src/lib/server/CClientProxy1_3.cpp
View File

@ -89,7 +89,6 @@ CClientProxy1_3::addHeartbeatTimer()
{ {
// create and install a timer to periodically send keep alives // create and install a timer to periodically send keep alives
if (m_keepAliveRate > 0.0) { if (m_keepAliveRate > 0.0) {
LOG((CLOG_DEBUG4 "addHeartbeatTimer"));
m_keepAliveTimer = EVENTQUEUE->newTimer(m_keepAliveRate, NULL); m_keepAliveTimer = EVENTQUEUE->newTimer(m_keepAliveRate, NULL);
EVENTQUEUE->adoptHandler(CEvent::kTimer, m_keepAliveTimer, EVENTQUEUE->adoptHandler(CEvent::kTimer, m_keepAliveTimer,
new TMethodEventJob<CClientProxy1_3>(this, new TMethodEventJob<CClientProxy1_3>(this,
@ -105,7 +104,6 @@ CClientProxy1_3::removeHeartbeatTimer()
{ {
// remove the timer that sends keep alives periodically // remove the timer that sends keep alives periodically
if (m_keepAliveTimer != NULL) { if (m_keepAliveTimer != NULL) {
LOG((CLOG_DEBUG4 "removeHeartbeatTimer"));
EVENTQUEUE->removeHandler(CEvent::kTimer, m_keepAliveTimer); EVENTQUEUE->removeHandler(CEvent::kTimer, m_keepAliveTimer);
EVENTQUEUE->deleteTimer(m_keepAliveTimer); EVENTQUEUE->deleteTimer(m_keepAliveTimer);
m_keepAliveTimer = NULL; m_keepAliveTimer = NULL;

19
src/lib/server/CClientProxyUnknown.cpp
View File

@ -47,8 +47,7 @@ CClientProxyUnknown::CClientProxyUnknown(synergy::IStream* stream, double timeou
m_server(server) m_server(server)
{ {
assert(m_server != NULL); assert(m_server != NULL);
LOG((CLOG_DEBUG4 "CClientProxyUnknown"));
EVENTQUEUE->adoptHandler(CEvent::kTimer, this, EVENTQUEUE->adoptHandler(CEvent::kTimer, this,
new TMethodEventJob<CClientProxyUnknown>(this, new TMethodEventJob<CClientProxyUnknown>(this,
&CClientProxyUnknown::handleTimeout, NULL)); &CClientProxyUnknown::handleTimeout, NULL));
@ -86,7 +85,6 @@ CClientProxyUnknown::orphanClientProxy()
CEvent::Type CEvent::Type
CClientProxyUnknown::getSuccessEvent() CClientProxyUnknown::getSuccessEvent()
{ {
LOG((CLOG_DEBUG4 "getSuccessEvent"));
return EVENTQUEUE->registerTypeOnce(s_successEvent, return EVENTQUEUE->registerTypeOnce(s_successEvent,
"CClientProxy::success"); "CClientProxy::success");
} }
@ -94,7 +92,6 @@ CClientProxyUnknown::getSuccessEvent()
CEvent::Type CEvent::Type
CClientProxyUnknown::getFailureEvent() CClientProxyUnknown::getFailureEvent()
{ {
LOG((CLOG_DEBUG4 "getFailureEvent"));
return EVENTQUEUE->registerTypeOnce(s_failureEvent, return EVENTQUEUE->registerTypeOnce(s_failureEvent,
"CClientProxy::failure"); "CClientProxy::failure");
} }
@ -104,7 +101,6 @@ CClientProxyUnknown::sendSuccess()
{ {
m_ready = true; m_ready = true;
removeTimer(); removeTimer();
LOG((CLOG_DEBUG4 "sendSuccess"));
EVENTQUEUE->addEvent(CEvent(getSuccessEvent(), this)); EVENTQUEUE->addEvent(CEvent(getSuccessEvent(), this));
} }
@ -116,7 +112,6 @@ CClientProxyUnknown::sendFailure()
m_ready = false; m_ready = false;
removeHandlers(); removeHandlers();
removeTimer(); removeTimer();
LOG((CLOG_DEBUG4 "sendFailure"));
EVENTQUEUE->addEvent(CEvent(getFailureEvent(), this)); EVENTQUEUE->addEvent(CEvent(getFailureEvent(), this));
} }
@ -124,8 +119,7 @@ void
CClientProxyUnknown::addStreamHandlers() CClientProxyUnknown::addStreamHandlers()
{ {
assert(m_stream != NULL); assert(m_stream != NULL);
LOG((CLOG_DEBUG4 "addStreamHandlers"));
EVENTQUEUE->adoptHandler(m_stream->getInputReadyEvent(), EVENTQUEUE->adoptHandler(m_stream->getInputReadyEvent(),
m_stream->getEventTarget(), m_stream->getEventTarget(),
new TMethodEventJob<CClientProxyUnknown>(this, new TMethodEventJob<CClientProxyUnknown>(this,
@ -148,8 +142,7 @@ void
CClientProxyUnknown::addProxyHandlers() CClientProxyUnknown::addProxyHandlers()
{ {
assert(m_proxy != NULL); assert(m_proxy != NULL);
LOG((CLOG_DEBUG4 "addProxyHandlers"));
EVENTQUEUE->adoptHandler(CClientProxy::getReadyEvent(), EVENTQUEUE->adoptHandler(CClientProxy::getReadyEvent(),
m_proxy, m_proxy,
new TMethodEventJob<CClientProxyUnknown>(this, new TMethodEventJob<CClientProxyUnknown>(this,
@ -164,7 +157,6 @@ void
CClientProxyUnknown::removeHandlers() CClientProxyUnknown::removeHandlers()
{ {
if (m_stream != NULL) { if (m_stream != NULL) {
LOG((CLOG_DEBUG4 "removeHandlers"));
EVENTQUEUE->removeHandler(m_stream->getInputReadyEvent(), EVENTQUEUE->removeHandler(m_stream->getInputReadyEvent(),
m_stream->getEventTarget()); m_stream->getEventTarget());
EVENTQUEUE->removeHandler(m_stream->getOutputErrorEvent(), EVENTQUEUE->removeHandler(m_stream->getOutputErrorEvent(),
@ -175,7 +167,6 @@ CClientProxyUnknown::removeHandlers()
m_stream->getEventTarget()); m_stream->getEventTarget());
} }
if (m_proxy != NULL) { if (m_proxy != NULL) {
LOG((CLOG_DEBUG4 "removeHandlers"));
EVENTQUEUE->removeHandler(CClientProxy::getReadyEvent(), EVENTQUEUE->removeHandler(CClientProxy::getReadyEvent(),
m_proxy); m_proxy);
EVENTQUEUE->removeHandler(CClientProxy::getDisconnectedEvent(), EVENTQUEUE->removeHandler(CClientProxy::getDisconnectedEvent(),
@ -187,7 +178,6 @@ void
CClientProxyUnknown::removeTimer() CClientProxyUnknown::removeTimer()
{ {
if (m_timer != NULL) { if (m_timer != NULL) {
LOG((CLOG_DEBUG4 "removeTimer"));
EVENTQUEUE->deleteTimer(m_timer); EVENTQUEUE->deleteTimer(m_timer);
EVENTQUEUE->removeHandler(CEvent::kTimer, this); EVENTQUEUE->removeHandler(CEvent::kTimer, this);
m_timer = NULL; m_timer = NULL;
@ -224,8 +214,7 @@ CClientProxyUnknown::handleData(const CEvent&, void*)
// may install its own handlers and we don't want to accidentally // may install its own handlers and we don't want to accidentally
// remove those later. // remove those later.
removeHandlers(); removeHandlers();
LOG((CLOG_DEBUG4 "handleData"));
// create client proxy for highest version supported by the client // create client proxy for highest version supported by the client
if (major == 1) { if (major == 1) {
switch (minor) { switch (minor) {

1
tools/CMakeLists.txt
View File

@ -53,6 +53,7 @@ if (UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe")
if (APPLE) if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386")
if (DARWIN_VERSION GREATER 10) if (DARWIN_VERSION GREATER 10)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare")
endif() endif()