Add more fine grain debug options and remove overhead in debug log macros when logging is turned off.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1308248 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 14 insertions, 14 deletions

diff --git a/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp b/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
index f6a239efe1..a23687d6b4 100644
--- a/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
+++ b/sca-cpp/trunk/modules/http/mod-ssltunnel.cpp
@@ -36,7 +36,7 @@
 #include "http.hpp"
 
 // Ignore cast align warnings in APR macros
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic ignored "-Wcast-align"
 #endif
 
@@ -373,7 +373,7 @@ module AP_MODULE_DECLARE_DATA mod_tuscany_ssltunnel = {
 }
 
 // Reenable cast align warnings
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic warning "-Wcast-align"
 #endif
 
diff --git a/sca-cpp/trunk/modules/java/eval.hpp b/sca-cpp/trunk/modules/java/eval.hpp
index 1e119aac80..31fb09f741 100644
--- a/sca-cpp/trunk/modules/java/eval.hpp
+++ b/sca-cpp/trunk/modules/java/eval.hpp
@@ -72,7 +72,7 @@ public:
             options[args.nOptions].optionString = const_cast<char*>(c_str(cp));
             options[args.nOptions++].extraInfo = NULL;
 
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_ASSERT
             // Enable assertions
             options[args.nOptions++].optionString = const_cast<char*>("-ea");
 #endif
diff --git a/sca-cpp/trunk/modules/js/eval.hpp b/sca-cpp/trunk/modules/js/eval.hpp
index 17f73f2b43..149716e4ca 100644
--- a/sca-cpp/trunk/modules/js/eval.hpp
+++ b/sca-cpp/trunk/modules/js/eval.hpp
@@ -27,13 +27,13 @@
  */
 
 #define XP_UNIX
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 #include <jsapi.h>
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic warning "-Wunused-parameter"
 #pragma GCC diagnostic warning "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
diff --git a/sca-cpp/trunk/modules/opencl/eval.hpp b/sca-cpp/trunk/modules/opencl/eval.hpp
index 35eb6a3b3b..82706ff0f2 100644
--- a/sca-cpp/trunk/modules/opencl/eval.hpp
+++ b/sca-cpp/trunk/modules/opencl/eval.hpp
@@ -47,11 +47,11 @@ const string clError(const cl_int e) {
     return str(s);
 }
 
-#ifdef WANT_MAINTAINER_MODE
-
 /**
  * OpenCL profiling counters.
  */
+#ifdef WANT_MAINTAINER_OPENCL_PROF
+
 cl_ulong memtime = 0;
 cl_ulong kernelqtime = 0;
 cl_ulong kerneltime = 0;
@@ -209,7 +209,7 @@ public:
 
         for (cl_uint i = 0; i < ndevs; i++) {
             cl_int cqerr;
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_OPENCL_PROF
             cq[i] = clCreateCommandQueue(ctx, devid[i], CL_QUEUE_PROFILING_ENABLE, &cqerr);
 #else
             cq[i] = clCreateCommandQueue(ctx, devid[i], 0, &cqerr);
@@ -594,7 +594,7 @@ const failable<OpenCLKernel> createKernel(const value& expr, const OpenCLProgram
  */
 const failable<value> evalKernel(const failable<OpenCLKernel>& fkernel, const value& expr, const size_t gwsize, const value::ValueType type, const size_t n, const OpenCLContext& cl) {
 
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_OPENCL_PROF
     const cl_uint estart = (cl_uint)timens();
     const cl_uint pstart = estart;
 #endif
@@ -643,7 +643,7 @@ const failable<value> evalKernel(const failable<OpenCLKernel>& fkernel, const va
         return mkfailure<value>(string("Couldn't read from OpenCL device memory: ") + clError(rerr));
     }
 
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_OPENCL_PROF
     const cl_uint pend = (cl_uint)timens();
     preptime += (pend - pstart);
 #endif
@@ -656,7 +656,7 @@ const failable<value> evalKernel(const failable<OpenCLKernel>& fkernel, const va
         return mkfailure<value>(string("Couldn't wait for kernel completion: ") + clError(werr));
     }
 
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_OPENCL_PROF
     profileMemEvents(nwevt, wevt);
     profileKernelEvent(kevt);
     profileMemEvent(revt);
@@ -669,7 +669,7 @@ const failable<value> evalKernel(const failable<OpenCLKernel>& fkernel, const va
     clReleaseEvent(revt);
     clReleaseEvent(kevt);
 
-#ifdef WANT_MAINTAINER_MODE
+#ifdef WANT_MAINTAINER_OPENCL_PROF
     const cl_uint eend = (cl_uint)timens();
     evaltime += (eend - estart);
 #endif
diff --git a/sca-cpp/trunk/modules/server/mod-eval.hpp b/sca-cpp/trunk/modules/server/mod-eval.hpp
index 6595c36266..ef2a2f6575 100644
--- a/sca-cpp/trunk/modules/server/mod-eval.hpp
+++ b/sca-cpp/trunk/modules/server/mod-eval.hpp
@@ -1043,7 +1043,7 @@ int translate(request_rec *r) {
     // Create a scoped memory pool
     gc_scoped_pool pool(r->pool);
 
-    httpdDebugRequest(r, "modeval::translate::input");
+    debug_httpdRequest(r, "modeval::translate::input");
 
     // Get the server configuration
     const ServerConf& sc = httpd::serverConf<ServerConf>(r, &mod_tuscany_eval);
@@ -1142,7 +1142,7 @@ int handler(request_rec *r) {
     gc_scoped_pool pool(r->pool);
     ScopedRequest sr(r);
 
-    httpdDebugRequest(r, "modeval::handler::input");
+    debug_httpdRequest(r, "modeval::handler::input");
 
     // Get the request configuration
     RequestConf& reqc = httpd::requestConf<RequestConf>(r, &mod_tuscany_eval);