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/04 11:47:33 UTC
svn commit: r663042 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008: ./
samples/ src/msgprocessors/ src/storage/sqlite/
Author: damitha
Date: Wed Jun 4 02:47:32 2008
New Revision: 663042
URL: http://svn.apache.org/viewvc?rev=663042&view=rev
Log:
Removing separate threads for sending messages
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/build.sh
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/samples/build.sh
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_bean_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_create_seq_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_next_msg_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_sender_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_seq_property_mgr.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/build.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/build.sh?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/build.sh (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/build.sh Wed Jun 4 02:47:32 2008
@@ -1,5 +1,5 @@
#!/bin/bash
./autogen.sh
./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include/axis2-1.4.0
-make
+make -j30
make install
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/samples/build.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/samples/build.sh?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/samples/build.sh (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/samples/build.sh Wed Jun 4 02:47:32 2008
@@ -3,5 +3,5 @@
./autogen.sh
./configure --prefix=${AXIS2C_HOME} --with-axis2=${AXIS2C_HOME}/include/axis2-1.4.0
-make
+make -j30
make install
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/app_msg_processor.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/app_msg_processor.c Wed Jun 4 02:47:32 2008
@@ -1100,14 +1100,12 @@
if(client_sequence_key_bean)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "came1");
rms_internal_sequence_id = sandesha2_seq_property_bean_get_value(client_sequence_key_bean, env);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id:%s", rms_internal_sequence_id);
}
if(!rms_internal_sequence_id)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "came2");
rms_internal_sequence_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to,
client_sequence_key);
}
@@ -2262,8 +2260,7 @@
axis2_bool_t continue_sending = AXIS2_TRUE;
int msg_type = -1;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[Sandesha2] sandesha2_app_msg_processor_send_app_msg");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[Sandesha2] Entry:sandesha2_app_msg_processor_send_app_msg");
AXIS2_PARAM_CHECK(env->error, rms_internal_sequence_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
@@ -2282,6 +2279,7 @@
rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
rms_internal_sequence_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id2:%s", rms_internal_sequence_id);
while(!rms_sequence_bean)
{
rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/create_seq_res_msg_processor.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/msgprocessors/create_seq_res_msg_processor.c Wed Jun 4 02:47:32 2008
@@ -171,6 +171,8 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ is_svr_side = sandesha2_msg_ctx_get_server_side(rm_msg_ctx, env);
+
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
@@ -307,6 +309,7 @@
rms_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID, rms_sequence_id);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id1:%s", rms_internal_sequence_id);
rms_internal_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, rms_sequence_id,
SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, rms_internal_sequence_id);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_bean_mgr.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_bean_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_bean_mgr.c Wed Jun 4 02:47:32 2008
@@ -181,8 +181,6 @@
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env)
{
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_free_impl");
if(bean_mgr->dbname)
{
AXIS2_FREE(env->allocator, bean_mgr->dbname);
@@ -193,8 +191,6 @@
AXIS2_FREE(env->allocator, bean_mgr);
bean_mgr = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_free_impl");
}
axis2_bool_t AXIS2_CALL
@@ -206,8 +202,6 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -227,8 +221,6 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert");
return AXIS2_TRUE;
}
@@ -275,8 +267,6 @@
void *bean = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -307,8 +297,6 @@
if(args)
AXIS2_FREE(env->allocator, args);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve");
return bean;
}
@@ -321,8 +309,6 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_update");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -342,8 +328,6 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_update");
return AXIS2_TRUE;
}
@@ -405,8 +389,6 @@
int rc = -1;
sqlite3 *dbconn = NULL;
axis2_char_t sql_stmt_retrieve[512];
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -440,8 +422,6 @@
if(args)
AXIS2_FREE(env->allocator, args);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
return msg_store_bean;
}
@@ -476,8 +456,6 @@
axis2_char_t *action = NULL;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_update_msg_store_bean");
msg_id = sandesha2_msg_store_bean_get_msg_id(bean, env);
stored_key = sandesha2_msg_store_bean_get_stored_key(bean, env);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(bean, env);
@@ -537,8 +515,6 @@
}
AXIS2_FREE(env->allocator, sql_stmt_update);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_update_msg_store_bean");
return AXIS2_TRUE;
}
@@ -573,8 +549,6 @@
axis2_char_t *action = NULL;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
msg_id = sandesha2_msg_store_bean_get_msg_id(bean, env);
stored_key = sandesha2_msg_store_bean_get_stored_key(bean, env);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(bean, env);
@@ -633,8 +607,6 @@
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
return AXIS2_TRUE;
}
@@ -648,8 +620,6 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -670,8 +640,6 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
return AXIS2_TRUE;
}
@@ -690,8 +658,6 @@
int sql_size = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_store_response");
sql_size = axutil_strlen(seq_id) + axutil_strlen(response) +
sizeof(int) + sizeof(int) + 512;
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
@@ -718,8 +684,6 @@
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_store_response");
return AXIS2_TRUE;
}
@@ -734,8 +698,6 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_response");
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -757,8 +719,6 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_response");
return AXIS2_TRUE;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_create_seq_mgr.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_create_seq_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_create_seq_mgr.c Wed Jun 4 02:47:32 2008
@@ -233,8 +233,6 @@
axis2_char_t *create_seq_msg_store_key = NULL;
axis2_char_t *ref_msg_store_key = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
bean, env);
@@ -252,8 +250,6 @@
ret = sandesha2_permanent_bean_mgr_insert(seq_mgr_impl->bean_mgr, env,
sql_insert);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_insert");
return ret;
}
@@ -266,15 +262,11 @@
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
axis2_char_t sql_remove[256];
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_remove");
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
sprintf(sql_remove, "delete from create_seq where create_seq_msg_id='%s';",
msg_id);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_remove");
return sandesha2_permanent_bean_mgr_remove(seq_mgr_impl->bean_mgr, env,
sql_remove);
}
@@ -287,16 +279,12 @@
{
axis2_char_t sql_retrieve[256];
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_retrieve");
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
sprintf(sql_retrieve, "select create_seq_msg_id, internal_seq_id,"\
"seq_id, create_seq_msg_store_key, ref_msg_store_key from create_seq "\
"where create_seq_msg_id='%s';", msg_id);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_retrieve");
return (sandesha2_create_seq_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
seq_mgr_impl->bean_mgr, env, sandesha2_create_seq_retrieve_callback,
sql_retrieve);
@@ -316,8 +304,6 @@
axis2_char_t *create_seq_msg_store_key = NULL;
axis2_char_t *seq_id = NULL;
axis2_char_t *ref_msg_store_key = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Entry:[sandesha2]sandesha2_permanent_create_seq_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
bean, env);
@@ -334,9 +320,6 @@
create_seq_msg_store_key, ref_msg_store_key, create_seq_msg_id);
ret = sandesha2_permanent_bean_mgr_update(seq_mgr_impl->bean_mgr, env,
sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Exit:[sandesha2]sandesha2_permanent_create_seq_mgr_update:return:%d",
- ret);
return ret;
}
@@ -353,8 +336,6 @@
axis2_char_t *seq_id = NULL;
axutil_array_list_t *find_list = NULL;
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Entry:[sandesha2]sandesha2_permanent_create_seq_mgr_find");
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
if(bean)
{
@@ -399,8 +380,6 @@
find_list = sandesha2_permanent_bean_mgr_find(seq_mgr_impl->bean_mgr, env,
sandesha2_create_seq_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Exit:[sandesha2]sandesha2_permanent_create_seq_mgr_find");
return find_list;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_next_msg_mgr.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_next_msg_mgr.c Wed Jun 4 02:47:32 2008
@@ -258,8 +258,6 @@
long msg_no;
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_id = sandesha2_next_msg_bean_get_seq_id(bean,
@@ -275,8 +273,6 @@
"ref_msg_key,"\
"polling_mode, msg_no) values('%s', '%s', '%s', %d, %ld);", seq_id,
internal_seq_id, ref_msg_key, polling_mode, msg_no);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_insert");
return sandesha2_permanent_bean_mgr_insert(next_msg_mgr_impl->bean_mgr, env,
sql_insert);
}
@@ -289,14 +285,10 @@
{
axis2_char_t sql_remove[256];
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_remove");
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
sprintf(sql_remove, "delete from next_msg where seq_id='%s'",
seq_id);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_remove");
return sandesha2_permanent_bean_mgr_remove(next_msg_mgr_impl->bean_mgr, env,
sql_remove);
}
@@ -313,15 +305,11 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_retrieve");
sprintf(sql_retrieve, "select seq_id, internal_seq_id, ref_msg_key, "\
"polling_mode, msg_no from next_msg where seq_id='%s';", seq_id);
bean = (sandesha2_next_msg_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
next_msg_mgr_impl->bean_mgr, env, sandesha2_next_msg_retrieve_callback,
sql_retrieve);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_retrieve");
return bean;
}
@@ -339,8 +327,6 @@
axis2_char_t *ref_msg_key = NULL;
axis2_bool_t polling_mode = AXIS2_FALSE;
long msg_no;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_id = sandesha2_next_msg_bean_get_seq_id(bean,
env);
@@ -358,8 +344,6 @@
polling_mode, msg_no, seq_id);
ret = sandesha2_permanent_bean_mgr_update(next_msg_mgr_impl->bean_mgr, env,
sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_update");
return ret;
}
@@ -377,8 +361,6 @@
axutil_array_list_t *find_list = NULL;
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_find");
if(bean)
{
seq_id = sandesha2_next_msg_bean_get_seq_id(bean,
@@ -423,8 +405,6 @@
find_list = sandesha2_permanent_bean_mgr_find(next_msg_mgr_impl->bean_mgr,
env, sandesha2_next_msg_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_find");
return find_list;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_sender_mgr.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_sender_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_sender_mgr.c Wed Jun 4 02:47:32 2008
@@ -279,9 +279,6 @@
axis2_char_t *wsrm_anon_uri = NULL;
axis2_char_t *to_address = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_insert");
-
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
msg_id = sandesha2_sender_bean_get_msg_id(bean,
env);
@@ -308,8 +305,6 @@
ret = sandesha2_permanent_bean_mgr_insert(sender_mgr_impl->bean_mgr, env,
sql_insert);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_insert");
return ret;
}
@@ -322,16 +317,12 @@
axis2_char_t sql_remove[256];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_remove");
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
sprintf(sql_remove, "delete from sender where msg_id='%s'", msg_id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_remove:%s", sql_remove);
ret = sandesha2_permanent_bean_mgr_remove(sender_mgr_impl->bean_mgr, env,
sql_remove);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_remove");
return ret;
}
@@ -345,8 +336,6 @@
sandesha2_sender_bean_t *ret = NULL;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_retrieve");
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
@@ -358,8 +347,6 @@
sender_mgr_impl->bean_mgr, env, sandesha2_sender_retrieve_callback,
sql_retrieve);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_retrieve");
return ret;
}
@@ -385,8 +372,6 @@
axis2_char_t *wsrm_anon_uri = NULL;
axis2_char_t *to_address = NULL;
- 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(bean,
env);
@@ -414,11 +399,7 @@
ret = sandesha2_permanent_bean_mgr_update(sender_mgr_impl->bean_mgr, env,
sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_update");
return ret;
-
- return AXIS2_SUCCESS;
}
axutil_array_list_t *AXIS2_CALL
@@ -430,8 +411,6 @@
axutil_array_list_t *find_list = NULL;
axis2_char_t sql_find[1054];
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_find_by_internal_seq_id");
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
sprintf(sql_find, "select msg_id, msg_ctx_ref_key, internal_seq_id, "\
@@ -440,8 +419,6 @@
internal_seq_id);
find_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
sandesha2_sender_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_internal_seq_id");
return find_list;
}
@@ -462,8 +439,6 @@
axutil_array_list_t *find_list = NULL;
axis2_char_t sql_find[1024];
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_find_by_sender_bean");
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
if(bean)
{
@@ -562,8 +537,6 @@
sprintf(sql_find + axutil_strlen(sql_find), ";");
find_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
sandesha2_sender_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_sender_bean");
return find_list;
}
@@ -605,9 +578,6 @@
sandesha2_sender_bean_t *result = NULL;
axis2_bool_t send_make_connection = AXIS2_TRUE;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Entry:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
-
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
sprintf(sql_find, "select msg_id, msg_ctx_ref_key, "\
@@ -699,9 +669,6 @@
axutil_array_list_free(match_list, env);
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
-
return result;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_seq_property_mgr.c?rev=663042&r1=663041&r2=663042&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-30may2008/src/storage/sqlite/permanent_seq_property_mgr.c Wed Jun 4 02:47:32 2008
@@ -241,9 +241,6 @@
axis2_char_t *name = NULL;
axis2_char_t *value = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Entry:sandesha2_permanent_seq_property_mgr_insert");
-
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
@@ -265,9 +262,6 @@
sandesha2_seq_property_bean_free(bean, env);
}*/
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_insert");
-
return ret;
}
@@ -282,8 +276,6 @@
axis2_char_t sql_remove[256];
axis2_status_t status = AXIS2_FAILURE;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_remove");
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FALSE);
@@ -294,8 +286,6 @@
status = sandesha2_permanent_bean_mgr_remove(seq_prop_mgr_impl->bean_mgr, env,
sql_remove);
AXIS2_FREE(env->allocator, key);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_remove");
return status;
}
@@ -311,11 +301,9 @@
sandesha2_seq_property_bean_t *ret = NULL;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_retrieve");
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FALSE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]seq_property_name:%s", name);
+
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
key = sandesha2_permanent_seq_property_mgr_get_id_with_seq_id_and_name(env,
seq_id, name);
@@ -325,8 +313,7 @@
seq_prop_mgr_impl->bean_mgr, env, sandesha2_seq_property_retrieve_callback,
sql_retrieve);
AXIS2_FREE(env->allocator, key);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_retrieve");
+
return ret;
}
@@ -344,8 +331,6 @@
axis2_char_t *name = NULL;
axis2_char_t *value = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
@@ -360,8 +345,6 @@
AXIS2_FREE(env->allocator, id);
ret = sandesha2_permanent_bean_mgr_update(seq_prop_mgr_impl->bean_mgr, env,
sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_update");
return ret;
}
@@ -378,8 +361,6 @@
axis2_char_t *value = NULL;
axutil_array_list_t *find_list = NULL;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_find");
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
if(bean)
{
@@ -422,8 +403,6 @@
find_list = sandesha2_permanent_bean_mgr_find(seq_prop_mgr_impl->bean_mgr,
env, sandesha2_seq_property_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_find");
return find_list;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org