axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r523967 - in /webservices/axis2/trunk/c/util/include: ./ platforms/unix/ platforms/windows/
Date Fri, 30 Mar 2007 07:04:50 GMT
Author: pini
Date: Fri Mar 30 00:04:48 2007
New Revision: 523967

URL: http://svn.apache.org/viewvc?view=rev&rev=523967
Log:
Fixing jira issue 292

Added:
    webservices/axis2/trunk/c/util/include/axutil_allocator.h
      - copied, changed from r523965, webservices/axis2/trunk/c/util/include/axis2_allocator.h
Removed:
    webservices/axis2/trunk/c/util/include/axis2_allocator.h
Modified:
    webservices/axis2/trunk/c/util/include/axis2_env.h
    webservices/axis2/trunk/c/util/include/axis2_error.h
    webservices/axis2/trunk/c/util/include/axis2_error_default.h
    webservices/axis2/trunk/c/util/include/axis2_log.h
    webservices/axis2/trunk/c/util/include/axis2_log_default.h
    webservices/axis2/trunk/c/util/include/axis2_param_container.h
    webservices/axis2/trunk/c/util/include/axis2_thread.h
    webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h

Modified: webservices/axis2/trunk/c/util/include/axis2_env.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_env.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_env.h Fri Mar 30 00:04:48 2007
@@ -24,7 +24,7 @@
  *  allocator routines
  */
 
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_error.h>
 #include <axis2_log.h>
 #include <axis2_thread_pool.h>
