Added capability to compile with gcov

Sebastiano Merlino · Sebastiano Merlino · commit 0ee9233ef5a5 · 2012-08-08T12:31:44.000+02:00
Changed infinite loop in ws to use wait conditions
Removed a bug from GET-like method handling
diff --git a/Makefile.am b/Makefile.am
@@ -28,7 +28,10 @@ SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY
 DIST_SUBDIRS = src $(PYTHON_DIST_DIR) $(JAVA_DIST_DIR) $(PHP_DIST_DIR) $(LUA_DIST_DIR) $(PERL_DIST_DIR) $(RUBY_DIST_DIR) $(GUILE_DIST_DIR)
 EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG) $(PYTHON_EXTRA) $(PHP_EXTRA) $(PERL_EXTRA)
 
-MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* $(top_srcdir)/src/java/*.java $(top_srcdir)/src/java/webserver_wrap.*
+JAVACLEANFILES = $(top_srcdir)/src/java/*.java $(top_srcdir)/src/java/webserver_wrap.*
+PYTHONCLEANFILES = $(top_srcdir)/src/python/*.py $(top_srcdir)/src/python/webserver_wrap.*
+
+MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* $(JAVACLEANFILES) $(PYTHONCLEANFILES)
 DISTCLEANFILES = redhat/SOURCES/* redhat/SPEC/* redhat/* debian/* DIST_REVISION
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
@@ -148,7 +148,8 @@ AC_MSG_RESULT([$debugit])
 
 if test x"$debugit" = x"yes"; then
     AC_DEFINE([DEBUG],[],[Debug Mode])
-    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0"
+    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0 -fprofile-arcs -ftest-coverage"
+    LDFLAGS="-lgcov $LDFLAGS"
 else
     AC_DEFINE([NDEBUG],[],[No-debug Mode])
     AM_CXXFLAGS="$AM_CXXFLAGS -O3"
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -44,6 +44,8 @@
 #include <utility>
 #include <memory>
 
+#include <pthread.h>
+
 namespace httpserver {
 
 class http_resource;
@@ -260,6 +262,8 @@ class webserver
         bool ban_system_enabled;
         bool post_process_enabled;
         bool single_resource;
+        pthread_mutex_t mutexwait;
+        pthread_cond_t mutexcond;
 
         std::map<http_endpoint, http_resource* > registered_resources;
 #ifdef USE_CPP_ZEROX
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -223,6 +223,8 @@ webserver::webserver
     else
         this->single_resource = false;
     ignore_sigpipe();
+    pthread_mutex_init(&mutexwait, NULL);
+    pthread_cond_init(&mutexcond, NULL);
 }
 
 webserver::webserver(const create_webserver& params):
@@ -266,16 +268,20 @@ webserver::webserver(const create_webserver& params):
     else
         this->single_resource = false;
     ignore_sigpipe();
+    pthread_mutex_init(&mutexwait, NULL);
+    pthread_cond_init(&mutexcond, NULL);
 }
 
 webserver::~webserver()
 {
     this->stop();
+    pthread_mutex_destroy(&mutexwait);
+    pthread_cond_destroy(&mutexcond);
 }
 
 void webserver::sweet_kill()
 {
-    this->running = false;
+    this->stop();
 }
 
 void webserver::request_completed (void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) 
@@ -380,15 +386,17 @@ bool webserver::start(bool blocking)
             Py_BEGIN_ALLOW_THREADS;
         }
 #endif
+        pthread_mutex_lock(&mutexwait);
         while(blocking && running)
-            sleep(1);
+            pthread_cond_wait(&mutexcond, &mutexwait);
+        pthread_mutex_unlock(&mutexwait);
 #ifdef WITH_PYTHON
         if(PyEval_ThreadsInitialized())
         {
             Py_END_ALLOW_THREADS;
         }
 #endif
-        value_onclose = this->stop();
+        value_onclose = true;
     }
     return value_onclose;
 }
@@ -400,11 +408,14 @@ bool webserver::is_running()
 
 bool webserver::stop()
 {
+    pthread_mutex_lock(&mutexwait);
     if(this->running)
     {
         MHD_stop_daemon (this->daemon);
         this->running = false;
     }
+    pthread_cond_signal(&mutexcond);
+    pthread_mutex_unlock(&mutexwait);
     return true;
 }
 
@@ -665,7 +676,7 @@ int webserver::answer_to_connection(void* cls, MHD_Connection* connection,
     mr->dhr->set_path(st_url);
     mr->dhr->set_method(method);
 
-/*    if (    0 == strcmp(method, MHD_HTTP_METHOD_DELETE) || 
+/*    if (0 == strcmp(method, MHD_HTTP_METHOD_DELETE) || 
         0 == strcmp(method, MHD_HTTP_METHOD_GET) ||
         0 == strcmp(method, MHD_HTTP_METHOD_CONNECT) ||
         0 == strcmp(method, MHD_HTTP_METHOD_HEAD) ||
@@ -692,7 +703,12 @@ int webserver::answer_to_connection(void* cls, MHD_Connection* connection,
             return MHD_YES;
         } 
     } 
-    else 
+    else if(0 != strcmp(method, MHD_HTTP_METHOD_DELETE) &&
+            0 != strcmp(method, MHD_HTTP_METHOD_GET) &&
+            0 != strcmp(method, MHD_HTTP_METHOD_CONNECT) &&
+            0 != strcmp(method, MHD_HTTP_METHOD_HEAD) &&
+            0 != strcmp(method, MHD_HTTP_METHOD_TRACE)
+    )
     {
         return method_not_acceptable_page(cls, connection);
     }

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ webserver::webserver`
`223`	`223`	`else`
`224`	`224`	`this->single_resource = false;`
`225`	`225`	`ignore_sigpipe();`
	`226`	`+ pthread_mutex_init(&mutexwait, NULL);`
	`227`	`+ pthread_cond_init(&mutexcond, NULL);`
`226`	`228`	`}`
`227`	`229`
`228`	`230`	`webserver::webserver(const create_webserver& params):`
`@@ -266,16 +268,20 @@ webserver::webserver(const create_webserver& params):`
`266`	`268`	`else`
`267`	`269`	`this->single_resource = false;`
`268`	`270`	`ignore_sigpipe();`
	`271`	`+ pthread_mutex_init(&mutexwait, NULL);`
	`272`	`+ pthread_cond_init(&mutexcond, NULL);`
`269`	`273`	`}`
`270`	`274`
`271`	`275`	`webserver::~webserver()`
`272`	`276`	`{`
`273`	`277`	`this->stop();`
	`278`	`+ pthread_mutex_destroy(&mutexwait);`
	`279`	`+ pthread_cond_destroy(&mutexcond);`
`274`	`280`	`}`
`275`	`281`
`276`	`282`	`void webserver::sweet_kill()`
`277`	`283`	`{`
`278`		`- this->running = false;`
	`284`	`+ this->stop();`
`279`	`285`	`}`
`280`	`286`
`281`	`287`	`void webserver::request_completed (void cls, struct MHD_Connection connection, void **con_cls, enum MHD_RequestTerminationCode toe)`
`@@ -380,15 +386,17 @@ bool webserver::start(bool blocking)`
`380`	`386`	`Py_BEGIN_ALLOW_THREADS;`
`381`	`387`	`}`
`382`	`388`	`#endif`
	`389`	`+ pthread_mutex_lock(&mutexwait);`
`383`	`390`	`while(blocking && running)`
`384`		`- sleep(1);`
	`391`	`+ pthread_cond_wait(&mutexcond, &mutexwait);`
	`392`	`+ pthread_mutex_unlock(&mutexwait);`
`385`	`393`	`#ifdef WITH_PYTHON`
`386`	`394`	`if(PyEval_ThreadsInitialized())`
`387`	`395`	`{`
`388`	`396`	`Py_END_ALLOW_THREADS;`
`389`	`397`	`}`
`390`	`398`	`#endif`
`391`		`- value_onclose = this->stop();`
	`399`	`+ value_onclose = true;`
`392`	`400`	`}`
`393`	`401`	`return value_onclose;`
`394`	`402`	`}`
`@@ -400,11 +408,14 @@ bool webserver::is_running()`
`400`	`408`
`401`	`409`	`bool webserver::stop()`
`402`	`410`	`{`
	`411`	`+ pthread_mutex_lock(&mutexwait);`
`403`	`412`	`if(this->running)`
`404`	`413`	`{`
`405`	`414`	`MHD_stop_daemon (this->daemon);`
`406`	`415`	`this->running = false;`
`407`	`416`	`}`
	`417`	`+ pthread_cond_signal(&mutexcond);`
	`418`	`+ pthread_mutex_unlock(&mutexwait);`
`408`	`419`	`return true;`
`409`	`420`	`}`
`410`	`421`
`@@ -665,7 +676,7 @@ int webserver::answer_to_connection(void* cls, MHD_Connection* connection,`
`665`	`676`	`mr->dhr->set_path(st_url);`
`666`	`677`	`mr->dhr->set_method(method);`
`667`	`678`
`668`		`-/* if ( 0 == strcmp(method, MHD_HTTP_METHOD_DELETE) \|\|`
	`679`	`+/* if (0 == strcmp(method, MHD_HTTP_METHOD_DELETE) \|\|`
`669`	`680`	`0 == strcmp(method, MHD_HTTP_METHOD_GET) \|\|`
`670`	`681`	`0 == strcmp(method, MHD_HTTP_METHOD_CONNECT) \|\|`
`671`	`682`	`0 == strcmp(method, MHD_HTTP_METHOD_HEAD) \|\|`
`@@ -692,7 +703,12 @@ int webserver::answer_to_connection(void* cls, MHD_Connection* connection,`
`692`	`703`	`return MHD_YES;`
`693`	`704`	`}`
`694`	`705`	`}`
`695`		`- else`
	`706`	`+ else if(0 != strcmp(method, MHD_HTTP_METHOD_DELETE) &&`
	`707`	`+ 0 != strcmp(method, MHD_HTTP_METHOD_GET) &&`
	`708`	`+ 0 != strcmp(method, MHD_HTTP_METHOD_CONNECT) &&`
	`709`	`+ 0 != strcmp(method, MHD_HTTP_METHOD_HEAD) &&`
	`710`	`+ 0 != strcmp(method, MHD_HTTP_METHOD_TRACE)`
	`711`	`+ )`
`696`	`712`	`{`
`697`	`713`	`return method_not_acceptable_page(cls, connection);`
`698`	`714`	`}`