ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r602636 - in /webservices/sandesha/trunk/c: config/module.xml src/util/msg_retrans_adjuster.c src/util/property_bean.c src/util/property_mgr.c src/util/seq_mgr.c src/util/terminate_mgr.c
Date Sun, 09 Dec 2007 04:56:49 GMT
Author: damitha
Date: Sat Dec  8 20:56:49 2007
New Revision: 602636

URL: http://svn.apache.org/viewvc?rev=602636&view=rev
Log:
Now sequence timeout functionality works fine with RM 1.0

Modified:
    webservices/sandesha/trunk/c/config/module.xml
    webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
    webservices/sandesha/trunk/c/src/util/property_bean.c
    webservices/sandesha/trunk/c/src/util/property_mgr.c
    webservices/sandesha/trunk/c/src/util/seq_mgr.c
    webservices/sandesha/trunk/c/src/util/terminate_mgr.c

Modified: webservices/sandesha/trunk/c/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?rev=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Sat Dec  8 20:56:49 2007
@@ -74,14 +74,14 @@
    <parameter name="db_password" locked="false">g</parameter>
    <!-- General parameters -->
     <parameter name="ExponentialBackoff" locked="false">AXIS2_FALSE</parameter>
-    <parameter name="RetransmissionInterval" locked="false">10</parameter>
-    <parameter name="AcknowledgementInterval" locked="false">10</parameter><!--
in seconds-->
-    <parameter name="InactivityTimeout" locked="false">60</parameter>
+    <parameter name="RetransmissionInterval" locked="false">4</parameter><!--In
seconds-->
+    <parameter name="AcknowledgementInterval" locked="false">4</parameter><!--In
seconds-->
+    <parameter name="InactivityTimeout" locked="false">10</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">10</parameter>
-    <parameter name="SenderSleepTime" locked="false">100000</parameter><!--
In micro seconds-->
+    <parameter name="SenderSleepTime" locked="false">100000</parameter><!--In
micro seconds-->
     <parameter name="InvokerSleepTime" locked="false">1</parameter>
     <parameter name="PollingWaitTime" locked="false">3</parameter>
 

Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?rev=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Sat Dec  8 20:56:49 2007
@@ -101,7 +101,11 @@
             rm_msg_ctx, storage_mgr);
     
     if(AXIS2_TRUE == seq_timed_out)
+    {
         timeout_seq = AXIS2_TRUE;
+        AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+            "[sandesha2]Sequence with internal_seq_id %s timed out", int_seq_id);
+    }
         
     if(timeout_seq)
     {
@@ -175,6 +179,8 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_ctx_t *ctx = NULL;
     
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Entry:sandesha2_msg_retrans_adjuster_finalize_timedout_seq");
     AXIS2_PARAM_CHECK(env->error, int_seq_id, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -186,6 +192,8 @@
     sandesha2_terminate_mgr_time_out_sending_side_seq(env, conf_ctx, int_seq_id,
         AXIS2_FALSE, storage_mgr);
  
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Exit:sandesha2_msg_retrans_adjuster_finalize_timedout_seq");
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/sandesha/trunk/c/src/util/property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?rev=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Sat Dec  8 20:56:49 2007
@@ -143,13 +143,13 @@
     AXIS2_PARAM_CHECK(env->error, units, AXIS2_FAILURE);
     
     if(0 == axutil_strcmp(units, "seconds"))
-        multiplier = 1000;
+        multiplier = 1;
     else if(0 == axutil_strcmp(units, "minutes"))
-        multiplier = 60*1000;
+        multiplier = 60;
     else if(0 == axutil_strcmp(units, "hours"))
-        multiplier = 60*60*1000;
+        multiplier = 60*60;
     else if(0 == axutil_strcmp(units, "days"))
-        multiplier = 24*60*60*1000;
+        multiplier = 24*60*60;
     else
         return AXIS2_FAILURE;
         

Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?rev=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Sat Dec  8 20:56:49 2007
@@ -316,7 +316,6 @@
     axis2_char_t *str2 = NULL;
     int timeout = -1;
     
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, measure, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);

Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?rev=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Sat Dec  8 20:56:49 2007
@@ -260,6 +260,8 @@
     long timeout_interval = -1;
     axis2_conf_ctx_t *conf_ctx = NULL;
     
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Entry:sandesha2_seq_mgr_has_seq_timedout");
     AXIS2_PARAM_CHECK(env->error, property_key, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FALSE);
@@ -278,9 +280,19 @@
     last_activated_time = sandesha2_seq_mgr_get_last_activated_time(env, 
         property_key, storage_mgr);
     current_time = sandesha2_utils_get_current_time_in_millis(env);
+    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]timeout_interval:%ld", 
+        timeout_interval);
+    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]last_activated_time:%ld", 
+        last_activated_time);
+    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]current_time:%ld", 
+        current_time);
     if(last_activated_time > 0 && ((last_activated_time + timeout_interval) <

         current_time))
-            seq_timedout = AXIS2_TRUE;
+    {
+        seq_timedout = AXIS2_TRUE;
+    }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Exit:sandesha2_seq_mgr_has_seq_timedout");
     return seq_timedout;
 }
 

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=602636&r1=602635&r2=602636&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Sat Dec  8 20:56:49 2007
@@ -460,6 +460,8 @@
     sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
     sandesha2_seq_property_bean_t *seq_term_bean = NULL;
     
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Entry:sandesha2_terminate_mgr_time_out_sending_side_seq");
     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);
@@ -471,6 +473,8 @@
     sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_term_bean);
     sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id,
         svr_side, storage_mgr);
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "[sandesha2]Exit:sandesha2_terminate_mgr_time_out_sending_side_seq");
     return AXIS2_SUCCESS;
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message