@@ -59,7 +59,7 @@
     typedef struct axis2_env
     {
         /** Memory allocation routines */
-        axis2_allocator_t *allocator;
+        axutil_allocator_t *allocator;
         /** Error handling */
         axis2_error_t *error;
         /** Logging routines */
@@ -89,7 +89,7 @@
      * @return pointer to the newly created environment struct 
      */
     AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create(axis2_allocator_t *allocator);
+    axis2_env_create(axutil_allocator_t *allocator);
 
     /**
       * Creates an environment struct
@@ -99,7 +99,7 @@
       * @return pointer to the newly created environment struct 
       */
     AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error(axis2_allocator_t *allocator, 
+    axis2_env_create_with_error(axutil_allocator_t *allocator, 
         axis2_error_t *error);
 
     /**
@@ -111,7 +111,7 @@
      * @return pointer to the newly created environment struct 
      */
     AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error_log(axis2_allocator_t *allocator, 
+    axis2_env_create_with_error_log(axutil_allocator_t *allocator, 
         axis2_error_t *error, 
         axis2_log_t *log);
 
@@ -125,7 +125,7 @@
     * @return pointer to the newly created environment struct 
     */
     AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error_log_thread_pool(axis2_allocator_t *allocator, 
+    axis2_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
         axis2_error_t *error, 
         axis2_log_t *log, 
         axis2_thread_pool_t *pool);

Modified: webservices/axis2/trunk/c/util/include/axis2_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_error.h Fri Mar 30 00:04:48 2007
@@ -19,7 +19,7 @@
 #define AXIS2_ERROR_H
 
 #include <axis2_utils_defines.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -615,7 +615,7 @@
     typedef struct axis2_error
     {
         /** error related ops */
-        axis2_allocator_t *allocator;
+        axutil_allocator_t *allocator;
         /** last error number */
         int error_number;
         int status_code;

Modified: webservices/axis2/trunk/c/util/include/axis2_error_default.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error_default.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_error_default.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_error_default.h Fri Mar 30 00:04:48 2007
@@ -19,7 +19,7 @@
 #define AXIS2_ERROR_DEFAULT_H
 
 #include <axis2_utils_defines.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_error.h>
 
 #ifdef __cplusplus
@@ -39,7 +39,7 @@
     * @param allocator allocator to be used. Mandatory, cannot be NULL    
     * @return pointer to the newly created error struct 
     */
-    AXIS2_EXTERN axis2_error_t *AXIS2_CALL axis2_error_create (axis2_allocator_t * allocator);
+    AXIS2_EXTERN axis2_error_t *AXIS2_CALL axis2_error_create (axutil_allocator_t * allocator);
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log.h Fri Mar 30 00:04:48 2007
@@ -18,7 +18,7 @@
 #ifndef AXIS2_LOG_H
 #define AXIS2_LOG_H
 
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -82,7 +82,7 @@
          */
 
         void(AXIS2_CALL *
-        free)(axis2_allocator_t *allocator,
+        free)(axutil_allocator_t *allocator,
             struct axis2_log *log);
 
         /**
@@ -150,7 +150,7 @@
             const axis2_char_t *format, ...);
 
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_log_free(axis2_allocator_t *allocator,
+    axis2_log_free(axutil_allocator_t *allocator,
         struct axis2_log *log);
 
     AXIS2_EXTERN void AXIS2_CALL

Modified: webservices/axis2/trunk/c/util/include/axis2_log_default.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log_default.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log_default.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log_default.h Fri Mar 30 00:04:48 2007
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <axis2_log.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 
 
 #ifdef __cplusplus
@@ -44,12 +44,12 @@
     * @param allocator allocator to be used. Mandatory, cannot be NULL    
     * @return pointer to the newly created log struct 
     */
-    AXIS2_EXTERN axis2_log_t * AXIS2_CALL axis2_log_create (axis2_allocator_t * allocator,
+    AXIS2_EXTERN axis2_log_t * AXIS2_CALL axis2_log_create (axutil_allocator_t * allocator,
                      axis2_log_ops_t * ops, const axis2_char_t * stream_name);
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL  axis2_log_impl_get_time_str(void);
     
     AXIS2_EXTERN axis2_log_t * AXIS2_CALL 
-    axis2_log_create_default (axis2_allocator_t *allocator);
+    axis2_log_create_default (axutil_allocator_t *allocator);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Fri Mar 30 00:04:48 2007
@@ -32,7 +32,7 @@
 #include <axis2_error.h>
 #include <axis2_utils_defines.h>
 #include <axis2_env.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axis2_array_list.h>
 #include <axis2_hash.h>

Modified: webservices/axis2/trunk/c/util/include/axis2_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread.h Fri Mar 30 00:04:48 2007
@@ -24,7 +24,7 @@
   * @brief axis2 thread api
   */
 
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
 
@@ -72,7 +72,7 @@
      * @return Newly created thread attribute
      */
     AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-    axis2_threadattr_create(axis2_allocator_t *allocator);
+    axis2_threadattr_create(axutil_allocator_t *allocator);
 
     /**
      * Set if newly created threads should be created in detached state.
@@ -92,7 +92,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_threadattr_is_detach(axis2_threadattr_t *attr, 
-        axis2_allocator_t *allocator);
+        axutil_allocator_t *allocator);
 
 
     /**
@@ -104,7 +104,7 @@
      * @return The newly created thread handle.
      */
     AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-    axis2_thread_create(axis2_allocator_t *allocator, 
+    axis2_thread_create(axutil_allocator_t *allocator, 
         axis2_threadattr_t *attr,
         axis2_thread_start_t func, void *data);
 
@@ -115,7 +115,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_thread_exit(axis2_thread_t *thd, 
-        axis2_allocator_t *allocator);
+        axutil_allocator_t *allocator);
 
     /**
      * Block until the desired thread stops executing.
@@ -137,7 +137,7 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_thread_once_t* AXIS2_CALL
-    axis2_thread_once_init(axis2_allocator_t *allocator);
+    axis2_thread_once_init(axutil_allocator_t *allocator);
 
     /**
      * Run the specified function one time, regardless of how many threads
@@ -178,7 +178,7 @@
      * it will behave as either a nested or an unnested lock.
      */
     AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL
-    axis2_thread_mutex_create(axis2_allocator_t *allocator, 
+    axis2_thread_mutex_create(axutil_allocator_t *allocator, 
         unsigned int flags);
     /**
      * Acquire the lock for the given mutex. If the mutex is already locked,

Modified: webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread_pool.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread_pool.h Fri Mar 30 00:04:48 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_thread.h>
 
 #ifdef __cplusplus
@@ -91,7 +91,7 @@
     * @return initialized thread_pool. NULL on error.
     */
     AXIS2_EXTERN axis2_thread_pool_t * AXIS2_CALL 
-    axis2_thread_pool_init(axis2_allocator_t *allocator);
+    axis2_thread_pool_init(axutil_allocator_t *allocator);
 
     /**
      * This function can be used to initialize the environment in case of

Copied: webservices/axis2/trunk/c/util/include/axutil_allocator.h (from r523965, webservices/axis2/trunk/c/util/include/axis2_allocator.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_allocator.h?view=diff&rev=523967&p1=webservices/axis2/trunk/c/util/include/axis2_allocator.h&r1=523965&p2=webservices/axis2/trunk/c/util/include/axutil_allocator.h&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_allocator.h Fri Mar 30 00:04:48 2007
@@ -19,7 +19,7 @@
 #define AXIS2_ALLOCATOR_H
 
 /**
- * @file axis2_allocator.h
+ * @file axutil_allocator.h
  * @brief Axis2 memory allocator interface
  */
 
@@ -31,7 +31,7 @@
 #endif
 
 /**
- * @defgroup axis2_allocator allocator
+ * @defgroup axutil_allocator allocator
  * @ingroup axis2_util 
 
  * @{
@@ -44,7 +44,7 @@
   *
   * Encapsulator for memory allocating routines
   */
-    typedef struct axis2_allocator
+    typedef struct axutil_allocator
     {
       /**
         * allocates memory
@@ -54,7 +54,7 @@
         * @param size size of the memory block to be allocated
         * @return pointer to the allocated memory block
         */
-         void * (AXIS2_CALL *malloc_fn) (struct axis2_allocator *allocator, size_t size);
+         void * (AXIS2_CALL *malloc_fn) (struct axutil_allocator *allocator, size_t size);
       /**
         * re-llocates memory
         * @param allocator pointer to allocator struct. In the default 
@@ -64,7 +64,7 @@
         * @param size size of the memory block to be allocated
         * @return pointer to the allocated memory block
         */
-         void * (AXIS2_CALL *realloc) (struct axis2_allocator *allocator, void *ptr, size_t
size);
+         void * (AXIS2_CALL *realloc) (struct axutil_allocator *allocator, void *ptr, size_t
size);
       /**
         * frees memory
         * @param allocator pointer to allocator struct. In the default 
@@ -72,30 +72,30 @@
         * when the allocator implementation is dealing with a memory pool.
         * @param ptr pointer to be freed
         */
-         void (AXIS2_CALL *free_fn) (struct axis2_allocator *allocator, void *ptr);
+         void (AXIS2_CALL *free_fn) (struct axutil_allocator *allocator, void *ptr);
         /** local memory pool */
          void *local_pool;
         /** global memory pool */
          void *global_pool;
          /** memory pool in use currently */
          void *current_pool;
-    } axis2_allocator_t;
+    } axutil_allocator_t;
 
   /**
     * Initializes (creates) an allocator.
     * @param allocator user defined allcator. Optional, can be NULL. If NULL, a default allocator
will be returned.
     * @return initialized allocator. NULL on error.
     */
-    AXIS2_EXTERN axis2_allocator_t * AXIS2_CALL 
-    axis2_allocator_init (axis2_allocator_t *allocator);
+    AXIS2_EXTERN axutil_allocator_t * AXIS2_CALL 
+    axutil_allocator_init (axutil_allocator_t *allocator);
 
   /** 
     * This function should be used to deallocate memory if the default allocator provided
by
-    * axis2_allocator_init() 
+    * axutil_allocator_init() 
     * @param allocator 
     */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_allocator_free(axis2_allocator_t *allocator);
+    axutil_allocator_free(axutil_allocator_t *allocator);
 
   /** 
     * Swaps the local_pool and global_pool values. 
@@ -106,18 +106,18 @@
     * @param allocator allocator whose memory pools are to be switched
     */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_allocator_switch_to_global_pool(axis2_allocator_t *allocator);
+    axutil_allocator_switch_to_global_pool(axutil_allocator_t *allocator);
 
   /** 
     * Swaps the local_pool and global_pool values. 
     * In case of using pools, local_pool is suppoed to hold the pool out of which
     * local values are allocated. In case of values that live beyond a request 
     * globle pool should be used. This method can be used to inverse the switching 
-    * done by axis2_allocator_switch_to_global_pool, to start using the local pool again.
+    * done by axutil_allocator_switch_to_global_pool, to start using the local pool again.
     * @param allocator allocator whose memory pools are to be switched
     */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_allocator_switch_to_local_pool(axis2_allocator_t *allocator);
+    axutil_allocator_switch_to_local_pool(axutil_allocator_t *allocator);
 
 #define AXIS2_MALLOC(allocator, size) \
       ((allocator)->malloc_fn(allocator, size))

Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h Fri Mar 30 00:04:48
2007
@@ -45,7 +45,7 @@
 
 /*************************Thread locking functions*****************************/
 struct axis2_thread_mutex_t {
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     pthread_mutex_t mutex;
 };
 

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
(original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
Fri Mar 30 00:04:48 2007
@@ -20,7 +20,7 @@
 
 #include <process.h>
 #include <windows.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 typedef enum thread_mutex_type 
 {
     thread_mutex_critical_section,
@@ -37,7 +37,7 @@
     thread_mutex_type type;
     HANDLE            handle;
     CRITICAL_SECTION  section;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
 };
 
 #endif  /* AXIS2_THREAD_MUTEX_WINDOWS_H */

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h?view=diff&rev=523967&r1=523966&r2=523967
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h Fri Mar
30 00:04:48 2007
@@ -52,7 +52,7 @@
 };
 
 AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-axis2_threadattr_create(axis2_allocator_t *allocator);
+axis2_threadattr_create(axutil_allocator_t *allocator);
 
 /* Destroy the threadattr object */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -70,11 +70,11 @@
 
 
 AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_create(axis2_allocator_t *allocator, axis2_threadattr_t *attr,
+axis2_thread_create(axutil_allocator_t *allocator, axis2_threadattr_t *attr,
         axis2_thread_start_t func, void *data);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_exit(axis2_thread_t *thd, axis2_allocator_t *allocator);
+axis2_thread_exit(axis2_thread_t *thd, axutil_allocator_t *allocator);
 
 AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
 axis2_os_thread_current(void);
@@ -92,7 +92,7 @@
 axis2_os_thread_get(axis2_thread_t *thd, const axis2_env_t *env);
 
 AXIS2_EXTERN axis2_thread_once_t * AXIS2_CALL
-axis2_thread_once_init(axis2_allocator_t *allocator);
+axis2_thread_once_init(axutil_allocator_t *allocator);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_thread_once(axis2_thread_once_t *control, void(*func)(void));



---------------------------------------------------------------------
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