axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r524713 - in /webservices/axis2/trunk/c: modules/core/clientapi/listener_manager.c modules/core/clientapi/op_client.c modules/core/transport/http/receiver/http_svr_thread.c util/include/axutil_thread_pool.h util/src/env.c
Date Mon, 02 Apr 2007 01:41:49 GMT
Author: samisa
Date: Sun Apr  1 18:41:48 2007
New Revision: 524713

URL: http://svn.apache.org/viewvc?view=rev&rev=524713
Log:
Removed macros form thread_pool

Modified:
    webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/util/include/axutil_thread_pool.h
    webservices/axis2/trunk/c/util/src/env.c

Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=524713&r1=524712&r2=524713
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Sun Apr  1 18:41:48
2007
@@ -136,7 +136,7 @@
 #ifdef AXIS2_SVR_MULTI_THREADED
                     if (env->thread_pool)
                     {
-                        worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+                        worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
                                 axis2_listener_manager_worker_func, (void*)arg_list);
                         if (! worker_thread)
                         {
@@ -145,7 +145,7 @@
                         }
                         else
                         {
-                            AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+                            axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
                         }
                     }
                     else

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=524713&r1=524712&r2=524713
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Sun Apr  1 18:41:48 2007
@@ -476,14 +476,14 @@
 #ifdef AXIS2_SVR_MULTI_THREADED
             if(env->thread_pool)
             {
-                worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+                worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
                     axis2_op_client_worker_func, (void*)arg_list);
                 if(! worker_thread)
                 {
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
                         "call invoke non blocking");
                 }
-                AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+                axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
             }
             else
             {
@@ -623,7 +623,7 @@
         axis2_free_thread_env(th_env);
         th_env = NULL;
     }
-    AXIS2_THREAD_POOL_EXIT_THREAD(th_pool, thd);
+    axutil_thread_pool_exit_thread(th_pool, thd);
     return NULL;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=524713&r1=524712&r2=524713
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Sun Apr
 1 18:41:48 2007
@@ -146,7 +146,7 @@
         arg_list->socket = socket;
         arg_list->worker = svr_thread->worker;
 #ifdef AXIS2_SVR_MULTI_THREADED
-        worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+        worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
                 axis2_svr_thread_worker_func, (void *)arg_list);
         if (! worker_thread)
         {
@@ -154,7 +154,7 @@
                     "server thread loop");
             continue;
         }
-        AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+        axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
 #else
         axis2_svr_thread_worker_func(NULL, (void *)arg_list);
 #endif
@@ -297,7 +297,7 @@
         thread_env = NULL;
     }
 #ifdef AXIS2_SVR_MULTI_THREADED
-    /*AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);*/
+    /*axutil_thread_pool_exit_thread(env->thread_pool, thd);*/
 #endif
 
     return NULL;

Modified: webservices/axis2/trunk/c/util/include/axutil_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_thread_pool.h?view=diff&rev=524713&r1=524712&r2=524713
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_thread_pool.h Sun Apr  1 18:41:48 2007
@@ -107,19 +107,19 @@
     AXIS2_EXTERN void AXIS2_CALL
     axis2_free_thread_env(struct axutil_env *thread_env);
 
-#define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \
+#define axutil_thread_pool_get_thread(thread_pool, func, data) \
       axutil_thread_pool_get_thread(thread_pool, func, data)
 
-#define AXIS2_THREAD_POOL_JOIN_THREAD(thread_pool, thd) \
+#define axutil_thread_pool_join_thread(thread_pool, thd) \
       axutil_thread_pool_join_thread(thread_pool, thd)
 
-#define AXIS2_THREAD_POOL_EXIT_THREAD(thread_pool, thd) \
+#define axutil_thread_pool_exit_thread(thread_pool, thd) \
       axutil_thread_pool_exit_thread(thread_pool, thd)
 
-#define AXIS2_THREAD_POOL_THREAD_DETACH(thread_pool, thd) \
+#define axutil_thread_pool_thread_detach(thread_pool, thd) \
       axutil_thread_pool_thread_detach(thread_pool, thd)
 
-#define AXIS2_THREAD_POOL_FREE(thread_pool) \
+#define axutil_thread_pool_free(thread_pool) \
       axutil_thread_pool_free(thread_pool)
 
     /** @} */

Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=524713&r1=524712&r2=524713
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Sun Apr  1 18:41:48 2007
@@ -74,7 +74,7 @@
     }
     if (env && env->thread_pool)
     {
-        AXIS2_THREAD_POOL_FREE(env->thread_pool);
+        axutil_thread_pool_free(env->thread_pool);
         env->thread_pool = NULL;
     }
     if (env && env->allocator)
@@ -227,7 +227,7 @@
     }
     if (mask & 0x4)
     {
-        AXIS2_THREAD_POOL_FREE(env->thread_pool);
+        axutil_thread_pool_free(env->thread_pool);
     }
     if (env)
         AXIS2_FREE(env->allocator, env);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message