Author: damitha
Date: Mon Dec 17 09:06:07 2007
New Revision: 604931
URL: http://svn.apache.org/viewvc?rev=604931&view=rev
Log:
Removed sener struct. It now only has functions.
Modified:
webservices/sandesha/trunk/c/include/sandesha2_sender.h
webservices/sandesha/trunk/c/include/sandesha2_utils.h
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
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/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_sender.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender.h?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sender.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender.h Mon Dec 17 09:06:07
2007
@@ -34,47 +34,13 @@
{
#endif
-typedef struct sandesha2_sender_t sandesha2_sender_t;
-
-AXIS2_EXTERN sandesha2_sender_t * AXIS2_CALL
-sandesha2_sender_create(
- const axutil_env_t *env);
-
-/**
- * Frees the sender given as a void pointer. This method would cast the
- * void parameter to an sender pointer and then call free method.
- * @param sender pointer to sender as a void pointer
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_sender_free_void_arg(
- void *sender,
- const axutil_env_t *env);
-
axis2_status_t AXIS2_CALL
-sandesha2_sender_free(
- sandesha2_sender_t *sender,
- const axutil_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_stop_sending (
- sandesha2_sender_t *sender,
- const axutil_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_run_for_seq
- (sandesha2_sender_t *sender,
+sandesha2_sender_run_for_seq(
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_char_t *seq_id,
const axis2_bool_t persistent);
-axis2_status_t AXIS2_CALL
-sandesha2_sender_run (
- sandesha2_sender_t *sender,
- const axutil_env_t *env);
-
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_utils.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_utils.h?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_utils.h Mon Dec 17 09:06:07
2007
@@ -68,8 +68,7 @@
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_utils_get_storage_mgr(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_conf_t *conf);
+ axis2_char_t *dbname);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_seq_property(
@@ -141,7 +140,7 @@
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_utils_get_permanent_storage_mgr(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ axis2_char_t *dbname);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_svr_side_incoming_seq_id(
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Mon Dec 17 09:06:07 2007
@@ -244,8 +244,8 @@
SANDESHA2_SEQ_DIRECTION_OUT);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -408,10 +408,10 @@
axis2_char_t *dbname = NULL;
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
if (storage_mgr)
{
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env,
dbname);
}
sandesha2_report = sandesha2_report_create(env);
@@ -1003,8 +1003,8 @@
return NULL;
}
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
@@ -1255,8 +1255,8 @@
return NULL;
}
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
@@ -1581,8 +1581,8 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -1688,10 +1688,10 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
if(storage_mgr)
{
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env,
dbname);
}
if(seq_prop_mgr)
@@ -1952,6 +1952,7 @@
axiom_soap_envelope_t *response_envelope = NULL;
axiom_soap_body_t *body = NULL;
axiom_node_t *result = NULL;
+ axis2_char_t *dbname = NULL;
options = (axis2_options_t *) axis2_svc_client_get_options(svc_client,
env);
if(!options)
@@ -1964,7 +1965,8 @@
SANDESHA2_CLIENT_SEQ_KEY);
client_seq_key = axutil_property_get_value(property, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
response_envelope = sandesha2_storage_mgr_retrieve_response(storage_mgr,
env,
client_seq_key, msg_no);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Mon Dec
17 09:06:07 2007
@@ -188,11 +188,10 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
sandesha2_seq_ack_set_must_understand(seq_ack, env, AXIS2_FALSE);
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Mon
Dec 17 09:06:07 2007
@@ -182,9 +182,8 @@
seq_id = sandesha2_identifier_get_identifier(
sandesha2_ack_requested_get_identifier(ack_requested, env), env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Dec
17 09:06:07 2007
@@ -266,8 +266,8 @@
axis2_op_ctx_set_in_use(op_ctx, env, AXIS2_TRUE);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
fault_ctx = sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
env, rm_msg_ctx, seq_prop_mgr);
if(fault_ctx)
@@ -293,7 +293,6 @@
sandesha2_storage_mgr_free(storage_mgr, env);
return AXIS2_SUCCESS;
}
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
@@ -806,9 +805,8 @@
AXIS2_WSDL_MESSAGE_LABEL_IN);
/* TODO setting up fault callback */
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
if(!seq_prop_mgr)
{
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Mon Dec 17 09:06:07 2007
@@ -192,8 +192,8 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
@@ -240,7 +240,6 @@
return AXIS2_FAILURE;
}
create_seq_msg_id = (axis2_char_t *)
axis2_relates_to_get_value(relates_to, env);
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
@@ -466,7 +465,6 @@
target_bean);
if(found_list)
size = axutil_array_list_size(found_list, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dam_size:%d", size);
for(i = 0; i < size; i++)
{
sandesha2_sender_bean_t *tmp_bean = NULL;
@@ -479,7 +477,6 @@
sandesha2_identifier_t *ident = NULL;
sandesha2_ack_requested_t *ack_req_part = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came1");
tmp_bean = axutil_array_list_get(found_list, env, i);
key = sandesha2_sender_bean_get_msg_ctx_ref_key(tmp_bean, env);
app_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
Mon Dec 17 09:06:07 2007
@@ -188,6 +188,7 @@
sandesha2_property_bean_t *prop_bean = NULL;
sandesha2_seq_property_bean_t *int_seq_bean = NULL;
axutil_array_list_t *msgs_not_to_send = NULL;
+ axis2_char_t *dbname = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_make_connection_msg_processor_process_in_msg");
@@ -212,12 +213,10 @@
if(msg_ctx)
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(conf_ctx)
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
if(storage_mgr)
{
- axis2_char_t *dbname = NULL;
- dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env,
dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env,
dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
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=604931&r1=604930&r2=604931&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
Mon Dec 17 09:06:07 2007
@@ -214,9 +214,8 @@
return AXIS2_FAILURE;
}
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
@@ -551,9 +550,8 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
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=604931&r1=604930&r2=604931&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
Mon Dec 17 09:06:07 2007
@@ -160,9 +160,8 @@
return AXIS2_FAILURE;
}
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));
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr =sandesha2_permanent_sender_mgr_create(env, dbname);
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Mon Dec 17 09:06:07
2007
@@ -156,6 +156,7 @@
const axis2_char_t *internal_seq_id)
{
sandesha2_storage_mgr_t *storage_mgr = NULL;
+ axis2_char_t *dbname = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_polling_mgr_start");
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
@@ -171,9 +172,8 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "conf_ctx is NULL");
return AXIS2_FAILURE;
}
- storage_mgr = sandesha2_utils_get_storage_mgr(env,
- polling_mgr->conf_ctx,
- axis2_conf_ctx_get_conf(polling_mgr->conf_ctx, env));
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
sandesha2_polling_mgr_set_poll(polling_mgr, env, AXIS2_TRUE);
sandesha2_polling_mgr_schedule_polling_request(polling_mgr, env,
internal_seq_id);
Modified:
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
(original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Mon
Dec 17 09:06:07 2007
@@ -151,6 +151,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
+ axis2_char_t *dbname = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_transport_sender_invoke");
@@ -177,7 +178,8 @@
key = axutil_property_get_value(property, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Mon Dec 17 09:06:07 2007
@@ -297,8 +297,8 @@
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(temp_msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq = (sandesha2_create_seq_t *) sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Mon Dec 17 09:06:07
2007
@@ -157,19 +157,14 @@
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_utils_get_storage_mgr(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_conf_t *conf)
+ axis2_char_t *dbname)
{
- /*axis2_char_t *value = NULL;*/
sandesha2_storage_mgr_t *storage_mgr = NULL;
- /*sandesha2_property_bean_t *prop_bean = NULL;*/
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_utils_get_storage_mgr");
- AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- AXIS2_PARAM_CHECK(env->error, conf, NULL);
- storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, dbname);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_utils_get_storage_mgr");
return storage_mgr;
@@ -380,13 +375,10 @@
axis2_char_t *seq_id,
const axis2_bool_t persistent)
{
- sandesha2_sender_t *sender = NULL;
-
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- sender = sandesha2_sender_create(env);
- return sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id,
+ return sandesha2_sender_run_for_seq(env, conf_ctx, seq_id,
persistent);
}
@@ -454,34 +446,10 @@
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_utils_get_permanent_storage_mgr(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ axis2_char_t *dbname)
{
- /*axutil_property_t *property = NULL;
- axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);*/
sandesha2_storage_mgr_t *storage_mgr = NULL;
- AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
-
- /*property = axis2_ctx_get_property(ctx, env,
SANDESHA2_PERMANENT_STORAGE_MGR);
- if(property)
- {
- storage_mgr = axutil_property_get_value(property, env);
- }
- else
- {
- axis2_char_t *dbname = sandesha2_util_get_dbname(env, conf_ctx);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2]storage_mgr not found in the conf_ctx");
- storage_mgr = sandesha2_permanent_storage_mgr_create(env, dbname);
- property = axutil_property_create_with_args(env,
AXIS2_SCOPE_APPLICATION,
- AXIS2_FALSE, 0, storage_mgr);
- axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
- property);
- if(!storage_mgr)
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Could not create storage_mgr");
- }*/
- axis2_char_t *dbname = sandesha2_util_get_dbname(env, conf_ctx);
storage_mgr = sandesha2_permanent_storage_mgr_create(env, dbname);
return storage_mgr;
}
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Mon Dec 17
09:06:07 2007
@@ -257,9 +257,8 @@
env = axutil_init_thread_env(args->env);
invoker = args->impl;
- storage_mgr = sandesha2_utils_get_storage_mgr(env, invoker->conf_ctx,
- axis2_conf_ctx_get_conf(invoker->conf_ctx, env));
dbname = sandesha2_util_get_dbname(env, invoker->conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
invoker_mgr = sandesha2_permanent_invoker_mgr_create(env, dbname);
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=604931&r1=604930&r2=604931&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Mon Dec 17 09:06:07 2007
@@ -50,18 +50,12 @@
*/
typedef struct sandesha2_sender_args sandesha2_sender_args_t;
-struct sandesha2_sender_t
-{
- axis2_conf_ctx_t *conf_ctx;
- axis2_bool_t run_sender;
- axis2_char_t *seq_id;
- axis2_bool_t persistent_msg_ctx;
-};
-
struct sandesha2_sender_args
{
- sandesha2_sender_t *impl;
axutil_env_t *env;
+ axis2_conf_ctx_t *conf_ctx;
+ axis2_char_t *seq_id;
+ axis2_bool_t persistent_msg_ctx;
};
static void * AXIS2_THREAD_FUNC
@@ -69,106 +63,36 @@
axutil_thread_t *thd,
void *data);
-
-AXIS2_EXTERN sandesha2_sender_t* AXIS2_CALL
-sandesha2_sender_create(
- const axutil_env_t *env)
-{
- sandesha2_sender_t *sender = NULL;
- sender = (sandesha2_sender_t *)AXIS2_MALLOC
- (env->allocator,
- sizeof(sandesha2_sender_t));
- if(NULL == sender)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
- return NULL;
- }
- sender->conf_ctx = NULL;
- sender->run_sender = AXIS2_FALSE;
- sender->seq_id = NULL;
-
- return sender;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_free_void_arg(
- void *sender,
- const axutil_env_t *env)
-{
- sandesha2_sender_t *sender_l = NULL;
-
- sender_l = (sandesha2_sender_t *) sender;
- return sandesha2_sender_free(sender_l, env);
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_free(
- sandesha2_sender_t *sender,
- const axutil_env_t *env)
-{
- sender->conf_ctx = NULL;
- AXIS2_FREE(env->allocator, sender);
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_stop_sending(
- sandesha2_sender_t *sender,
- const axutil_env_t *env)
-{
- sender->run_sender = AXIS2_FALSE;
- sandesha2_sender_free(sender, env);
- return AXIS2_SUCCESS;
-}
-
axis2_status_t AXIS2_CALL
sandesha2_sender_run_for_seq(
- sandesha2_sender_t *sender,
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
+ const axutil_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
axis2_char_t *seq_id,
- const axis2_bool_t persistent)
-{
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_sender_run_for_seq");
- AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
-
- sender->conf_ctx = conf_ctx;
- sender->run_sender = AXIS2_TRUE;
- sender->persistent_msg_ctx = persistent;
- sender->seq_id = seq_id;
- sandesha2_sender_run(sender, env);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_sender_run_for_seq");
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_run (
- sandesha2_sender_t *sender,
- const axutil_env_t *env)
+ const axis2_bool_t persistent_msg_ctx)
{
axutil_thread_t *worker_thread = NULL;
sandesha2_sender_args_t *args = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_sender_run");
+ "[sandesha2]Entry:sandesha2_sender_run_for_seq");
- args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_sender_args_t));
- args->impl = sender;
+ args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_sender_args_t));
args->env = (axutil_env_t*)env;
+ args->conf_ctx = conf_ctx;
+ args->seq_id = seq_id;
+ args->persistent_msg_ctx = persistent_msg_ctx;
worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
sandesha2_sender_worker_func, (void*)args);
if(!worker_thread)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Thread creation "\
- "failed for sandesha2_sender_run");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Thread creation failed for sandesha2_sender_run");
return AXIS2_FAILURE;
}
axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_sender_run");
+ "[sandesha2]Exit:sandesha2_sender_run_for_seq");
return AXIS2_SUCCESS;
}
@@ -180,7 +104,6 @@
axutil_thread_t *thd,
void *data)
{
- sandesha2_sender_t *sender = NULL;
sandesha2_sender_args_t *args;
axutil_env_t *env = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
@@ -192,19 +115,22 @@
int sleep_time = 0;
axutil_qname_t *qname = NULL;
axutil_param_t *sleep_time_param = NULL;
- axis2_char_t *seq_id = NULL;
axis2_char_t *dbname = NULL;
+ axis2_bool_t run_sender = AXIS2_TRUE;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_bool_t persistent_msg_ctx = AXIS2_FALSE;
args = (sandesha2_sender_args_t*)data;
env = axutil_init_thread_env(args->env);
- sender = args->impl;
- sender = (sandesha2_sender_t*)sender;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_sender_worker_func");
- conf = axis2_conf_ctx_get_conf(sender->conf_ctx, env);
- storage_mgr = sandesha2_utils_get_storage_mgr(env, sender->conf_ctx,
- conf);
- dbname = sandesha2_util_get_dbname(env, sender->conf_ctx);
+ conf_ctx = args->conf_ctx;
+ seq_id = axutil_strdup(env, args->seq_id);
+ persistent_msg_ctx = args->persistent_msg_ctx;
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
+ dbname = sandesha2_util_get_dbname(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
@@ -219,8 +145,7 @@
env));
}
axutil_qname_free(qname, env);
- seq_id = sender->seq_id;
- while(sender->run_sender)
+ while(run_sender)
{
sandesha2_sender_bean_t *sender_bean = NULL;
axis2_char_t *msg_id = NULL;
@@ -237,14 +162,14 @@
if(msg_id)
{
axis2_bool_t status = AXIS2_TRUE;
- status = sandesha2_sender_worker_send(env, sender->conf_ctx,
msg_id,
- sender->persistent_msg_ctx, storage_mgr, seq_prop_mgr,
+ status = sandesha2_sender_worker_send(env, conf_ctx, msg_id,
+ persistent_msg_ctx, storage_mgr, seq_prop_mgr,
create_seq_mgr, sender_mgr);
if(!status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2]Stopping the sender for sequence %s", seq_id);
- sandesha2_sender_stop_sending(sender, env);
+ run_sender = AXIS2_FALSE;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
