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/01/04 12:45:18 UTC
svn commit: r608808 [2/2] - in /webservices/sandesha/trunk/c: include/
src/msgprocessors/ src/polling/ src/storage/beans/ src/storage/sqlite/
src/util/ src/workers/
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Fri Jan 4 03:45:14 2008
@@ -206,8 +206,8 @@
sandesha2_permanent_sender_mgr_match(
sandesha2_permanent_bean_mgr_t *sender_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate);
+ void *bean,
+ void *candidate);
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_permanent_sender_mgr_get_next_msg_to_send(
@@ -291,7 +291,7 @@
"[sandesha2]Entry:sandesha2_permanent_sender_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
+ msg_id = sandesha2_sender_bean_get_msg_id(bean,
env);
msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
@@ -396,7 +396,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
+ msg_id = sandesha2_sender_bean_get_msg_id(bean,
env);
msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
@@ -450,10 +450,10 @@
"sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
"wsrm_anon_uri, to_address from sender;";
ret = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
- (sandesha2_rm_bean_t *) bean, sandesha2_sender_find_callback,
+ bean, sandesha2_sender_find_callback,
sql_find);
if(bean)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *) bean, env);
+ sandesha2_sender_bean_free(bean, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_internal_seq_id");
return ret;
@@ -475,7 +475,7 @@
"sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
"wsrm_anon_uri, to_address from sender;";
ret = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
- (sandesha2_rm_bean_t *) bean, sandesha2_sender_find_callback,
+ bean, sandesha2_sender_find_callback,
sql_find);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_sender_bean");
@@ -496,7 +496,7 @@
"sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
"wsrm_anon_uri, to_address from sender;";
return (sandesha2_sender_bean_t *) sandesha2_permanent_bean_mgr_find(
- sender_mgr_impl->bean_mgr, env, (sandesha2_rm_bean_t *) bean,
+ sender_mgr_impl->bean_mgr, env, (void *) bean,
sandesha2_sender_find_callback, sql_find);
}
@@ -504,9 +504,11 @@
sandesha2_permanent_sender_mgr_match(
sandesha2_permanent_bean_mgr_t *sender_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate)
+ void *bean1,
+ void *candidate1)
{
+ sandesha2_sender_bean_t *bean = (sandesha2_sender_bean_t *) bean1;
+ sandesha2_sender_bean_t *candidate = (sandesha2_sender_bean_t *) candidate1;
axis2_bool_t add = AXIS2_TRUE;
axis2_char_t *ref_key = NULL;
axis2_char_t *temp_ref_key = NULL;
@@ -627,10 +629,10 @@
"time_to_send, msg_type, seq_id, wsrm_anon_uri, "\
"to_address from sender;";
match_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
- (sandesha2_rm_bean_t *) matcher, sandesha2_sender_find_callback,
+ matcher, sandesha2_sender_find_callback,
sql_find);
if(matcher)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *)matcher, env);
+ sandesha2_sender_bean_free(matcher, env);
/*
* We either return an application message or an RM message. If we find
@@ -668,7 +670,7 @@
do_free = AXIS2_FALSE;
}
if(bean && do_free)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *)bean, env);
+ sandesha2_sender_bean_free(bean, env);
}
if(match_list)
axutil_array_list_free(match_list, env);
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c Fri Jan 4 03:45:14 2008
@@ -21,7 +21,6 @@
#include <sandesha2_error.h>
#include <sandesha2_utils.h>
#include <sandesha2_seq_property_mgr.h>
-#include <sandesha2_rm_bean.h>
#include <axutil_log.h>
#include <axutil_hash.h>
#include <axutil_thread.h>
@@ -163,8 +162,8 @@
sandesha2_permanent_seq_property_mgr_match(
sandesha2_permanent_bean_mgr_t *seq_prop,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate);
+ void *bean,
+ void *candidate);
axutil_array_list_t *AXIS2_CALL
sandesha2_permanent_seq_property_mgr_retrieve_all(
@@ -375,7 +374,7 @@
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
sql_find = "select seq_id, name,value from seq_property";
ret = sandesha2_permanent_bean_mgr_find(seq_prop_mgr_impl->bean_mgr, env,
- (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_find_callback,
+ bean, sandesha2_seq_property_find_callback,
sql_find);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_find");
@@ -395,7 +394,7 @@
sql_find = "select seq_id, name,value from seq_property";
return (sandesha2_seq_property_bean_t *)
sandesha2_permanent_bean_mgr_find_unique(seq_prop_mgr_impl->bean_mgr,
- env, (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_find_callback,
+ env, bean, sandesha2_seq_property_find_callback,
sql_find);
}
@@ -403,9 +402,13 @@
sandesha2_permanent_seq_property_mgr_match(
sandesha2_permanent_bean_mgr_t *seq_prop_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate)
+ void *bean1,
+ void *candidate1)
{
+ sandesha2_seq_property_bean_t *bean =
+ (sandesha2_seq_property_bean_t *) bean1;
+ sandesha2_seq_property_bean_t *candidate =
+ (sandesha2_seq_property_bean_t *) candidate1;
axis2_bool_t equal = AXIS2_TRUE;
axis2_char_t *seq_id = NULL;
axis2_char_t *temp_seq_id = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h Fri Jan 4 03:45:14 2008
@@ -28,7 +28,6 @@
#include <axutil_string.h>
#include <axutil_utils.h>
#include <axutil_array_list.h>
-#include <sandesha2_rm_bean.h>
#include <sandesha2_msg_store_bean.h>
#include "sqlite3.h"
@@ -48,8 +47,8 @@
match) (
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate);
+ void *bean,
+ void *candidate);
};
AXIS2_DECLARE_DATA struct sandesha2_permanent_bean_mgr
@@ -97,7 +96,7 @@
const axutil_env_t *env,
axis2_char_t *sql_stmt_remove);
-sandesha2_rm_bean_t *AXIS2_CALL
+void *AXIS2_CALL
sandesha2_permanent_bean_mgr_retrieve(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
@@ -114,15 +113,15 @@
sandesha2_permanent_bean_mgr_find(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
+ void *bean,
int (*find_func)(void *, int, char **, char **),
axis2_char_t *sql_stmt_find);
-sandesha2_rm_bean_t *AXIS2_CALL
+void *AXIS2_CALL
sandesha2_permanent_bean_mgr_find_unique(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
+ void *bean,
int (*find_func)(void *, int, char **, char **),
axis2_char_t *sql_stmt_find);
@@ -130,8 +129,8 @@
sandesha2_permanent_bean_mgr_match(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- sandesha2_rm_bean_t *bean,
- sandesha2_rm_bean_t *candidate);
+ void *bean,
+ void *candidate);
sandesha2_msg_store_bean_t *AXIS2_CALL
sandesha2_permanent_bean_mgr_retrieve_msg_store_bean(
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=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Fri Jan 4 03:45:14 2008
@@ -342,8 +342,7 @@
if(0 == axutil_strcmp(to, to_str))
continue;
sandesha2_sender_mgr_remove(sender_mgr, env,
- sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- sender_bean, env));
+ sandesha2_sender_bean_get_msg_id(sender_bean, env));
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
msg_ctx_ref_key, conf_ctx);
ack_rm_msg = sandesha2_msg_init_init_msg(env, msg_ctx1);
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Fri Jan 4 03:45:14 2008
@@ -192,8 +192,7 @@
sandesha2_create_seq_bean_t *create_seq_bean =
axutil_array_list_get(list, env, i);
if(create_seq_bean)
- sandesha2_create_seq_bean_free((sandesha2_rm_bean_t *)
- create_seq_bean, env);
+ sandesha2_create_seq_bean_free(create_seq_bean, env);
}
axutil_array_list_free(list, env);
}
@@ -217,7 +216,7 @@
next_bean = axutil_array_list_get(list, env, i);
tmp_id = sandesha2_next_msg_bean_get_seq_id(
- (sandesha2_rm_bean_t *) next_bean, env);
+ next_bean, env);
if(0 == axutil_strcmp(seq_id, tmp_id))
{
contains = AXIS2_TRUE;
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=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Fri Jan 4 03:45:14 2008
@@ -36,7 +36,6 @@
#include <axutil_array_list.h>
#include <axis2_engine.h>
#include <sandesha2_msg_creator.h>
-#include <sandesha2_rm_bean.h>
#include <axis2_transport_out_desc.h>
axutil_hash_t *sandesha2_terminate_mgr_rcv_side_clean_map = NULL;
@@ -182,11 +181,10 @@
map_bean = axutil_array_list_get(found_list, env, i);
msg_store_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
- (sandesha2_rm_bean_t *) map_bean, env);
+ map_bean, env);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, msg_store_key);
sandesha2_invoker_mgr_remove(invoker_mgr, env,
- sandesha2_invoker_bean_get_msg_ctx_ref_key((sandesha2_rm_bean_t *)
- map_bean, env));
+ sandesha2_invoker_bean_get_msg_ctx_ref_key(map_bean, env));
}*/
/*axutil_allocator_switch_to_global_pool(env->allocator);
clean_status = axutil_hash_get(sandesha2_terminate_mgr_rcv_side_clean_map,
@@ -256,8 +254,7 @@
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key,
conf_ctx);
}
- seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *)
- bean, env);
+ seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
if(seq_id)
sandesha2_next_msg_mgr_remove(next_msg_mgr, env, seq_id);
}
@@ -565,8 +562,7 @@
axis2_char_t *msg_id = NULL;
retrans_bean = axutil_array_list_get(found_list, env, i);
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- retrans_bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(retrans_bean, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Removing the"\
" sender bean with msg_id %s and internal_seq_id %s", msg_id,
internal_seq_id);
@@ -599,7 +595,7 @@
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key,
conf_ctx);
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
- (sandesha2_rm_bean_t *) create_seq_bean, env);
+ create_seq_bean, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Removing the"\
" create_seq_bean with msg_id %s and internal_seq_id %s",
msg_id, internal_seq_id);
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=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Fri Jan 4 03:45:14 2008
@@ -361,7 +361,7 @@
st_map_bean = axutil_array_list_get(st_map_list, env, j);
key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
- (sandesha2_rm_bean_t *) st_map_bean, env);
+ st_map_bean, env);
printf("msg_ref_key:%s\n", key);
msg_to_invoke = sandesha2_storage_mgr_retrieve_msg_ctx(
storage_mgr, env, key, invoker->conf_ctx, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Fri Jan 4 03:45:14 2008
@@ -162,8 +162,7 @@
AXIS2_USLEEP(sleep_time);
continue;
}
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- sender_bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(sender_bean, env);
if(msg_id)
{
axis2_bool_t status = AXIS2_TRUE;
@@ -177,6 +176,9 @@
run_sender = AXIS2_FALSE;
}
}
+ if(sender_bean)
+ sandesha2_sender_bean_free(sender_bean, env);
+
}
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?rev=608808&r1=608807&r2=608808&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Fri Jan 4 03:45:14 2008
@@ -227,8 +227,7 @@
"[sandesha2]msg_ctx is not present in the store yet.");
/*msg_ctx is still not stored so try again later.*/
if(sender_worker_bean)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *)
- sender_worker_bean, env);
+ sandesha2_sender_bean_free(sender_worker_bean, env);
return AXIS2_SUCCESS;
}
continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env,
@@ -241,8 +240,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2]Do not continue sending the message");
if(sender_worker_bean)
- sandesha2_sender_bean_free(
- (sandesha2_rm_bean_t *)sender_worker_bean, env);
+ sandesha2_sender_bean_free(sender_worker_bean, env);
return status;
}
@@ -257,8 +255,7 @@
"[sandesha2]Message is not qualified for sending");
if(sender_worker_bean)
- sandesha2_sender_bean_free(
- (sandesha2_rm_bean_t *)sender_worker_bean, env);
+ sandesha2_sender_bean_free(sender_worker_bean, env);
/*return success here to wait till the message is qualified for sending*/
return AXIS2_SUCCESS;
}
@@ -291,8 +288,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]Continue "\
"Sending is true. So returning from Sender Worker");
if(sender_worker_bean)
- sandesha2_sender_bean_free(
- (sandesha2_rm_bean_t *)sender_worker_bean, env);
+ sandesha2_sender_bean_free(sender_worker_bean, env);
return AXIS2_SUCCESS;
}
}
@@ -337,8 +333,7 @@
successfully_sent = AXIS2_FALSE;
}
}
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- sender_worker_bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(sender_worker_bean, env);
bean1 = sandesha2_sender_mgr_retrieve(sender_mgr, env, msg_id);
if(bean1)
{
@@ -357,8 +352,7 @@
{
axis2_char_t *msg_stored_key = NULL;
- msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- bean1, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(bean1, env);
sandesha2_sender_mgr_remove(sender_mgr, env, msg_id);
/* Removing the message from the storage */
msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
@@ -368,9 +362,9 @@
}
}
if(bean1)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *) bean1, env);
+ sandesha2_sender_bean_free(bean1, env);
if(sender_worker_bean)
- sandesha2_sender_bean_free((sandesha2_rm_bean_t *)sender_worker_bean,
+ sandesha2_sender_bean_free(sender_worker_bean,
env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]msg_type:%d", msg_type);
if(successfully_sent)
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org