backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-09 07:22:21 +08:00
Code Issues Projects Releases Wiki Activity

moved onError() method to IScreenReceiver from IPrimaryScreenReceiver.

Browse Source 
also implemented onError in CClient which previously did not have
any way to handle display disconnection.
This commit is contained in:
crs
2002-07-16 16:52:26 +00:00
parent 0bfe12d6ab
commit 7c391a0f35
26 changed files with 114 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/CClient.cpp
View File

@@ -27,6 +27,7 @@ CClient::CClient(const CString& clientName) :
m_screen(NULL),
m_server(NULL),
m_camp(false),
m_session(NULL),
m_active(false),
m_rejected(true)
{
@@ -64,6 +65,13 @@ CClient::wasRejected() const
return m_rejected;
}
void
CClient::onError()
{
// close down session but don't wait too long
deleteSession(3.0);
}
void
CClient::onInfoChanged(const CClientInfo& info)
{
@@ -144,28 +152,31 @@ CClient::run()
log((CLOG_NOTE "starting client \"%s\"", m_name.c_str()));
// start server interactions
thread = new CThread(new TMethodJob<CClient>(
{
CLock lock(&m_mutex);
m_session = new CThread(new TMethodJob<CClient>(
this, &CClient::runSession));
}
// handle events
m_screen->run();
// clean up
deleteSession(thread);
deleteSession();
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
}
catch (XBase& e) {
log((CLOG_ERR "client error: %s", e.what()));
// clean up
deleteSession(thread);
deleteSession();
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
CLock lock(&m_mutex);
m_rejected = false;
}
catch (XThread&) {
// clean up
deleteSession(thread);
deleteSession();
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
throw;
}
@@ -173,7 +184,7 @@ CClient::run()
log((CLOG_DEBUG "unknown client error"));
// clean up
deleteSession(thread);
deleteSession();
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
throw;
}
@@ -424,11 +435,20 @@ CClient::runSession(void*)
}
void
CClient::deleteSession(CThread* thread)
CClient::deleteSession(double timeout)
{
// get session thread object
CThread* thread;
{
CLock lock(&m_mutex);
thread = m_session;
m_session = NULL;
}
// shut it down
if (thread != NULL) {
thread->cancel();
thread->wait();
thread->wait(timeout);
delete thread;
}
}