diff options
| -rwxr-xr-x | server/server/config.cpp | 8 | ||||
| -rwxr-xr-x | server/server/headers.h | 1 | ||||
| -rw-r--r-- | server/server/speedtest.cpp | 12 | ||||
| -rw-r--r-- | server/server/speedtest.h | 1 |
4 files changed, 12 insertions, 10 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 7bc4fae..4400f3d 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -25,18 +25,22 @@ void speed_test_thread_func(std::list<config::proxy_entry>* proxy_list, std::lis while(!boost::this_thread::interruption_requested()) { m->lock(); +// logtofile *l = new logtofile(std::string(boost::filesystem::initial_path().string() + "/proxy_test_info").c_str()); for(std::list<config::static_proxy_entry>::iterator i = static_proxy_list->begin(), end = static_proxy_list->end(); i != end; ++i) { speedtest t(test_url); + //*l<<i->host<<" "<<(int)t.test(&(*i))<<"\n"; t.test(&(*i)); boost::this_thread::sleep(boost::posix_time::seconds(2)); } -/* for(std::list<config::proxy_entry>::iterator i = proxy_list->begin(), end = proxy_list->end(); i != end; ++i) + for(std::list<config::proxy_entry>::iterator i = proxy_list->begin(), end = proxy_list->end(); i != end; ++i) { speedtest t(test_url); + //*l<<i->host<<" "<<(int)t.test(&(*i))<<"\n"; t.test(&(*i)); boost::this_thread::sleep(boost::posix_time::seconds(2)); - } */ + } +// delete l; m->unlock(); boost::this_thread::sleep(boost::posix_time::minutes(180)); } diff --git a/server/server/headers.h b/server/server/headers.h index cd77a0c..54ac82c 100755 --- a/server/server/headers.h +++ b/server/server/headers.h @@ -21,7 +21,6 @@ #include <boost/random.hpp> #include <boost/nondet_random.hpp> #include <boost/date_time.hpp> -#include <boost/progress.hpp> //#include <rapidxml.hpp> //#include <rapidxml_print.hpp> diff --git a/server/server/speedtest.cpp b/server/server/speedtest.cpp index 4beb9e1..e47ebef 100644 --- a/server/server/speedtest.cpp +++ b/server/server/speedtest.cpp @@ -53,11 +53,11 @@ size_t speedtest::test(config::proxy_entry *p) curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-speedtest/0.1"); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, "10"); - timer.restart(); + time_t start = time(0); CURLcode error = curl_easy_perform(curl); - double time = timer.elapsed(); + double t = time(0) - start; curl_easy_cleanup(curl); @@ -72,7 +72,7 @@ size_t speedtest::test(config::proxy_entry *p) if(chunk.size) { if(time) - speed = chunk.size/time; + speed = (double)chunk.size/t; else speed = chunk.size; } @@ -115,11 +115,11 @@ size_t speedtest::test(config::static_proxy_entry *p) curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-speedtest/0.1"); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, "10"); - timer.restart(); + time_t start = time(0); CURLcode error = curl_easy_perform(curl); - double time = timer.elapsed(); + double t = time(0) - start; curl_easy_cleanup(curl); @@ -134,7 +134,7 @@ size_t speedtest::test(config::static_proxy_entry *p) if(chunk.size) { if(time) - speed = chunk.size/time; + speed = (double)chunk.size/t; else speed = chunk.size; } diff --git a/server/server/speedtest.h b/server/server/speedtest.h index 2d006b8..85579bc 100644 --- a/server/server/speedtest.h +++ b/server/server/speedtest.h @@ -19,7 +19,6 @@ private: size_t size; }; static size_t curl_data_callback(void *contents, size_t size, size_t nmemb, void *userp); - boost::timer timer; std::string test_url; CURL *curl; }; |