Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no changes, just reformat and avoid unnecessary uses of wxString::Format()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-01 23:49:07 +00:00
parent 6e1f851b17
commit e2bcc7813c
1 changed files with 147 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
samples/sockets/baseserver.cpp
View File

@@ -26,69 +26,49 @@
#include "wx/timer.h" #include "wx/timer.h"
#include "wx/thread.h" #include "wx/thread.h"
wxChar* GetSocketErrorMsg(int pSockError) const char *GetSocketErrorMsg(int pSockError)
{ {
switch(pSockError) switch(pSockError)
{ {
case wxSOCKET_NOERROR: case wxSOCKET_NOERROR:
return wxT("wxSOCKET_NOERROR"); return "wxSOCKET_NOERROR";
break;
case wxSOCKET_INVOP: case wxSOCKET_INVOP:
return wxT("wxSOCKET_INVOP"); return "wxSOCKET_INVOP";
break;
case wxSOCKET_IOERR: case wxSOCKET_IOERR:
return wxT("wxSOCKET_IOERR"); return "wxSOCKET_IOERR";
break;
case wxSOCKET_INVADDR: case wxSOCKET_INVADDR:
return wxT("wxSOCKET_INVADDR"); return "wxSOCKET_INVADDR";
break;
case wxSOCKET_NOHOST: case wxSOCKET_NOHOST:
return wxT("wxSOCKET_NOHOST"); return "wxSOCKET_NOHOST";
break;
case wxSOCKET_INVPORT: case wxSOCKET_INVPORT:
return wxT("wxSOCKET_INVPORT"); return "wxSOCKET_INVPORT";
break;
case wxSOCKET_WOULDBLOCK: case wxSOCKET_WOULDBLOCK:
return wxT("wxSOCKET_WOULDBLOCK"); return "wxSOCKET_WOULDBLOCK";
break;
case wxSOCKET_TIMEDOUT: case wxSOCKET_TIMEDOUT:
return wxT("wxSOCKET_TIMEDOUT"); return "wxSOCKET_TIMEDOUT";
break;
case wxSOCKET_MEMERR: case wxSOCKET_MEMERR:
return wxT("wxSOCKET_MEMERR"); return "wxSOCKET_MEMERR";
break;
default: default:
return wxT("Unknown"); return "Unknown";
break;
} }
} }
//log output types for LogWorker helper function // outputs log message with IP and TCP port number prepended
typedef enum
{
LOG_MESSAGE,
LOG_ERROR,
LOG_VERBOSE
} logWorker_t;
//outputs log message with IP and TCP port number prepended
void void
LogWorker(const wxIPV4address& pAddr, const wxString& pMessage, logWorker_t pType = LOG_VERBOSE) LogWorker(const wxIPV4address& addr,
const wxString& msg,
wxLogLevel level = wxLOG_Info)
{ {
wxString msg(wxString::Format(wxT("%s:%d "),pAddr.IPAddress().c_str(),pAddr.Service())); wxLogGeneric(level, "%s:%d %s", addr.IPAddress(), addr.Service(), msg);
msg += pMessage;
switch (pType)
{
case LOG_VERBOSE:
wxLogVerbose(msg);
break;
case LOG_MESSAGE:
wxLogMessage(msg);
break;
case LOG_ERROR:
wxLogError(msg);
break;
}
} }
//event sent by workers to server class //event sent by workers to server class
@@ -96,7 +76,8 @@ LogWorker(const wxIPV4address& pAddr, const wxString& pMessage, logWorker_t pTyp
const wxEventType wxEVT_WORKER = wxNewEventType(); const wxEventType wxEVT_WORKER = wxNewEventType();
#define EVT_WORKER(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ), #define EVT_WORKER(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ),
class WorkerEvent : public wxEvent { class WorkerEvent : public wxEvent
{
public: public:
WorkerEvent(void* pSender) WorkerEvent(void* pSender)
{ {
@@ -226,10 +207,10 @@ void
Server::OnInitCmdLine(wxCmdLineParser& pParser) Server::OnInitCmdLine(wxCmdLineParser& pParser)
{ {
wxApp::OnInitCmdLine(pParser); wxApp::OnInitCmdLine(pParser);
pParser.AddSwitch(wxT("t"),wxT("threads"),_("Use thread based workers only")); pParser.AddSwitch("t","threads",_("Use thread based workers only"));
pParser.AddSwitch(wxT("e"),wxT("events"),_("Use event based workers only")); pParser.AddSwitch("e","events",_("Use event based workers only"));
pParser.AddOption(wxT("m"),wxT("max"),_("Exit after <n> connections"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL); pParser.AddOption("m","max",_("Exit after <n> connections"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL);
pParser.AddOption(wxT("p"),wxT("port"),_("listen on given port (default 3000)"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL); pParser.AddOption("p","port",_("listen on given port (default 3000)"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL);
} }
void void
@@ -248,16 +229,28 @@ Server::DumpStatistics()
mode = _("Event and thread based workers"); mode = _("Event and thread based workers");
break; break;
} }
wxLogMessage(wxString::Format(wxT("Server mode: %s"),mode.c_str())); wxLogMessage("Server mode: %s",mode);
wxLogMessage(wxString::Format(wxT("\t\t\t\tThreads\tEvents\tTotal"))); wxLogMessage("\t\t\t\tThreads\tEvents\tTotal");
wxLogMessage(wxString::Format(wxT("Workers created:\t\t%d\t%d\t%d"),m_threadWorkersCreated,m_eventWorkersCreated,m_threadWorkersCreated+m_eventWorkersCreated)); wxLogMessage("Workers created:\t\t%d\t%d\t%d",
wxLogMessage(wxString::Format(wxT("Max concurrent workers:\t%d\t%d\t%d"),m_maxThreadWorkers,m_maxEventWorkers,m_maxThreadWorkers+m_maxEventWorkers)); m_threadWorkersCreated,
wxLogMessage(wxString::Format(wxT("Workers failed:\t\t%d\t%d\t%d"),m_threadWorkersFailed,m_eventWorkersFailed,m_threadWorkersFailed+m_eventWorkersFailed)); m_eventWorkersCreated,
wxLogMessage(wxString::Format(wxT("Workers done:\t\t%d\t%d\t%d"),m_threadWorkersDone,m_eventWorkersDone,m_threadWorkersDone+m_eventWorkersDone)); m_threadWorkersCreated + m_eventWorkersCreated);
wxLogMessage("Max concurrent workers:\t%d\t%d\t%d",
m_maxThreadWorkers,
m_maxEventWorkers,
m_maxThreadWorkers + m_maxEventWorkers);
wxLogMessage("Workers failed:\t\t%d\t%d\t%d",
m_threadWorkersFailed,
m_eventWorkersFailed,
m_threadWorkersFailed + m_eventWorkersFailed);
wxLogMessage("Workers done:\t\t%d\t%d\t%d",
m_threadWorkersDone,
m_eventWorkersDone,
m_threadWorkersDone + m_eventWorkersDone);
if ((int)(m_threadWorkersDone+m_eventWorkersDone) == m_maxConnections) if ((int)(m_threadWorkersDone+m_eventWorkersDone) == m_maxConnections)
{ {
wxLogMessage(wxT("%d connection(s) served, exiting"),m_maxConnections); wxLogMessage("%d connection(s) served, exiting",m_maxConnections);
ExitMainLoop(); ExitMainLoop();
} }
} }
@@ -268,27 +261,27 @@ Server::OnCmdLineParsed(wxCmdLineParser& pParser)
{ {
if (pParser.Found(_("verbose"))) if (pParser.Found(_("verbose")))
{ {
wxLog::AddTraceMask(wxT("wxSocket")); wxLog::AddTraceMask("wxSocket");
wxLog::AddTraceMask(wxT("epolldispatcher")); wxLog::AddTraceMask("epolldispatcher");
wxLog::AddTraceMask(wxT("selectdispatcher")); wxLog::AddTraceMask("selectdispatcher");
wxLog::AddTraceMask(wxT("thread")); wxLog::AddTraceMask("thread");
wxLog::AddTraceMask(wxT("events")); wxLog::AddTraceMask("events");
wxLog::AddTraceMask(wxT("timer")); wxLog::AddTraceMask("timer");
} }
if (pParser.Found(wxT("m"),&m_maxConnections)) if (pParser.Found("m",&m_maxConnections))
{ {
wxLogMessage(wxT("%d connection(s) to exit"),m_maxConnections); wxLogMessage("%d connection(s) to exit",m_maxConnections);
} }
if (pParser.Found(wxT("p"),&m_port)) if (pParser.Found("p",&m_port))
{ {
wxLogMessage(wxT("%d connection(s) to exit"),m_maxConnections); wxLogMessage("%d connection(s) to exit",m_maxConnections);
} }
if (pParser.Found(wxT("t"))) if (pParser.Found("t"))
m_workMode = THREADS; m_workMode = THREADS;
else if (pParser.Found(wxT("e"))) else if (pParser.Found("e"))
m_workMode = EVENTS; m_workMode = EVENTS;
else else
m_workMode = MIXED; m_workMode = MIXED;
@@ -316,7 +309,7 @@ bool Server::OnInit()
m_listeningSocket->Notify(true); m_listeningSocket->Notify(true);
if (!m_listeningSocket->Ok()) if (!m_listeningSocket->Ok())
{ {
wxLogError(wxT("Cannot bind listening socket")); wxLogError("Cannot bind listening socket");
return false; return false;
} }
@@ -330,19 +323,25 @@ bool Server::OnInit()
m_eventWorkersFailed = 0; m_eventWorkersFailed = 0;
m_maxEventWorkers = 0; m_maxEventWorkers = 0;
wxLogMessage(wxT("Server listening at port %d, waiting for connections"), m_port); wxLogMessage("Server listening at port %d, waiting for connections", m_port);
return true; return true;
} }
int Server::OnExit() int Server::OnExit()
{ {
for(TList::compatibility_iterator it = m_threadWorkers.GetFirst(); it ; it = it->GetNext()) { for ( TList::compatibility_iterator it = m_threadWorkers.GetFirst();
it;
it = it->GetNext() )
{
it->GetData()->Wait(); it->GetData()->Wait();
delete it->GetData(); delete it->GetData();
} }
for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2->GetNext()) { for ( EList::compatibility_iterator it2 = m_eventWorkers.GetFirst();
it2;
it2->GetNext() )
{
delete it2->GetData(); delete it2->GetData();
} }
@@ -357,10 +356,10 @@ void Server::OnSocketEvent(wxSocketEvent& pEvent)
switch(pEvent.GetSocketEvent()) switch(pEvent.GetSocketEvent())
{ {
case wxSOCKET_INPUT: case wxSOCKET_INPUT:
wxLogError(wxT("Unexpected wxSOCKET_INPUT in wxSocketServer")); wxLogError("Unexpected wxSOCKET_INPUT in wxSocketServer");
break; break;
case wxSOCKET_OUTPUT: case wxSOCKET_OUTPUT:
wxLogError(wxT("Unexpected wxSOCKET_OUTPUT in wxSocketServer")); wxLogError("Unexpected wxSOCKET_OUTPUT in wxSocketServer");
break; break;
case wxSOCKET_CONNECTION: case wxSOCKET_CONNECTION:
{ {
@@ -368,9 +367,9 @@ void Server::OnSocketEvent(wxSocketEvent& pEvent)
wxIPV4address addr; wxIPV4address addr;
if (!sock->GetPeer(addr)) if (!sock->GetPeer(addr))
{ {
wxLogError(wxT("Server: cannot get peer info")); wxLogError("Server: cannot get peer info");
} else { } else {
wxLogMessage(wxT("Got connection from %s:%d"),addr.IPAddress().c_str(), addr.Service()); wxLogMessage("Got connection from %s:%d",addr.IPAddress().c_str(), addr.Service());
} }
bool createThread; bool createThread;
@@ -392,7 +391,7 @@ void Server::OnSocketEvent(wxSocketEvent& pEvent)
} }
else else
{ {
wxLogError(wxT("Server: cannot create next thread (current threads: %d"), m_threadWorkers.size()); wxLogError("Server: cannot create next thread (current threads: %d", m_threadWorkers.size());
}; };
} }
else else
@@ -406,19 +405,20 @@ void Server::OnSocketEvent(wxSocketEvent& pEvent)
} }
break; break;
case wxSOCKET_LOST: case wxSOCKET_LOST:
wxLogError(wxT("Unexpected wxSOCKET_LOST in wxSocketServer")); wxLogError("Unexpected wxSOCKET_LOST in wxSocketServer");
break; break;
} }
} }
void Server::OnWorkerEvent(WorkerEvent& pEvent) void Server::OnWorkerEvent(WorkerEvent& pEvent)
{ {
//wxLogMessage(wxT("Got worker event")); //wxLogMessage("Got worker event");
for(TList::compatibility_iterator it = m_threadWorkers.GetFirst(); it ; it = it->GetNext()) for(TList::compatibility_iterator it = m_threadWorkers.GetFirst(); it ; it = it->GetNext())
{ {
if (it->GetData() == pEvent.m_sender) if (it->GetData() == pEvent.m_sender)
{ {
wxLogVerbose(wxT("Deleting thread worker (%d left)"),m_threadWorkers.GetCount()); wxLogVerbose("Deleting thread worker (%d left)",
m_threadWorkers.GetCount());
it->GetData()->Wait(); it->GetData()->Wait();
delete it->GetData(); delete it->GetData();
m_threadWorkers.DeleteNode(it); m_threadWorkers.DeleteNode(it);
@@ -433,7 +433,8 @@ void Server::OnWorkerEvent(WorkerEvent& pEvent)
{ {
if (it2->GetData() == pEvent.m_sender) if (it2->GetData() == pEvent.m_sender)
{ {
wxLogVerbose(wxT("Deleting event worker (%d left)"),m_eventWorkers.GetCount()); wxLogVerbose("Deleting event worker (%d left)",
m_eventWorkers.GetCount());
delete it2->GetData(); delete it2->GetData();
m_eventWorkers.DeleteNode(it2); m_eventWorkers.DeleteNode(it2);
if (!pEvent.m_workerFailed) if (!pEvent.m_workerFailed)
@@ -478,26 +479,26 @@ wxThread::ExitCode ThreadWorker::Entry()
WorkerEvent e(this); WorkerEvent e(this);
if (!m_socket->IsConnected()) if (!m_socket->IsConnected())
{ {
LogWorker(m_peer,wxT("ThreadWorker: not connected"),LOG_ERROR); LogWorker(m_peer,"ThreadWorker: not connected",wxLOG_Error);
return 0; return 0;
} }
int to_process = -1; int to_process = -1;
if (m_socket->IsConnected()) if (m_socket->IsConnected())
{ {
unsigned char signature[2]; unsigned char signature[2];
LogWorker(m_peer,wxT("ThreadWorker: reading for data")); LogWorker(m_peer,"ThreadWorker: reading for data");
to_process = 2; to_process = 2;
do do
{ {
m_socket->Read(&signature,to_process); m_socket->Read(&signature,to_process);
if (m_socket->Error()) if (m_socket->Error())
{ {
LogWorker(m_peer,wxT("ThreadWorker: Read error"),LOG_ERROR); LogWorker(m_peer,"ThreadWorker: Read error",wxLOG_Error);
wxGetApp().AddPendingEvent(e); wxGetApp().AddPendingEvent(e);
return 0; return 0;
} }
to_process -= m_socket->LastCount(); to_process -= m_socket->LastCount();
LogWorker(m_peer,wxString::Format(wxT("to_process: %d"),to_process)); LogWorker(m_peer,wxString::Format("to_process: %d",to_process));
} }
while (!m_socket->Error() && to_process != 0); while (!m_socket->Error() && to_process != 0);
@@ -510,29 +511,29 @@ wxThread::ExitCode ThreadWorker::Entry()
if (signature[0] == 0xCE) if (signature[0] == 0xCE)
{ {
LogWorker(m_peer,_("This server does not support test2 from GUI client"),LOG_ERROR); LogWorker(m_peer,_("This server does not support test2 from GUI client"),wxLOG_Error);
e.m_workerFailed = true; e.m_workerFailed = true;
e.m_exit = true; e.m_exit = true;
return 0; return 0;
} }
int size = signature[1] * (signature[0] == 0xBE ? 1 : 1024); int size = signature[1] * (signature[0] == 0xBE ? 1 : 1024);
char* buf = new char[size]; char* buf = new char[size];
LogWorker(m_peer,wxString::Format(wxT("Message signature: chunks: %d, kilobytes: %d, size: %d (bytes)"),signature[0],signature[1],size)); LogWorker(m_peer,wxString::Format("Message signature: chunks: %d, kilobytes: %d, size: %d (bytes)",signature[0],signature[1],size));
to_process = size; to_process = size;
LogWorker(m_peer,wxString::Format(wxT("ThreadWorker: reading %d bytes of data"),to_process)); LogWorker(m_peer,wxString::Format("ThreadWorker: reading %d bytes of data",to_process));
do do
{ {
m_socket->Read(buf,to_process); m_socket->Read(buf,to_process);
if (m_socket->Error()) if (m_socket->Error())
{ {
LogWorker(m_peer,wxT("ThreadWorker: Read error"),LOG_ERROR); LogWorker(m_peer,"ThreadWorker: Read error",wxLOG_Error);
wxGetApp().AddPendingEvent(e); wxGetApp().AddPendingEvent(e);
return 0; return 0;
} }
to_process -= m_socket->LastCount(); to_process -= m_socket->LastCount();
LogWorker(m_peer,wxString::Format(wxT("ThreadWorker: %d bytes readed, %d todo"),m_socket->LastCount(),to_process)); LogWorker(m_peer,wxString::Format("ThreadWorker: %d bytes readed, %d todo",m_socket->LastCount(),to_process));
} }
while(!m_socket->Error() && to_process != 0); while(!m_socket->Error() && to_process != 0);
@@ -542,17 +543,18 @@ wxThread::ExitCode ThreadWorker::Entry()
do do
{ {
m_socket->Write(buf,to_process); m_socket->Write(buf,to_process);
if (m_socket->Error()) { if (m_socket->Error())
LogWorker(m_peer,wxT("ThreadWorker: Write error"),LOG_ERROR); {
LogWorker(m_peer,"ThreadWorker: Write error",wxLOG_Error);
break; break;
} }
to_process -= m_socket->LastCount(); to_process -= m_socket->LastCount();
LogWorker(m_peer,wxString::Format(wxT("ThreadWorker: %d bytes written, %d todo"),m_socket->LastCount(),to_process)); LogWorker(m_peer,wxString::Format("ThreadWorker: %d bytes written, %d todo",m_socket->LastCount(),to_process));
} }
while(!m_socket->Error() && to_process != 0); while(!m_socket->Error() && to_process != 0);
} }
LogWorker(m_peer,wxT("ThreadWorker: done")); LogWorker(m_peer,"ThreadWorker: done");
e.m_workerFailed = to_process != 0; e.m_workerFailed = to_process != 0;
m_socket->Destroy(); m_socket->Destroy();
wxGetApp().AddPendingEvent(e); wxGetApp().AddPendingEvent(e);
@@ -573,14 +575,15 @@ EventWorker::EventWorker(wxSocketBase* pSock)
m_socket->GetPeer(m_peer); m_socket->GetPeer(m_peer);
} }
EventWorker::~EventWorker() { EventWorker::~EventWorker()
{
m_socket->Destroy(); m_socket->Destroy();
delete [] m_inbuf; delete [] m_inbuf;
delete [] m_outbuf; delete [] m_outbuf;
} }
void void
EventWorker::DoRead() EventWorker::DoRead()
{ {
if (m_inbuf == NULL) if (m_inbuf == NULL)
{ {
@@ -588,22 +591,24 @@ EventWorker::DoRead()
do do
{ {
m_socket->Read(m_signature,2 - m_infill); m_socket->Read(m_signature,2 - m_infill);
if (m_socket->Error()) { if (m_socket->Error())
{
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK) if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{ {
LogWorker(m_peer,wxString::Format(wxT("Read error (%d): %s"),m_socket->LastError(),GetSocketErrorMsg(m_socket->LastError())),LOG_ERROR); LogWorker(m_peer,wxString::Format("Read error (%d): %s",m_socket->LastError(),GetSocketErrorMsg(m_socket->LastError())),wxLOG_Error);
m_socket->Close(); m_socket->Close();
} }
} }
else else
{ {
m_infill += m_socket->LastCount(); m_infill += m_socket->LastCount();
if (m_infill == 2) { if (m_infill == 2)
{
unsigned char chunks = m_signature[1]; unsigned char chunks = m_signature[1];
unsigned char type = m_signature[0]; unsigned char type = m_signature[0];
if (type == 0xCE) if (type == 0xCE)
{ {
LogWorker(m_peer,_("This server does not support test2 from GUI client"),LOG_ERROR); LogWorker(m_peer,_("This server does not support test2 from GUI client"),wxLOG_Error);
m_written = -1; //wxSOCKET_LOST will interpret this as failure m_written = -1; //wxSOCKET_LOST will interpret this as failure
m_socket->Close(); m_socket->Close();
} }
@@ -615,11 +620,11 @@ EventWorker::DoRead()
m_infill = 0; m_infill = 0;
m_outfill = 0; m_outfill = 0;
m_written = 0; m_written = 0;
LogWorker(m_peer,wxString::Format(wxT("Message signature: len: %d, type: %s, size: %d (bytes)"),chunks,type == 0xBE ? wxT("b") : wxT("kB"),m_size)); LogWorker(m_peer,wxString::Format("Message signature: len: %d, type: %s, size: %d (bytes)",chunks,type == 0xBE ? "b" : "kB",m_size));
break; break;
} else } else
{ {
LogWorker(m_peer,wxString::Format(wxT("Unknown test type %x"),type)); LogWorker(m_peer,wxString::Format("Unknown test type %x",type));
m_socket->Close(); m_socket->Close();
} }
} }
@@ -631,8 +636,10 @@ EventWorker::DoRead()
if (m_inbuf == NULL) if (m_inbuf == NULL)
return; return;
//read message data //read message data
do { do
if (m_size == m_infill) { {
if (m_size == m_infill)
{
m_signature[0] = m_signature[1] = 0x0; m_signature[0] = m_signature[1] = 0x0;
delete [] m_inbuf; delete [] m_inbuf;
m_inbuf = NULL; m_inbuf = NULL;
@@ -640,16 +647,17 @@ EventWorker::DoRead()
return; return;
} }
m_socket->Read(m_inbuf + m_infill,m_size - m_infill); m_socket->Read(m_inbuf + m_infill,m_size - m_infill);
if (m_socket->Error()) { if (m_socket->Error())
{
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK) if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{ {
LogWorker( LogWorker(
m_peer, m_peer,
wxString::Format(wxT("Read error (%d): %s"), wxString::Format("Read error (%d): %s",
m_socket->LastError(), m_socket->LastError(),
GetSocketErrorMsg(m_socket->LastError()) GetSocketErrorMsg(m_socket->LastError())
), ),
LOG_ERROR); wxLOG_Error);
m_socket->Close(); m_socket->Close();
} }
@@ -671,34 +679,39 @@ void EventWorker::OnSocketEvent(wxSocketEvent& pEvent)
{ {
case wxSOCKET_INPUT: case wxSOCKET_INPUT:
DoRead(); DoRead();
break; break;
case wxSOCKET_OUTPUT: case wxSOCKET_OUTPUT:
if (m_inbuf != NULL) if (m_inbuf != NULL)
DoWrite(); DoWrite();
break; break;
case wxSOCKET_CONNECTION: case wxSOCKET_CONNECTION:
LogWorker(m_peer,wxString::Format(wxT("Unexpected wxSOCKET_CONNECTION in EventWorker")),LOG_ERROR); LogWorker(m_peer,wxString::Format("Unexpected wxSOCKET_CONNECTION in EventWorker"),wxLOG_Error);
break; break;
case wxSOCKET_LOST: case wxSOCKET_LOST:
{ {
LogWorker(m_peer,wxString::Format(wxT("Connection lost"))); LogWorker(m_peer,wxString::Format("Connection lost"));
WorkerEvent e(this); WorkerEvent e(this);
e.m_workerFailed = m_written != m_size; e.m_workerFailed = m_written != m_size;
wxGetApp().AddPendingEvent(e); wxGetApp().AddPendingEvent(e);
} }
break; break;
} }
} }
void EventWorker::DoWrite() { void EventWorker::DoWrite()
do { {
do
{
if (m_written == m_size) if (m_written == m_size)
{ {
delete [] m_outbuf; delete [] m_outbuf;
m_outbuf = NULL; m_outbuf = NULL;
m_outfill = 0; m_outfill = 0;
LogWorker(m_peer,wxString::Format(wxT("All data written"))); LogWorker(m_peer, "All data written");
return; return;
} }
if (m_outfill - m_written == 0) if (m_outfill - m_written == 0)
{ {
@@ -710,17 +723,17 @@ void EventWorker::DoWrite() {
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK) if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{ {
LogWorker(m_peer, LogWorker(m_peer,
wxString::Format(wxT("Write error (%d): %s"), wxString::Format("Write error (%d): %s",
m_socket->LastError(), m_socket->LastError(),
GetSocketErrorMsg(m_socket->LastError()) GetSocketErrorMsg(m_socket->LastError())
) )
,LOG_ERROR ,wxLOG_Error
); );
m_socket->Close(); m_socket->Close();
} }
else else
{ {
LogWorker(m_peer,wxString::Format(wxT("Write would block, waiting for OUTPUT event"))); LogWorker(m_peer,"Write would block, waiting for OUTPUT event");
} }
} }
else else
@@ -728,11 +741,11 @@ void EventWorker::DoWrite() {
memmove(m_outbuf,m_outbuf+m_socket->LastCount(),m_outfill-m_socket->LastCount()); memmove(m_outbuf,m_outbuf+m_socket->LastCount(),m_outfill-m_socket->LastCount());
m_written += m_socket->LastCount(); m_written += m_socket->LastCount();
} }
LogWorker(m_peer,wxString::Format(wxT("Written %d of %d bytes, todo %d"),m_socket->LastCount(),m_size,m_size - m_written)); LogWorker(m_peer,wxString::Format("Written %d of %d bytes, todo %d",m_socket->LastCount(),m_size,m_size - m_written));
} }
while (!m_socket->Error()); while (!m_socket->Error());
} }
BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler) BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler)
EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent) EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent)
END_EVENT_TABLE() END_EVENT_TABLE()