don't use WaitOnConnect(), it doesn't make sense to use asynchronous Connect() only to block waiting for it immediately (see #10952)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-02 16:11:12 +00:00
parent 40a983ad63
commit b2f747d8f9

View File

@@ -334,69 +334,14 @@ void MyFrame::OpenConnection(wxSockAddress::Family family)
addr->Hostname(hostname); addr->Hostname(hostname);
addr->Service(3000); addr->Service(3000);
// Mini-tutorial for Connect() :-) // we connect asynchronously and will get a wxSOCKET_CONNECTION event when
// --------------------------- // the connection is really established
// //
// There are two ways to use Connect(): blocking and non-blocking, // if you want to make sure that connection is established right here you
// depending on the value passed as the 'wait' (2nd) parameter. // could call WaitOnConnect(timeout) instead
// wxLogMessage("Trying to connect to %s:%d", hostname, addr->Service());
// Connect(addr, true) will wait until the connection completes,
// returning true on success and false on failure. This call blocks
// the GUI (this might be changed in future releases to honour the
// wxSOCKET_BLOCK flag).
//
// Connect(addr, false) will issue a nonblocking connection request
// and return immediately. If the return value is true, then the
// connection has been already successfully established. If it is
// false, you must wait for the request to complete, either with
// WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
// events (please read the documentation).
//
// WaitOnConnect() itself never blocks the GUI (this might change
// in the future to honour the wxSOCKET_BLOCK flag). This call will
// return false on timeout, or true if the connection request
// completes, which in turn might mean:
//
// a) That the connection was successfully established
// b) That the connection request failed (for example, because
// it was refused by the peer.
//
// Use IsConnected() to distinguish between these two.
//
// So, in a brief, you should do one of the following things:
//
// For blocking Connect:
//
// bool success = client->Connect(addr, true);
//
// For nonblocking Connect:
//
// client->Connect(addr, false);
//
// bool waitmore = true;
// while (! client->WaitOnConnect(seconds, millis) && waitmore )
// {
// // possibly give some feedback to the user,
// // update waitmore if needed.
// }
// bool success = client->IsConnected();
//
// And that's all :-)
m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n"));
m_sock->Connect(*addr, false); m_sock->Connect(*addr, false);
m_sock->WaitOnConnect(10);
if (m_sock->IsConnected())
m_text->AppendText(_("Succeeded ! Connection established\n"));
else
{
m_sock->Close();
m_text->AppendText(_("Failed ! Unable to connect\n"));
wxMessageBox(_("Can't connect to the specified host"), _("Alert !"));
}
UpdateStatusBar();
} }
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
@@ -683,29 +628,38 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnSocketEvent(wxSocketEvent& event) void MyFrame::OnSocketEvent(wxSocketEvent& event)
{ {
wxString s = _("OnSocketEvent: ");
switch ( event.GetSocketEvent() ) switch ( event.GetSocketEvent() )
{ {
case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break; case wxSOCKET_INPUT:
case wxSOCKET_LOST : s.Append(_("wxSOCKET_LOST\n")); break; wxLogMessage("Input available on the socket");
case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break; break;
default : s.Append(_("Unexpected event !\n")); break;
}
m_text->AppendText(s); case wxSOCKET_LOST:
wxLogMessage("Socket connection was unexpectedly lost.");
UpdateStatusBar(); UpdateStatusBar();
break;
case wxSOCKET_CONNECTION:
wxLogMessage("... socket is now connected.");
UpdateStatusBar();
break;
default:
wxLogMessage("Unknown socket event!!!");
break;
}
} }
// convenience functions // convenience functions
void MyFrame::UpdateStatusBar() void MyFrame::UpdateStatusBar()
{ {
#if wxUSE_STATUSBAR
wxString s; wxString s;
if (!m_sock->IsConnected()) if (!m_sock->IsConnected())
{ {
s.Printf(_("Not connected")); s = "Not connected";
} }
else else
{ {
@@ -716,10 +670,9 @@ void MyFrame::UpdateStatusBar()
#endif #endif
m_sock->GetPeer(addr); m_sock->GetPeer(addr);
s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service()); s.Printf("%s : %d", addr.Hostname(), addr.Service());
} }
#if wxUSE_STATUSBAR
SetStatusText(s, 1); SetStatusText(s, 1);
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR