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

Remove the worker thread from wxWebSessionCURL

Browse Source 
Instead of having wxWebSessionCURL run a worker thread that uses curl
to monitor and process network activity, set up a separate socket
poller class to monitor socket activity. The socket poller class will
throw an event back to wxWebSessionCURL when it detects activity on the
sockets so that it can tell curl to process the activity in the main
thread.
This commit is contained in:
New Pagodi
2021-01-25 16:26:27 -06:00
parent 414f211b8a
commit b1b53ed85c
2 changed files with 706 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/private/webrequest_curl.h
View File

@@ -16,12 +16,14 @@
#include "wx/thread.h"
#include "wx/vector.h"
#include "wx/timer.h"
#include "curl/curl.h"
class wxWebRequestCURL;
class wxWebResponseCURL;
class wxWebSessionCURL;
class SocketPoller;
class wxWebAuthChallengeCURL : public wxWebAuthChallengeImpl
{
@@ -123,7 +125,7 @@ private:
wxDECLARE_NO_COPY_CLASS(wxWebResponseCURL);
};
class wxWebSessionCURL : public wxWebSessionImpl, private wxThreadHelper
class wxWebSessionCURL : public wxWebSessionImpl, public wxEvtHandler
{
public:
wxWebSessionCURL();
@@ -147,25 +149,21 @@ public:
void CancelRequest(wxWebRequestCURL* request);
protected:
wxThread::ExitCode Entry() wxOVERRIDE;
private:
static int TimerCallback(CURLM*, long, void*);
static int SocketCallback(CURL*, curl_socket_t, int, void*, void*);
void ProcessTimerCallback(long);
void TimeoutNotification(wxTimerEvent&);
void ProcessTimeoutNotification();
void ProcessSocketCallback(curl_socket_t, int);
void ProcessSocketPollerResult(wxThreadEvent&);
void CheckForCompletedTransfers();
SocketPoller* m_socketPoller;
wxTimer m_timeoutTimer;
CURLM* m_handle;
// Mutex and condition are used together to signal to the worker thread to
// wake up and mutex is also used to protected m_shuttingDown field.
wxMutex m_mutex;
wxCondition m_condition;
bool m_shuttingDown;
// MT-safe vector of requests for which Cancel() was called.
struct CancelledData
{
wxCriticalSection cs;
wxVector< wxObjectDataPtr<wxWebRequestCURL> > requests;
} m_cancelled;
static int ms_activeSessions;
wxDECLARE_NO_COPY_CLASS(wxWebSessionCURL);