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 2008/06/15 12:31:55 UTC
svn commit: r667937 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008:
config/module.xml include/sandesha2_constants.h
src/msgprocessors/app_msg_processor.c
src/storage/sqlite/permanent_sender_mgr.c
Author: damitha
Date: Sun Jun 15 03:31:54 2008
New Revision: 667937
URL: http://svn.apache.org/viewvc?rev=667937&view=rev
Log:
Now create sequence message resending application message resending work fine.
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml?rev=667937&r1=667936&r2=667937&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml Sun Jun 15 03:31:54 2008
@@ -73,13 +73,13 @@
<parameter name="sandesha2_db" locked="false">/tmp/sandesha2_db</parameter>
<!-- General parameters -->
<parameter name="ExponentialBackoff" locked="false">AXIS2_FALSE</parameter>
- <parameter name="RetransmissionInterval" locked="false">4</parameter><!--In seconds-->
+ <parameter name="RetransmissionInterval" locked="false">1</parameter><!--In seconds-->
<parameter name="InactivityTimeout" locked="false">64</parameter><!--In seconds-->
<parameter name="StorageManager" locked="false">persistent</parameter>
<parameter name="InvokeInOrder" locked="false">AXIS2_FALSE</parameter>
<parameter name="MessageTypesToDrop" locked="false">none</parameter>
- <parameter name="MaxRetransCount" locked="false">100</parameter>
- <parameter name="SenderSleepTime" locked="false">100000</parameter><!--In micro seconds-->
+ <parameter name="MaxRetransCount" locked="false">10</parameter>
+ <parameter name="SenderSleepTime" locked="false">1</parameter><!--In seconds-->
<parameter name="InvokerSleepTime" locked="false">1</parameter>
<parameter name="PollingWaitTime" locked="false">2</parameter>
<parameter name="TerminateDelay" locked="false">4</parameter>
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h?rev=667937&r1=667936&r2=667937&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h Sun Jun 15 03:31:54 2008
@@ -425,7 +425,7 @@
#define SANDESHA2_INVOKER_SLEEP_TIME 1 /*4 1 */
- #define SANDESHA2_SENDER_SLEEP_TIME 100000 /*micro seconds*/
+ #define SANDESHA2_SENDER_SLEEP_TIME 1 /*seconds*/
#define SANDESHA2_POLLING_MANAGER_WAIT_TIME 3 /* 4 3 */
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=667937&r1=667936&r2=667937&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c Sun Jun 15 03:31:54 2008
@@ -83,7 +83,7 @@
axis2_char_t *internal_sequence_id;
axis2_char_t *msg_id;
axis2_bool_t is_server_side;
- int sleep_time;
+ int retrans_interval;
};
static void * AXIS2_THREAD_FUNC
@@ -98,7 +98,7 @@
axis2_char_t *internal_sequence_id,
axis2_char_t *msg_id,
const axis2_bool_t is_server_side,
- int sleep_time);
+ int retrans_interval);
static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_in_msg (
@@ -2192,8 +2192,8 @@
axis2_char_t *rmd_sequence_id = NULL;
axis2_module_desc_t *module_desc = NULL;
axutil_qname_t *qname = NULL;
- axutil_param_t *sleep_time_param = NULL;
- int sleep_time = 0;
+ axutil_param_t *retrans_interval_param = NULL;
+ int retrans_interval = 0;
axis2_conf_t *conf = NULL;
const axis2_char_t *mep = NULL;
@@ -2583,10 +2583,11 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
qname = axutil_qname_create(env, SANDESHA2_MODULE, NULL, NULL);
module_desc = axis2_conf_get_module(conf, env, qname);
- sleep_time_param = axis2_module_desc_get_param(module_desc, env, SANDESHA2_SENDER_SLEEP);
- if(sleep_time_param)
+ retrans_interval_param = axis2_module_desc_get_param(module_desc, env,
+ SANDESHA2_PROPERTIES_RETRANSMISSION_INTERVAL);
+ if(retrans_interval_param)
{
- sleep_time = AXIS2_ATOI(axutil_param_get_value(sleep_time_param, env));
+ retrans_interval = AXIS2_ATOI(axutil_param_get_value(retrans_interval_param, env));
}
if(qname)
{
@@ -2651,7 +2652,7 @@
break;
}
- AXIS2_SLEEP(sleep_time);
+ AXIS2_SLEEP(retrans_interval);
if(transport_sender)
{
/* This is neccessary to avoid a double free */
@@ -2735,7 +2736,7 @@
* sandesha2_sender_mgr_get_application_msg_to_send() function. If it has arrived exit from
* the thread.*/
sandesha2_app_msg_processor_start_application_msg_resender(env, conf_ctx, internal_sequence_id,
- msg_id, is_svr_side, sleep_time);
+ msg_id, is_svr_side, retrans_interval);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[Sandesha2] Exit:sandesha2_app_msg_processor_send_app_msg");
@@ -3164,7 +3165,7 @@
axis2_char_t *internal_sequence_id,
axis2_char_t *msg_id,
const axis2_bool_t is_server_side,
- int sleep_time)
+ int retrans_interval)
{
axutil_thread_t *worker_thread = NULL;
sandesha2_app_msg_processor_args_t *args = NULL;
@@ -3179,7 +3180,7 @@
args->conf_ctx = conf_ctx;
args->internal_sequence_id = internal_sequence_id;
args->msg_id = msg_id;
- args->sleep_time = sleep_time;
+ args->retrans_interval = retrans_interval;
args->is_server_side = is_server_side;
++(env->allocator->ref_pool_allocator);
@@ -3210,7 +3211,7 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_sender_mgr_t *sender_mgr = NULL;
- int sleep_time = 0;
+ int retrans_interval = 0;
axis2_char_t *dbname = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *internal_sequence_id = NULL;
@@ -3228,7 +3229,7 @@
msg_id = args->msg_id;
internal_sequence_id = axutil_strdup(env, args->internal_sequence_id);
is_server_side = args->is_server_side;
- sleep_time = args->sleep_time;
+ retrans_interval = args->retrans_interval;
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);
@@ -3237,7 +3238,7 @@
while(AXIS2_TRUE)
{
- AXIS2_SLEEP(sleep_time);
+ AXIS2_SLEEP(retrans_interval);
sender_bean = sandesha2_sender_mgr_get_application_msg_to_send(sender_mgr, env,
internal_sequence_id, msg_id);
if(!sender_bean)
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c?rev=667937&r1=667936&r2=667937&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c Sun Jun 15 03:31:54 2008
@@ -412,8 +412,6 @@
sql_update);
return ret;
-
- return AXIS2_SUCCESS;
}
axutil_array_list_t *AXIS2_CALL
@@ -594,7 +592,7 @@
int match_list_size = 0;
axutil_array_list_t *match_list = NULL;
axis2_char_t sql_find[1024];
- long time_now = 0;
+ /*long time_now = 0;*/
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
sandesha2_sender_bean_t *result = NULL;
@@ -605,15 +603,15 @@
"time_to_send, msg_type, seq_id, wsrm_anon_uri, "\
"to_address from sender where ");
- time_now = sandesha2_utils_get_current_time_in_millis(env);
+ /*time_now = sandesha2_utils_get_current_time_in_millis(env);
if(time_now > 0)
{
sprintf(sql_find + axutil_strlen(sql_find), "time_to_send <= %ld ", time_now);
- }
+ }*/
if(seq_id)
{
- sprintf(sql_find + axutil_strlen(sql_find), "and internal_seq_id='%s'", seq_id);
+ sprintf(sql_find + axutil_strlen(sql_find), "internal_seq_id='%s'", seq_id);
}
if(msg_id)
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org