oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Replace SimpleThread by JThread now implementing same features

Browse source
This commit is contained in:
sapier 2013-12-03 23:32:03 +01:00
parent 9772322613
commit e9e9fd7c3f
9 changed files with 30 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/httpfetch.cpp
View file

@ -319,7 +319,7 @@ struct HTTPFetchOngoing
}
};
class CurlFetchThread : public SimpleThread
class CurlFetchThread : public JThread
{
protected:
enum RequestType {
@ -539,7 +539,6 @@ protected:
void * Thread()
{
ThreadStarted();
log_register_thread("CurlFetchThread");
DSTACK(__FUNCTION_NAME);
@ -553,7 +552,7 @@ protected:
assert(m_all_ongoing.empty());
while (getRun()) {
while (!StopRequested()) {
BEGIN_DEBUG_EXCEPTION_HANDLER
/*
@ -641,9 +640,9 @@ void httpfetch_cleanup()
{
verbosestream<<"httpfetch_cleanup: cleaning up"<<std::endl;
g_httpfetch_thread->setRun(false);
g_httpfetch_thread->Stop();
g_httpfetch_thread->requestWakeUp();
g_httpfetch_thread->stop();
g_httpfetch_thread->Wait();
delete g_httpfetch_thread;
curl_global_cleanup();
@ -652,8 +651,6 @@ void httpfetch_cleanup()
void httpfetch_async(const HTTPFetchRequest &fetchrequest)
{
g_httpfetch_thread->requestFetch(fetchrequest);
if (!g_httpfetch_thread->IsRunning())
g_httpfetch_thread->Start();
}
static void httpfetch_request_clear(unsigned long caller)