- network related bugfixes:

menu slowdown when picking network slots
clients can once again change network slots
performance fixes for network receiving
This commit is contained in:
Mark Vejvoda
2010-06-29 06:50:35 +00:00
parent a7954abc02
commit 9508dad51b
11 changed files with 284 additions and 248 deletions

View File

@@ -100,7 +100,7 @@ void BaseThread::shutdownAndWait(BaseThread *pThread) {
pThread->signalQuit();
//sleep(0);
for( time_t elapsed = time(NULL); difftime(time(NULL),elapsed) <= 5; ) {
for( time_t elapsed = time(NULL); difftime(time(NULL),elapsed) <= 7; ) {
if(pThread->getRunningStatus() == false) {
break;
}

View File

@@ -117,6 +117,9 @@ std::string SystemFlags::getHTTP(std::string URL,CURL *handle) {
char errbuf[CURL_ERROR_SIZE]="";
curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, errbuf);
// max 5 seconds to connect to the URL
curl_easy_setopt(handle, CURLOPT_CONNECTTIMEOUT, 5);
/* get contents from the URL */
CURLcode result = curl_easy_perform(handle);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d] return code [%d] [%s]\n",__FILE__,__FUNCTION__,__LINE__,result,errbuf);