ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved error handling in case that an unreliable network connection

Browse Source 
exist and the libcurl thread does not time out and can't be aborted.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2011-04-19 00:25:17 +00:00
parent e2a49be2cf
commit 5cc146fefe
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/addons/network_http.cpp
View File

@@ -71,6 +71,10 @@ NetworkHttp::NetworkHttp() : m_news(std::vector<NewsMessage>()),
pthread_mutex_init(&m_mutex_command, NULL);
pthread_cond_init(&m_cond_command, NULL);
// Initialise the variables for cancelling the network thread.
pthread_mutex_init(&m_mutex_quit, NULL);
pthread_cond_init(&m_cond_quit, NULL);
// Since there are no threads at this stage, just init
// m_command without mutex.
m_command = HC_SLEEP;
@@ -176,6 +180,16 @@ void *NetworkHttp::mainLoop(void *obj)
me->m_command = HC_SLEEP;
} // while 1
pthread_mutex_unlock(&me->m_mutex_command);
// Signal that we are quitting properly.
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Signaling that network thread is quitting.\n");
pthread_mutex_lock(&me->m_mutex_quit);
pthread_cond_broadcast(&me->m_cond_quit);
pthread_mutex_unlock(&me->m_mutex_quit);
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Network thread is quitting.\n");
return NULL;
} // mainLoop
@@ -203,21 +217,41 @@ NetworkHttp::~NetworkHttp()
}
pthread_mutex_unlock(&m_mutex_command);
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Mutex unlocked.\n");
printf("[addons] Command mutex unlocked.\n");
if(m_thread_id)
{
void *result;
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Trying to join network thread.\n");
pthread_join(*m_thread_id, &result);
printf("[addons] Trying to stop network thread.\n");
pthread_mutex_lock(&m_mutex_quit);
timespec timeout;
timeout.tv_nsec = 0;
timeout.tv_sec = 1;
int error = pthread_cond_timedwait(&m_cond_quit, &m_mutex_quit,
&timeout);
pthread_mutex_unlock(&m_mutex_quit);
if(error==ETIMEDOUT)
{
printf("[addons] Timeout waiting for joining. Cancelling.\n");
int e = pthread_cancel(*m_thread_id);
printf("[addons] Cancelled network thread. Return code: %d\n", e);
}
else
{
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Trying to cancel network thread.\n");
pthread_join(*m_thread_id, NULL);
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Network thread joined.\n");
}
delete m_thread_id;
if(UserConfigParams::m_verbosity>=3)
printf("[addons] Network thread joined.\n");
}
pthread_mutex_destroy(&m_mutex_command);
pthread_cond_destroy(&m_cond_command);
pthread_mutex_destroy(&m_mutex_quit);
pthread_cond_destroy(&m_cond_quit);
} // ~NetworkHttp
// ---------------------------------------------------------------------------

7
src/addons/network_http.hpp
View File

@@ -105,6 +105,13 @@ private:
/** A conditional variable to wake up the main loop. */
pthread_cond_t m_cond_command;
/** A mutex used in cancelling the network thread with timeout. */
pthread_mutex_t m_mutex_quit;
/** Conidtional variable used in cancelling the network
* thread with timeout. */
pthread_cond_t m_cond_quit;
/** The file to download when a file download is triggered. */
std::string m_url;