[prev in list] [next in list] [prev in thread] [next in thread]
List: wsf-c-commits
Subject: [Wsf-commits] svn commit r53667 - in
From: damitha () wso2 ! com
Date: 2010-01-26 15:28:30
Message-ID: E1NZnLC-0006L1-6X () wso2 ! org
[Download RAW message or body]
Author: damitha
Date: Tue Jan 26 07:28:29 2010
New Revision: 53667
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=53667
Log:
Modified:
trunk/wsf/c/adminservices/statistics_admin/axis2_counter.h
trunk/wsf/c/adminservices/statistics_admin/axis2_skel_StatisticsAdmin.c
trunk/wsf/c/adminservices/statistics_admin/axis2_statistics_admin_constants.h
trunk/wsf/c/adminservices/statistics_admin/counter.c
trunk/wsf/c/adminservices/statistics_admin/module/axis2_response_time_processor.h
trunk/wsf/c/adminservices/statistics_admin/module/fault_count_handler.c
trunk/wsf/c/adminservices/statistics_admin/module/in_op_count_handler.c
trunk/wsf/c/adminservices/statistics_admin/module/out_op_count_handler.c
trunk/wsf/c/adminservices/statistics_admin/module/response_time_processor.c
trunk/wsf/c/adminservices/statistics_admin/module/svc_request_count_handler.c
Modified: trunk/wsf/c/adminservices/statistics_admin/axis2_counter.h
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/axis2_counter.h?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/axis2_counter.h (original)
+++ trunk/wsf/c/adminservices/statistics_admin/axis2_counter.h Tue Jan 26 07:28:29 \
2010 @@ -39,18 +39,16 @@
* @brief counter struct impl
* Counter Struct
*/
-typedef struct axis2_counter
-{
- int count;
- axutil_thread_mutex_t *mutex;
-} axis2_counter_t;
-
+typedef struct axis2_counter_t axis2_counter_t;
+struct axis2_msg_ctx;
AXIS2_EXTERN axis2_counter_t* AXIS2_CALL
axis2_counter_create(
- const axutil_env_t *env);
+ const axutil_env_t *env,
+ const axis2_char_t *svc_name,
+ const axis2_char_t *op_name);
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
axis2_counter_free(
axis2_counter_t *counter,
const axutil_env_t *env);
@@ -58,7 +56,14 @@
void AXIS2_CALL
axis2_counter_increment (
axis2_counter_t *counter,
- const axutil_env_t *env);
+ const axutil_env_t *env,
+ struct axis2_msg_ctx *msg_ctx);
+
+int AXIS2_CALL
+axis2_counter_get_count (
+ axis2_counter_t *counter,
+ const axutil_env_t *env,
+ struct axis2_msg_ctx *msg_ctx);
/** @} */
#ifdef __cplusplus
Modified: trunk/wsf/c/adminservices/statistics_admin/axis2_skel_StatisticsAdmin.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/axis2_skel_StatisticsAdmin.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/axis2_skel_StatisticsAdmin.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/axis2_skel_StatisticsAdmin.c Tue Jan \
26 07:28:29 2010 @@ -11,7 +11,7 @@
#include "codegen/axis2_skel_StatisticsAdmin.h"
#include "axis2_statistics_admin_constants.h"
#include "module/axis2_response_time_processor.h"
- #include "module/axis2_counter.h"
+ #include "axis2_counter.h"
@@ -96,7 +96,7 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- get_svc_req_count_res = \
adb_getServiceRequestCountResponse_create_with_values(env, counter->count); + \
get_svc_req_count_res = adb_getServiceRequestCountResponse_create_with_values(env, \
axis2_counter_get_count(counter, env, msg_ctx)); }
}
}
@@ -163,7 +163,8 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- get_op_res_count_res = \
adb_getOperationResponseCountResponse_create_with_values(env, counter->count); + \
get_op_res_count_res = adb_getOperationResponseCountResponse_create_with_values(env, \
+ axis2_counter_get_count(counter, env, msg_ctx)); \
} }
}
@@ -435,7 +436,7 @@
if(param)
{
counter = axutil_param_get_value(param, env);
- svc_fault_count_res = \
adb_getServiceFaultCountResponse_create_with_values(env, counter->count); + \
svc_fault_count_res = adb_getServiceFaultCountResponse_create_with_values(env, \
axis2_counter_get_count(counter, env, msg_ctx)); }
return (adb_getServiceFaultCountResponse_t*) svc_fault_count_res;
@@ -708,7 +709,8 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- get_op_fault_count_res = \
adb_getOperationFaultCountResponse_create_with_values(env, counter->count); + \
get_op_fault_count_res = adb_getOperationFaultCountResponse_create_with_values(env, \
+ axis2_counter_get_count(counter, env, msg_ctx)); \
} }
}
@@ -812,7 +814,7 @@
{
axis2_counter_t *counter = NULL;
counter = axutil_param_get_value(param, env);
- count += counter->count;
+ count += axis2_counter_get_count(counter, env, msg_ctx);
}
}
}
@@ -960,7 +962,8 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- get_op_req_count_res = \
adb_getOperationRequestCountResponse_create_with_values(env, counter->count); + \
get_op_req_count_res = adb_getOperationRequestCountResponse_create_with_values(env, \
+ axis2_counter_get_count(counter, env, msg_ctx)); \
} }
}
Modified: trunk/wsf/c/adminservices/statistics_admin/axis2_statistics_admin_constants.h
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/axis2_statistics_admin_constants.h?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/axis2_statistics_admin_constants.h (original)
+++ trunk/wsf/c/adminservices/statistics_admin/axis2_statistics_admin_constants.h Tue \
Jan 26 07:28:29 2010 @@ -34,5 +34,8 @@
#define AXIS2_REQUEST_RECEIVED_TIME "wso2statistics.request.received.time"
#define AXIS2_RESPONSE_SENT_TIME "wso2statistics.response.sent.time"
#define AXIS2_STATISTISTICS_MODULE_NAME "wso2statistics"
+#define AXIS2_MOD_STATISTICS_ADMIN_OUT_OP_COUNT_HANDLER \
"wso2statistics.out_op_count_handler" +#define \
AXIS2_MOD_STATISTICS_ADMIN_IN_OP_COUNT_HANDLER "wso2statistics.in_op_count_handler" \
+#define AXIS2_MOD_STATISTICS_ADMIN_FAULT_COUNT_HANDLER \
"wso2statistics.fault_count_handler"
#endif /* STATISTICS_ADMIN_CONSTANTS_H_ */
Modified: trunk/wsf/c/adminservices/statistics_admin/counter.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/counter.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/counter.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/counter.c Tue Jan 26 07:28:29 2010
@@ -15,10 +15,21 @@
*/
#include <axis2_counter.h>
+#include <axutil_string.h>
+#include <axis2_msg_ctx.h>
+
+struct axis2_counter_t
+{
+ int count;
+ axis2_char_t *svc_name;
+ axis2_char_t *op_name;
+};
AXIS2_EXTERN axis2_counter_t* AXIS2_CALL
axis2_counter_create(
- const axutil_env_t *env)
+ const axutil_env_t *env,
+ const axis2_char_t *svc_name,
+ const axis2_char_t *op_name)
{
axis2_counter_t *counter = NULL;
@@ -31,26 +42,23 @@
return NULL;
}
counter->count = 0;
- counter->mutex = axutil_thread_mutex_create(env->allocator, \
AXIS2_THREAD_MUTEX_DEFAULT);
- if(!counter->mutex)
+ if(svc_name)
{
- axis2_counter_free(counter, env);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Counter mutex creation failed");
- return NULL;
+ counter->svc_name = axutil_strdup(env, svc_name);
+ }
+ if(op_name)
+ {
+ counter->op_name = axutil_strdup(env, op_name);
}
return counter;
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
axis2_counter_free(
axis2_counter_t *counter,
const axutil_env_t *env)
{
- if(counter->mutex)
- {
- axutil_thread_mutex_destroy(counter->mutex);
- }
if(counter)
{
AXIS2_FREE(env->allocator, counter);
@@ -60,10 +68,31 @@
void AXIS2_CALL
axis2_counter_increment (
axis2_counter_t *counter,
- const axutil_env_t *env)
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
- axutil_thread_mutex_lock(counter->mutex);
+ void *stat_count_fn_arg = NULL;
+ axutil_property_t *property = NULL;
+
+ property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_STATISTICS_COUNT_ARG);
+ stat_count_fn_arg = axutil_property_get_value(property, env);
+ counter->count = env->get_statistics_count_fn(stat_count_fn_arg, \
counter->op_name, counter->svc_name); counter->count++;
- axutil_thread_mutex_unlock(counter->mutex);
+ env->set_statistics_count_fn(stat_count_fn_arg, counter->op_name, \
counter->svc_name, counter->count); }
+int AXIS2_CALL
+axis2_counter_get_count (
+ axis2_counter_t *counter,
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
+{
+ void *stat_count_fn_arg = NULL;
+ axutil_property_t *property = NULL;
+
+ property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_STATISTICS_COUNT_ARG);
+ stat_count_fn_arg = axutil_property_get_value(property, env);
+ counter->count = env->get_statistics_count_fn(stat_count_fn_arg, \
counter->op_name, counter->svc_name); + return counter->count;
+}
+
Modified: trunk/wsf/c/adminservices/statistics_admin/module/axis2_response_time_processor.h
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/axis2_response_time_processor.h?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/axis2_response_time_processor.h (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/axis2_response_time_processor.h Tue \
Jan 26 07:28:29 2010 @@ -52,7 +52,7 @@
axis2_response_time_processor_create(
const axutil_env_t *env);
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
axis2_response_time_processor_free(
axis2_response_time_processor_t *res_time_proc,
const axutil_env_t *env);
Modified: trunk/wsf/c/adminservices/statistics_admin/module/fault_count_handler.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/fault_count_handler.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/fault_count_handler.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/fault_count_handler.c Tue Jan \
26 07:28:29 2010 @@ -66,22 +66,25 @@
svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if(svc)
{
+ const axis2_char_t *svc_name = NULL;
axis2_op_t *op = NULL;
+
+ svc_name = axis2_svc_get_name(svc, env);
param = axis2_svc_get_param(svc, env, AXIS2_SERVICE_FAULT_COUNTER);
if(param)
{
counter = axutil_param_get_value(param, env);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
}
}
else
{
- counter = axis2_counter_create(env);
+ counter = axis2_counter_create(env, svc_name, NULL);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
param = axutil_param_create(env, AXIS2_SERVICE_FAULT_COUNTER, \
counter); if(param)
{
@@ -98,15 +101,17 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
}
}
else
{
- axis2_counter_create(env);
+ axis2_char_t *op_name = NULL;
+ op_name = axutil_qname_get_localpart(axis2_op_get_qname(op, env), \
env); + axis2_counter_create(env, svc_name, op_name);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
param = axutil_param_create(env, AXIS2_OPERATION_FAULT_COUNTER, \
counter); if(param)
{
Modified: trunk/wsf/c/adminservices/statistics_admin/module/in_op_count_handler.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/in_op_count_handler.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/in_op_count_handler.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/in_op_count_handler.c Tue Jan \
26 07:28:29 2010 @@ -59,10 +59,17 @@
axis2_counter_t *counter = NULL;
axutil_param_t *param = NULL;
axis2_op_t *op = NULL;
+ axis2_svc_t *svc = NULL;
+ const axis2_char_t *svc_name = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[adminservices] \
Start:axis2_statistics_admin_in_op_count_handler_invoke"); \
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
+ if(svc)
+ {
+ svc_name = axis2_svc_get_name(svc, env);
+ }
op = axis2_msg_ctx_get_op(msg_ctx, env);
if(op)
{
@@ -72,15 +79,18 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
}
}
else
{
- axis2_counter_create(env);
+ axis2_char_t *op_name = NULL;
+
+ op_name = axutil_qname_get_localpart(axis2_op_get_qname(op, env), env);
+ axis2_counter_create(env, svc_name, op_name);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
param = axutil_param_create(env, AXIS2_IN_OPERATION_COUNTER, \
counter); if(param)
{
Modified: trunk/wsf/c/adminservices/statistics_admin/module/out_op_count_handler.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/out_op_count_handler.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/out_op_count_handler.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/out_op_count_handler.c Tue Jan \
26 07:28:29 2010 @@ -59,10 +59,17 @@
axis2_counter_t *counter = NULL;
axutil_param_t *param = NULL;
axis2_op_t *op = NULL;
+ axis2_svc_t *svc = NULL;
+ const axis2_char_t *svc_name = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[adminservices] \
Start:axis2_statistics_admin_out_op_count_handler_invoke"); \
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
+ if(svc)
+ {
+ svc_name = axis2_svc_get_name(svc, env);
+ }
op = axis2_msg_ctx_get_op(msg_ctx, env);
if(op)
{
@@ -72,15 +79,18 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
}
}
else
{
- axis2_counter_create(env);
+ axis2_char_t *op_name = NULL;
+
+ op_name = axutil_qname_get_localpart(axis2_op_get_qname(op, env), env);
+ axis2_counter_create(env, svc_name, op_name);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
param = axutil_param_create(env, AXIS2_OUT_OPERATION_COUNTER, \
counter); if(param)
{
Modified: trunk/wsf/c/adminservices/statistics_admin/module/response_time_processor.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/response_time_processor.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/response_time_processor.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/response_time_processor.c Tue \
Jan 26 07:28:29 2010 @@ -38,7 +38,7 @@
return res_time_proc;
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
axis2_response_time_processor_free(
axis2_response_time_processor_t *res_time_proc,
const axutil_env_t *env)
Modified: trunk/wsf/c/adminservices/statistics_admin/module/svc_request_count_handler.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/statistics_admin/module/svc_request_count_handler.c?rev=53667&r1=53666&r2=53667&view=diff
==============================================================================
--- trunk/wsf/c/adminservices/statistics_admin/module/svc_request_count_handler.c (original)
+++ trunk/wsf/c/adminservices/statistics_admin/module/svc_request_count_handler.c Tue \
Jan 26 07:28:29 2010 @@ -72,15 +72,18 @@
counter = axutil_param_get_value(param, env);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
}
}
else
{
- axis2_counter_create(env);
+ const axis2_char_t *svc_name = NULL;
+
+ svc_name = axis2_svc_get_name(svc, env);
+ axis2_counter_create(env, svc_name, NULL);
if(counter)
{
- axis2_counter_increment(counter, env);
+ axis2_counter_increment(counter, env, msg_ctx);
param = axutil_param_create(env, AXIS2_SERVICE_REQUEST_COUNTER, \
counter); if(param)
{
_______________________________________________
Wsf-commits mailing list
Wsf-commits@wso2.org
https://mail.wso2.org/cgi-bin/mailman/listinfo/wsf-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic