hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Several timeout improvements and speedups to HTTP proxy.

Browse source
This commit is contained in:
Thulinma 2012-12-16 22:24:25 +01:00
parent 5c83e58e90
commit 91496245f9
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/conn_http.cpp
View file

@ -267,12 +267,12 @@ namespace Connector_HTTP {
} }
}else{ }else{
//keep trying unless the timeout triggers //keep trying unless the timeout triggers
if (timeout++ > 200){ if (timeout++ > 4000){
std::cout << "[20s timeout triggered]" << std::endl; std::cout << "[20s timeout triggered]" << std::endl;
Handle_Timeout(H, conn); Handle_Timeout(H, conn);
return; return;
}else{ }else{
usleep(100000); Util::sleep(5);
} }
} }
} }
@ -304,7 +304,7 @@ namespace Connector_HTTP {
conn->SendNow(myConn->Received().get()); conn->SendNow(myConn->Received().get());
myConn->Received().get().clear(); myConn->Received().get().clear();
}else{ }else{
usleep(30000); Util::sleep(30);
} }
} }
myConn->close(); myConn->close();
@ -397,7 +397,7 @@ namespace Connector_HTTP {
Client.Clean(); //clean for any possible next requests Client.Clean(); //clean for any possible next requests
} }
}else{ }else{
usleep(10000); //sleep 10ms Util::sleep(10); //sleep 10ms
} }
} }
//close and remove the connection //close and remove the connection
@ -444,7 +444,7 @@ int main(int argc, char ** argv){
} }
Connector_HTTP::thread_mutex.unlock(); Connector_HTTP::thread_mutex.unlock();
}else{ }else{
usleep(100000); //sleep 100ms Util::sleep(10); //sleep 10ms
} }
} //while connected and not requested to stop } //while connected and not requested to stop
server_socket.close(); server_socket.close();
@ -454,9 +454,6 @@ int main(int argc, char ** argv){
while (repeat){ while (repeat){
Connector_HTTP::thread_mutex.lock(); Connector_HTTP::thread_mutex.lock();
repeat = !Connector_HTTP::active_threads.empty(); repeat = !Connector_HTTP::active_threads.empty();
if (repeat){
usleep(100000); //sleep 100ms
}
//clean up any threads that may have finished //clean up any threads that may have finished
while ( !Connector_HTTP::done_threads.empty()){ while ( !Connector_HTTP::done_threads.empty()){
tthread::thread * T = *Connector_HTTP::done_threads.begin(); tthread::thread * T = *Connector_HTTP::done_threads.begin();
@ -465,6 +462,9 @@ int main(int argc, char ** argv){
delete T; delete T;
} }
Connector_HTTP::thread_mutex.unlock(); Connector_HTTP::thread_mutex.unlock();
if (repeat){
Util::sleep(100); //sleep 100ms
}
} }
return 0; return 0;