modified: heavy_loader.cppcpu_heavy_loader

1 files changed, 32 insertions, 25 deletions

diff --git a/heavy_loader.cpp b/heavy_loader.cpp
index d4a3744..73b8e1f 100644
--- a/heavy_loader.cpp
+++ b/heavy_loader.cpp
@@ -69,33 +69,36 @@ public:
     {
 	CURL *curl = NULL;
 	curl = curl_easy_init();
-	if(!curl)
-	    return;
-	std::string url = s;
-	url += "/";
-	url += get_random(5);
-	url += "/";
-	url += get_random(3);
-	curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-	curl_easy_setopt(curl, CURLOPT_USERAGENT, "tuk-tuk/0.1");
-	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 2);
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2);
-	//curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1);
-	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-	curl_easy_setopt(curl, CURLOPT_VERBOSE, 0);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curl_data_callback);
+
+	while(true)
+	{
+	    if(!curl)
+		return;
+	    std::string url = s;
+	    url += "/";
+	    url += get_random(5);
+	    url += "/";
+	    url += get_random(3);
+	    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+	    curl_easy_setopt(curl, CURLOPT_USERAGENT, "tuk-tuk/0.1");
+	    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 2);
+	    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2);
+	    //curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1);
+	    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
+	    curl_easy_setopt(curl, CURLOPT_VERBOSE, 0);
+	    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curl_data_callback);
 	
-	time_t start = time(0);
+	    time_t start = time(0);
 	
-	CURLcode error = curl_easy_perform(curl);
+	    CURLcode error = curl_easy_perform(curl);
 	
-	if(!error)
-	    success_threads++;
+	    if(!error)
+		success_threads++;
 	
-	double t = time(0) - start;
+	    double t = time(0) - start;
 	
-	curl_easy_cleanup(curl);
-	c->finished = true;
+	    //curl_easy_cleanup(curl);
+	}
 
     }
     const std::string s;
@@ -126,7 +129,7 @@ int main(int argc, char *argv[])
 	int max_threads = atoi(argv[2]);
         for(;;)
 	{
-	    while(threads.size() >= max_threads)
+	    /*while(threads.size() >= max_threads)
 	    {
 		for(std::list<curl_test>::iterator i = threads.begin(), end = threads.end(); i != end; ++i)
 		{
@@ -136,12 +139,16 @@ int main(int argc, char *argv[])
 			i = threads.begin(), end = threads.end();
 		    }
 		}
-		boost::this_thread::sleep(boost::posix_time::milliseconds(10));
-	    }
+		
+	    }*/
+	    boost::this_thread::sleep(boost::posix_time::milliseconds(100));
 	    try{
+	    if(threads.size() < max_threads)
+	    {
 		threads.push_back(curl_test(argv[1]));
 		threads.back().start();
 	    }
+	    }
 	    catch(const std::exception &e)
 	    {
 		failed_threads++;