You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/11/23 00:53:37 UTC
svn commit: r597512 - in /webservices/sandesha/trunk/c/src:
msgprocessors/terminate_seq_msg_processor.c
msgprocessors/terminate_seq_res_msg_processor.c util/ack_mgr.c
util/terminate_mgr.c
Author: damitha
Date: Thu Nov 22 15:53:35 2007
New Revision: 597512
URL: http://svn.apache.org/viewvc?rev=597512&view=rev
Log:
Formatting log messages and adding comments
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?rev=597512&r1=597511&r2=597512&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Thu Nov 22 15:53:35 2007
@@ -106,7 +106,6 @@
const axutil_env_t *env)
{
sandesha2_terminate_seq_msg_processor_impl_t *msg_proc_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
msg_proc_impl = ( sandesha2_terminate_seq_msg_processor_impl_t *)AXIS2_MALLOC
(env->allocator,
@@ -145,7 +144,6 @@
const axutil_env_t *env)
{
sandesha2_terminate_seq_msg_processor_impl_t *msg_proc_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_proc_impl = SANDESHA2_INTF_TO_IMPL(msg_processor);
if(msg_processor->ops)
@@ -265,12 +263,13 @@
axis2_bool_t add_res_side_term = AXIS2_FALSE;
axis2_char_t *out_seq_id = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_"\
+ "terminate_seq_msg_processor_setup_highest_msg_nums");
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
highest_in_msg_num_str = sandesha2_utils_get_seq_property(env, seq_id,
@@ -335,6 +334,8 @@
out_seq_id, res_side_int_seq_id, storage_mgr);
}
}
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Exit:sandesha2_"\
+ "terminate_seq_msg_processor_setup_highest_msg_nums");
return AXIS2_SUCCESS;
}
@@ -360,10 +361,11 @@
sandesha2_sender_bean_t *term_res_bean = NULL;
axis2_char_t *key = NULL;
sandesha2_sender_mgr_t *retrans_mgr = NULL;*/
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_"\
+ "terminate_seq_msg_processor_add_terminate_seq_res");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
out_msg_ctx = sandesha2_utils_create_out_msg_ctx(env, msg_ctx);
@@ -450,9 +452,15 @@
{
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
}
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Exit:sandesha2_"\
+ "terminate_seq_msg_processor_add_terminate_seq_res");
return AXIS2_SUCCESS;
}
-
+
+/**
+ * This function is invoked in RM 1.1 where client explicitly send the
+ * terminate sequence message
+ */
static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
@@ -480,10 +488,9 @@
axis2_char_t *temp_action = NULL;
axutil_string_t *soap_action = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg.");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Entry:sandesha2_terminate_msg_processor_process_out_msg.");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
@@ -593,8 +600,8 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, int_seq_id,
axis2_msg_ctx_get_server_side(msg_ctx, env), storage_mgr);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit: sandesha2_terminate_msg_processor_process_out_msg");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Exit:sandesha2_terminate_msg_processor_process_out_msg");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?rev=597512&r1=597511&r2=597512&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Thu Nov 22 15:53:35 2007
@@ -153,6 +153,9 @@
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
storage_mgr = (sandesha2_storage_mgr_t *) sandesha2_utils_get_storage_mgr(
env, conf_ctx, axis2_conf_ctx_get_conf(conf_ctx, env));
+ /* We need to pass here internal seq id isn't it?:damitha
+ int internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
+ SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);*/
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
AXIS2_FALSE, storage_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Exit:sandesha2_"\
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?rev=597512&r1=597511&r2=597512&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Thu Nov 22 15:53:35 2007
@@ -349,8 +349,6 @@
int i = 0;
long start = 1;
-
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, ack_ranges, AXIS2_FALSE);
hash = axutil_hash_make(env);
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?rev=597512&r1=597511&r2=597512&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Nov 22 15:53:35 2007
@@ -78,9 +78,8 @@
axis2_bool_t in_order_invoke = AXIS2_FALSE;
sandesha2_property_bean_t *prop_bean = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -126,7 +125,7 @@
axutil_allocator_switch_to_local_pool(env->allocator);
}
}
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg");
return AXIS2_SUCCESS;
}
@@ -144,9 +143,8 @@
int i = 0;
axis2_char_t *clean_status = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_terminate_mgr_clean_recv_side_after_invocation");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -199,7 +197,7 @@
}
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACEenv->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_clean_recv_side_after_invocation");
return AXIS2_SUCCESS;
}
@@ -217,9 +215,8 @@
axis2_char_t *highest_in_msg_key = NULL;
int i = 0, size = 0;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_terminate_mgr_complete_termination_of_recv_side");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -259,7 +256,7 @@
}
sandesha2_terminate_mgr_remove_recv_side_properties(env, conf_ctx, seq_id,
storage_mgr);
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_complete_termination_of_recv_side");
return AXIS2_SUCCESS;
}
@@ -276,9 +273,8 @@
axutil_array_list_t *found_list = NULL;
sandesha2_seq_property_bean_t *find_seq_prop_bean = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_terminate_mgr_remove_recv_side_properties");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -345,7 +341,7 @@
}
}
}
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_remove_recv_side_properties");
return AXIS2_SUCCESS;
}
@@ -360,7 +356,7 @@
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *seq_term_bean = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI
"[sandesha2]Entry:sandesha2_terminate_mgr_terminate_sending_side");
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
@@ -373,7 +369,7 @@
sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id,
svr_side, storage_mgr);
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_terminate_sending_side");
return AXIS2_SUCCESS;
}
@@ -388,7 +384,6 @@
axis2_bool_t add_entry_with_seq_id = AXIS2_FALSE;
axis2_char_t *name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, prop_bean, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, prop_mgr, AXIS2_FAILURE);
@@ -456,7 +451,6 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *seq_term_bean = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -488,9 +482,8 @@
sandesha2_create_seq_bean_t *find_create_seq_bean = NULL;
sandesha2_seq_property_bean_t *find_seq_prop_bean = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_terminate_mgr_clean_sending_side_data");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -603,7 +596,7 @@
}
}
}
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_terminate_mgr_clean_sending_side_data");
return AXIS2_SUCCESS;
}
@@ -643,9 +636,8 @@
axis2_char_t *seq_id = NULL;
axis2_char_t *internal_seq_id = NULL;
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] Start:sandesha2_terminate_mgr_add_terminate_seq_msg");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Entry:sandesha2_terminate_mgr_add_terminate_seq_msg");
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, int_seq_id, AXIS2_FAILURE);
@@ -661,8 +653,8 @@
&& 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
sandesha2_seq_property_bean_get_value(terminated, env)))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was"
- " added previously");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "\
+ "sequence message was added previously");
/* If we do not return at this, there will be two terminate messsages
* sent to the client
*/
@@ -813,8 +805,8 @@
}
engine = axis2_engine_create(env, conf_ctx);
status = axis2_engine_send(engine, env, msg_ctx1);
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] Exit:sandesha2_terminate_mgr_add_terminate_seq_msg");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Exit:sandesha2_terminate_mgr_add_terminate_seq_msg");
return status;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org