You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/11/10 10:51:10 UTC
svn commit: r473292 [4/6] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Fri Nov 10 01:51:08 2006
@@ -21,12 +21,8 @@
/*sender_bean struct */
-typedef struct sandesha2_sender_bean_impl sandesha2_sender_bean_impl_t;
-
-struct sandesha2_sender_bean_impl
+struct sandesha2_sender_bean_t
{
- sandesha2_sender_bean_t o_bean;
-
axis2_char_t *msg_context_ref_key;
axis2_char_t *msg_id;
axis2_char_t *internal_seq_id;
@@ -40,165 +36,34 @@
};
-#define AXIS2_INTF_TO_IMPL(sender) ((sandesha2_sender_bean_impl_t*)sender)
-
-/************* FUNCTION prototypes ***************/
-axis2_status_t AXIS2_CALL
- sandesha2_sender_bean_free (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_msg_context_ref_key (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_msg_context_ref_key (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_char_t *ref_key);
-
-axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_msg_id (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_msg_id (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_char_t *msg_id);
-
-axis2_bool_t AXIS2_CALL
- sandesha2_sender_bean_is_send (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_send (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_bool_t send);
-
-axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_internal_seq_id (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_internal_seq_id (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_char_t *int_seq_id);
-
-int AXIS2_CALL
- sandesha2_sender_bean_get_sent_count (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_sent_count (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- int sent_count);
-
-long AXIS2_CALL
- sandesha2_sender_bean_get_msg_no (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_msg_no (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- long msg_no);
-
-axis2_bool_t AXIS2_CALL
- sandesha2_sender_bean_is_resend (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_resend (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_bool_t resend);
-
-long AXIS2_CALL
- sandesha2_sender_bean_get_time_to_send (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_time_to_send (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- long time_to_send);
-int AXIS2_CALL
- sandesha2_sender_bean_get_msg_type (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_msg_type (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- int msg_type);
-
-axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_seq_id(sandesha2_sender_bean_t *sender,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_sender_bean_set_seq_id (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
-
AXIS2_EXTERN sandesha2_sender_bean_t* AXIS2_CALL
sandesha2_sender_bean_create(const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
+ sandesha2_sender_bean_t *sender = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean_impl = (sandesha2_sender_bean_impl_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_impl_t));
+ sender = (sandesha2_sender_bean_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_sender_bean_t));
- if(!bean_impl)
+ if(!sender)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* init properties */
- bean_impl->msg_context_ref_key = NULL;
- bean_impl->msg_id = NULL;
- bean_impl->internal_seq_id = NULL;
- bean_impl->sent_count = -1;
- bean_impl->msg_no = -1;
- bean_impl->send = AXIS2_FALSE;
- bean_impl->resend = AXIS2_TRUE;
- bean_impl->time_to_send = -1;
- bean_impl->msg_type = 0;
- bean_impl->seq_id = NULL;
-
- bean_impl->o_bean.ops = NULL;
- bean_impl->o_bean.ops = (sandesha2_sender_bean_ops_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_ops_t));
+ sender->msg_context_ref_key = NULL;
+ sender->msg_id = NULL;
+ sender->internal_seq_id = NULL;
+ sender->sent_count = -1;
+ sender->msg_no = -1;
+ sender->send = AXIS2_FALSE;
+ sender->resend = AXIS2_TRUE;
+ sender->time_to_send = -1;
+ sender->msg_type = 0;
+ sender->seq_id = NULL;
- if(!bean_impl->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean_impl);
-
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- bean_impl->o_bean.ops->free = sandesha2_sender_bean_free;
- bean_impl->o_bean.ops->get_msg_context_ref_key = sandesha2_sender_bean_get_msg_context_ref_key;
- bean_impl->o_bean.ops->set_msg_context_ref_key = sandesha2_sender_bean_set_msg_context_ref_key;
- bean_impl->o_bean.ops->get_msg_id = sandesha2_sender_bean_get_msg_id;
- bean_impl->o_bean.ops->set_msg_id = sandesha2_sender_bean_set_msg_id;
- bean_impl->o_bean.ops->is_send = sandesha2_sender_bean_is_send;
- bean_impl->o_bean.ops->set_send = sandesha2_sender_bean_set_send;
- bean_impl->o_bean.ops->get_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id;
- bean_impl->o_bean.ops->set_internal_seq_id = sandesha2_sender_bean_set_internal_seq_id;
- bean_impl->o_bean.ops->get_sent_count = sandesha2_sender_bean_get_sent_count;
- bean_impl->o_bean.ops->set_sent_count = sandesha2_sender_bean_set_sent_count;
- bean_impl->o_bean.ops->get_msg_no = sandesha2_sender_bean_get_msg_no;
- bean_impl->o_bean.ops->set_msg_no = sandesha2_sender_bean_set_msg_no;
- bean_impl->o_bean.ops->is_resend = sandesha2_sender_bean_is_resend;
- bean_impl->o_bean.ops->set_resend = sandesha2_sender_bean_set_resend;
- bean_impl->o_bean.ops->get_time_to_send = sandesha2_sender_bean_get_time_to_send;
- bean_impl->o_bean.ops->set_time_to_send = sandesha2_sender_bean_set_time_to_send;
- bean_impl->o_bean.ops->get_msg_type = sandesha2_sender_bean_get_msg_type;
- bean_impl->o_bean.ops->set_msg_type = sandesha2_sender_bean_set_msg_type;
- bean_impl->o_bean.ops->get_seq_id = sandesha2_sender_bean_get_seq_id;
- bean_impl->o_bean.ops->set_seq_id = sandesha2_sender_bean_set_seq_id;
-
- return &(bean_impl->o_bean);
+ return sender;
}
@@ -212,345 +77,268 @@
long msg_no)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
+ sandesha2_sender_bean_t *sender = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean_impl = (sandesha2_sender_bean_impl_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_impl_t));
+ sender = (sandesha2_sender_bean_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_sender_bean_t));
- if(!bean_impl)
+ if(!sender)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* init properties */
- bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
- bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
- bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
- bean_impl->sent_count = -1;
- bean_impl->msg_no = msg_no;
- bean_impl->send = send;
- bean_impl->resend = AXIS2_TRUE;
- bean_impl->time_to_send = time_to_send;
- bean_impl->msg_type = 0;
- bean_impl->seq_id = NULL;
-
- bean_impl->o_bean.ops = NULL;
- bean_impl->o_bean.ops = (sandesha2_sender_bean_ops_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_ops_t));
-
- if(!bean_impl->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean_impl);
-
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- bean_impl->o_bean.ops->free = sandesha2_sender_bean_free;
- bean_impl->o_bean.ops->get_msg_context_ref_key = sandesha2_sender_bean_get_msg_context_ref_key;
- bean_impl->o_bean.ops->set_msg_context_ref_key = sandesha2_sender_bean_set_msg_context_ref_key;
- bean_impl->o_bean.ops->get_msg_id = sandesha2_sender_bean_get_msg_id;
- bean_impl->o_bean.ops->set_msg_id = sandesha2_sender_bean_set_msg_id;
- bean_impl->o_bean.ops->is_send = sandesha2_sender_bean_is_send;
- bean_impl->o_bean.ops->set_send = sandesha2_sender_bean_set_send;
- bean_impl->o_bean.ops->get_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id;
- bean_impl->o_bean.ops->set_internal_seq_id = sandesha2_sender_bean_set_internal_seq_id;
- bean_impl->o_bean.ops->get_sent_count = sandesha2_sender_bean_get_sent_count;
- bean_impl->o_bean.ops->set_sent_count = sandesha2_sender_bean_set_sent_count;
- bean_impl->o_bean.ops->get_msg_no = sandesha2_sender_bean_get_msg_no;
- bean_impl->o_bean.ops->set_msg_no = sandesha2_sender_bean_set_msg_no;
- bean_impl->o_bean.ops->is_resend = sandesha2_sender_bean_is_resend;
- bean_impl->o_bean.ops->set_resend = sandesha2_sender_bean_set_resend;
- bean_impl->o_bean.ops->get_time_to_send = sandesha2_sender_bean_get_time_to_send;
- bean_impl->o_bean.ops->set_time_to_send = sandesha2_sender_bean_set_time_to_send;
- bean_impl->o_bean.ops->get_msg_type = sandesha2_sender_bean_get_msg_type;
- bean_impl->o_bean.ops->set_msg_type = sandesha2_sender_bean_set_msg_type;
- bean_impl->o_bean.ops->get_seq_id = sandesha2_sender_bean_get_seq_id;
- bean_impl->o_bean.ops->set_seq_id = sandesha2_sender_bean_set_seq_id;
+ sender->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
+ sender->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
+ sender->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender->sent_count = -1;
+ sender->msg_no = msg_no;
+ sender->send = send;
+ sender->resend = AXIS2_TRUE;
+ sender->time_to_send = time_to_send;
+ sender->msg_type = 0;
+ sender->seq_id = NULL;
- return &(bean_impl->o_bean);
+ return sender;
}
axis2_status_t AXIS2_CALL
-sandesha2_sender_bean_free (sandesha2_sender_bean_t *sender,
- const axis2_env_t *env)
+sandesha2_sender_bean_free (
+ sandesha2_sender_bean_t *sender,
+ const axis2_env_t *env)
{
-
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- if(bean_impl->msg_context_ref_key)
+ if(sender->msg_context_ref_key)
{
- AXIS2_FREE(env->allocator, bean_impl->msg_context_ref_key);
- bean_impl->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender->msg_context_ref_key);
+ sender->msg_context_ref_key = NULL;
}
- if(bean_impl->msg_id)
+ if(sender->msg_id)
{
- AXIS2_FREE(env->allocator, bean_impl->msg_id);
- bean_impl->msg_id = NULL;
+ AXIS2_FREE(env->allocator, sender->msg_id);
+ sender->msg_id = NULL;
}
- if(bean_impl->internal_seq_id)
+ if(sender->internal_seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->internal_seq_id);
- bean_impl->internal_seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender->internal_seq_id);
+ sender->internal_seq_id = NULL;
}
- if(bean_impl->seq_id)
+ if(sender->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender->seq_id);
+ sender->seq_id = NULL;
}
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_msg_context_ref_key (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_msg_ctx_ref_key (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->msg_context_ref_key;
+ return sender->msg_context_ref_key;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_msg_context_ref_key (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_msg_ctx_ref_key (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_char_t *ref_key)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- if(bean_impl->msg_context_ref_key)
+ if(sender->msg_context_ref_key)
{
- AXIS2_FREE(env->allocator, bean_impl->msg_context_ref_key);
- bean_impl->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender->msg_context_ref_key);
+ sender->msg_context_ref_key = NULL;
}
- bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
+ sender->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
}
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_msg_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_msg_id (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->msg_id;
+ return sender->msg_id;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_msg_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_msg_id (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_char_t *msg_id)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- if(bean_impl->msg_id)
+ if(sender->msg_id)
{
AXIS2_FREE(env->allocator, msg_id);
- bean_impl->msg_id = NULL;
+ sender->msg_id = NULL;
}
- bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
+ sender->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
}
axis2_bool_t AXIS2_CALL
- sandesha2_sender_bean_is_send (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_is_send (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->send;
+ return sender->send;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_send (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_send (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_bool_t send)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->send = send;
+ sender->send = send;
}
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_internal_seq_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_internal_seq_id (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->internal_seq_id;
+ return sender->internal_seq_id;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_internal_seq_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_internal_seq_id (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_char_t *int_seq_id)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- if(bean_impl->internal_seq_id)
+ if(sender->internal_seq_id)
{
AXIS2_FREE(env->allocator, int_seq_id);
- bean_impl->internal_seq_id = NULL;
+ sender->internal_seq_id = NULL;
}
- bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
}
int AXIS2_CALL
- sandesha2_sender_bean_get_sent_count (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_sent_count (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->sent_count;
+ return sender->sent_count;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_sent_count (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_sent_count (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
int sent_count)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->sent_count = sent_count;
+ sender->sent_count = sent_count;
}
long AXIS2_CALL
- sandesha2_sender_bean_get_msg_no (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_msg_no (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->msg_no;
+ return sender->msg_no;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_msg_no (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_msg_no (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
long msg_no)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->msg_no = msg_no;
+ sender->msg_no = msg_no;
}
axis2_bool_t AXIS2_CALL
- sandesha2_sender_bean_is_resend (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_is_resend (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->resend;
+ return sender->resend;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_resend (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_resend (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_bool_t resend)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->resend = resend;
+ sender->resend = resend;
}
long AXIS2_CALL
- sandesha2_sender_bean_get_time_to_send (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_time_to_send (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->time_to_send;
+ return sender->time_to_send;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_time_to_send (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_time_to_send (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
long time_to_send)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->time_to_send = time_to_send;
+ sender->time_to_send = time_to_send;
}
int AXIS2_CALL
- sandesha2_sender_bean_get_msg_type (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_msg_type (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->msg_type;
+ return sender->msg_type;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_msg_type (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_msg_type (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
int msg_type)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- bean_impl->msg_type = msg_type;
+ sender->msg_type = msg_type;
}
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_seq_id(sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_seq_id(
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- return bean_impl->seq_id;
+ return sender->seq_id;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_seq_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_seq_id (
+ sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- sandesha2_sender_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(sender);
-
- if(bean_impl->seq_id)
+ if(sender->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender->seq_id);
+ sender->seq_id = NULL;
}
- bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ sender->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Fri Nov 10 01:51:08 2006
@@ -21,93 +21,35 @@
/*seq_property_bean struct */
-typedef struct sandesha2_seq_property_bean_impl sandesha2_seq_property_bean_impl_t;
-
-struct sandesha2_seq_property_bean_impl
+struct sandesha2_seq_property_bean_t
{
- sandesha2_seq_property_bean_t o_bean;
axis2_char_t *seq_id;
axis2_char_t *name;
axis2_char_t *value;
};
-#define AXIS2_INTF_TO_IMPL(prop_bean) ((sandesha2_seq_property_bean_impl_t*)prop_bean)
-
-
-/************* FUNCTION prototypes ***************/
-axis2_status_t AXIS2_CALL
- sandesha2_seq_property_bean_free (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env);
-
-axis2_char_t *AXIS2_CALL
- sandesha2_seq_property_bean_get_name (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_seq_property_bean_set_name (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *name);
-
-axis2_char_t *AXIS2_CALL
- sandesha2_seq_property_bean_get_seq_id (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_seq_property_bean_set_seq_id (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
-axis2_char_t* AXIS2_CALL
- sandesha2_seq_property_bean_get_value (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_seq_property_bean_set_value (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *value);
-
-
AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
- sandesha2_seq_property_bean_create(const axis2_env_t *env)
+sandesha2_seq_property_bean_create(
+ const axis2_env_t *env)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ sandesha2_seq_property_bean_t *seq_property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_impl_t));
+ seq_property = (sandesha2_seq_property_bean_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_t));
- if(!bean_impl)
+ if(!seq_property)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* initialize properties */
- bean_impl->seq_id = NULL;
- bean_impl->name = NULL;
- bean_impl->value = NULL;
-
- bean_impl->o_bean.ops = NULL;
- bean_impl->o_bean.ops = (sandesha2_seq_property_bean_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_ops_t));
-
- if(!bean_impl->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean_impl);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ seq_property->seq_id = NULL;
+ seq_property->name = NULL;
+ seq_property->value = NULL;
- return NULL;
- }
-
- bean_impl->o_bean.ops->free = sandesha2_seq_property_bean_free;
- bean_impl->o_bean.ops->get_name = sandesha2_seq_property_bean_get_name;
- bean_impl->o_bean.ops->set_name = sandesha2_seq_property_bean_set_name;
- bean_impl->o_bean.ops->get_seq_id = sandesha2_seq_property_bean_get_seq_id;
- bean_impl->o_bean.ops->set_seq_id = sandesha2_seq_property_bean_set_seq_id;
- bean_impl->o_bean.ops->get_value = sandesha2_seq_property_bean_get_value;
- bean_impl->o_bean.ops->set_value = sandesha2_seq_property_bean_set_value;
-
- return &(bean_impl->o_bean);
+ return seq_property;
}
AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
@@ -118,156 +60,121 @@
axis2_char_t *value)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ sandesha2_seq_property_bean_t *seq_property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_impl_t));
+ seq_property = (sandesha2_seq_property_bean_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_t));
- if(!bean_impl)
+ if(!seq_property)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* initialize properties */
- bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
- bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(prop_name, env);
- bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
-
- bean_impl->o_bean.ops = NULL;
- bean_impl->o_bean.ops = (sandesha2_seq_property_bean_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_ops_t));
-
- if(!bean_impl->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean_impl);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-
- return NULL;
- }
+ seq_property->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ seq_property->name = (axis2_char_t *)AXIS2_STRDUP(prop_name, env);
+ seq_property->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
- bean_impl->o_bean.ops->free = sandesha2_seq_property_bean_free;
- bean_impl->o_bean.ops->get_name = sandesha2_seq_property_bean_get_name;
- bean_impl->o_bean.ops->set_name = sandesha2_seq_property_bean_set_name;
- bean_impl->o_bean.ops->get_seq_id = sandesha2_seq_property_bean_get_seq_id;
- bean_impl->o_bean.ops->set_seq_id = sandesha2_seq_property_bean_set_seq_id;
- bean_impl->o_bean.ops->get_value = sandesha2_seq_property_bean_get_value;
- bean_impl->o_bean.ops->set_value = sandesha2_seq_property_bean_set_value;
-
- return &(bean_impl->o_bean);
+ return seq_property;
}
axis2_status_t AXIS2_CALL
- sandesha2_seq_property_bean_free (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env)
+sandesha2_seq_property_bean_free (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- if(bean_impl->seq_id)
+ if(seq_property->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, seq_property->seq_id);
+ seq_property->seq_id = NULL;
}
- if(bean_impl->name)
+ if(seq_property->name)
{
- AXIS2_FREE(env->allocator, bean_impl->name);
- bean_impl->name = NULL;
+ AXIS2_FREE(env->allocator, seq_property->name);
+ seq_property->name = NULL;
}
- if(bean_impl->value)
+ if(seq_property->value)
{
- AXIS2_FREE(env->allocator, bean_impl->value);
- bean_impl->value = NULL;
+ AXIS2_FREE(env->allocator, seq_property->value);
+ seq_property->value = NULL;
}
return AXIS2_SUCCESS;
}
axis2_char_t *AXIS2_CALL
- sandesha2_seq_property_bean_get_name (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env)
+sandesha2_seq_property_bean_get_name (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- return bean_impl->name;
+ return seq_property->name;
}
void AXIS2_CALL
- sandesha2_seq_property_bean_set_name (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *name)
+sandesha2_seq_property_bean_set_name (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *name)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- if(bean_impl->name)
+ if(seq_property->name)
{
- AXIS2_FREE(env->allocator, bean_impl->name);
- bean_impl->name = NULL;
+ AXIS2_FREE(env->allocator, seq_property->name);
+ seq_property->name = NULL;
}
- bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
+ seq_property->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
}
axis2_char_t *AXIS2_CALL
- sandesha2_seq_property_bean_get_seq_id (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env)
+sandesha2_seq_property_bean_get_seq_id (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- return bean_impl->seq_id;
+ return seq_property->seq_id;
}
void AXIS2_CALL
sandesha2_seq_property_bean_set_seq_id (
- struct sandesha2_seq_property_bean *seq_property,
+ sandesha2_seq_property_bean_t *seq_property,
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- if(bean_impl->seq_id)
+ if(seq_property->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, seq_property->seq_id);
+ seq_property->seq_id = NULL;
}
- bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ seq_property->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
}
axis2_char_t* AXIS2_CALL
- sandesha2_seq_property_bean_get_value (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env)
+sandesha2_seq_property_bean_get_value (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- return bean_impl->value;
+ return seq_property->value;
}
void AXIS2_CALL
- sandesha2_seq_property_bean_set_value (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *value)
+sandesha2_seq_property_bean_set_value (
+ sandesha2_seq_property_bean_t *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *value)
{
- sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
-
- if(bean_impl->value)
+ if(seq_property->value)
{
- AXIS2_FREE(env->allocator, bean_impl->value);
- bean_impl->value = NULL;
+ AXIS2_FREE(env->allocator, seq_property->value);
+ seq_property->value = NULL;
}
- bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ seq_property->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c Fri Nov 10 01:51:08 2006
@@ -23,98 +23,43 @@
#include <axis2_thread.h>
#include <axis2_property.h>
-typedef struct sandesha2_next_msg_mgr_impl sandesha2_next_msg_mgr_impl_t;
-
/**
* @brief Sandesha Sequence Report Struct Impl
* Sandesha Sequence Report
*/
-struct sandesha2_next_msg_mgr_impl
+struct sandesha2_next_msg_mgr_t
{
- sandesha2_next_msg_mgr_t next_msg;
-
axis2_hash_t *table;
axis2_array_list_t *values;
axis2_thread_mutex_t *mutex;
};
-#define SANDESHA2_INTF_TO_IMPL(next_msg) ((sandesha2_next_msg_mgr_impl_t *) next_msg)
-
-axis2_status_t AXIS2_CALL
-sandesha2_next_msg_mgr_free(
- void *next_msg,
- const axis2_env_t *envv);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_next_msg_mgr_insert(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_next_msg_mgr_remove(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
-sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_next_msg_mgr_retrieve(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_next_msg_mgr_update(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_next_msg_mgr_find(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean);
-
-sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_next_msg_mgr_find_unique(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_next_msg_mgr_retrieve_all(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env);
-
AXIS2_EXTERN sandesha2_next_msg_mgr_t * AXIS2_CALL
sandesha2_next_msg_mgr_create(
- const axis2_env_t *env,
- axis2_ctx_t *ctx)
+ const axis2_env_t *env,
+ axis2_ctx_t *ctx)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
+ sandesha2_next_msg_mgr_t *next_msg = NULL;
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- next_msg_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_mgr_impl_t));
+ next_msg = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_next_msg_mgr_t));
- next_msg_impl->table = NULL;
- next_msg_impl->values = NULL;
- next_msg_impl->mutex = NULL;
+ next_msg->table = NULL;
+ next_msg->values = NULL;
+ next_msg->mutex = NULL;
- next_msg_impl->next_msg.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_mgr_ops_t));
-
- next_msg_impl->mutex = axis2_thread_mutex_create(env->allocator,
+ next_msg->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- if(!next_msg_impl->mutex)
+ if(!next_msg->mutex)
{
- sandesha2_next_msg_mgr_free(&(next_msg_impl->next_msg), env);
+ sandesha2_next_msg_mgr_free(next_msg, env);
return NULL;
}
- next_msg_impl->values = axis2_array_list_create(env, 0);
- if(!next_msg_impl->values)
+ next_msg->values = axis2_array_list_create(env, 0);
+ if(!next_msg->values)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -123,105 +68,77 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_NEXT_MESSAGE, AXIS2_FALSE);
if(NULL != property)
- next_msg_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!next_msg_impl->table)
+ next_msg->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(!next_msg->table)
{
axis2_property_t *property = NULL;
property = axis2_property_create(env);
- next_msg_impl->table = axis2_hash_make(env);
- if(!property || !next_msg_impl->table)
+ next_msg->table = axis2_hash_make(env);
+ if(!property || !next_msg->table)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, next_msg_impl->table);
+ AXIS2_PROPERTY_SET_VALUE(property, env, next_msg->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_NEXT_MESSAGE,
property, AXIS2_FALSE);
}
- next_msg_impl->next_msg.ops->free = sandesha2_next_msg_mgr_free;
- next_msg_impl->next_msg.ops->insert =
- sandesha2_next_msg_mgr_insert;
- next_msg_impl->next_msg.ops->remove =
- sandesha2_next_msg_mgr_remove;
- next_msg_impl->next_msg.ops->retrieve =
- sandesha2_next_msg_mgr_retrieve;
- next_msg_impl->next_msg.ops->update =
- sandesha2_next_msg_mgr_update;
- next_msg_impl->next_msg.ops->find =
- sandesha2_next_msg_mgr_find;
- next_msg_impl->next_msg.ops->find_unique =
- sandesha2_next_msg_mgr_find_unique;
- next_msg_impl->next_msg.ops->retrieve_all =
- sandesha2_next_msg_mgr_retrieve_all;
- return &(next_msg_impl->next_msg);
+ return next_msg;
}
axis2_status_t AXIS2_CALL
sandesha2_next_msg_mgr_free(
- void *next_msg,
- const axis2_env_t *env)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
- if(next_msg_impl->mutex)
- {
- axis2_thread_mutex_destroy(next_msg_impl->mutex);
- next_msg_impl->mutex = NULL;
- }
- if(next_msg_impl->table)
+ if(next_msg->mutex)
{
- axis2_hash_free(next_msg_impl->table, env);
- next_msg_impl->table = NULL;
+ axis2_thread_mutex_destroy(next_msg->mutex);
+ next_msg->mutex = NULL;
}
- if(next_msg_impl->values)
+ if(next_msg->table)
{
- AXIS2_ARRAY_LIST_FREE(next_msg_impl->values, env);
- next_msg_impl->values = NULL;
+ axis2_hash_free(next_msg->table, env);
+ next_msg->table = NULL;
}
-
-
- if((&(next_msg_impl->next_msg))->ops)
+ if(next_msg->values)
{
- AXIS2_FREE(env->allocator, (&(next_msg_impl->next_msg))->ops);
- (&(next_msg_impl->next_msg))->ops = NULL;
+ AXIS2_ARRAY_LIST_FREE(next_msg->values, env);
+ next_msg->values = NULL;
}
- if(next_msg_impl)
+ if(next_msg)
{
- AXIS2_FREE(env->allocator, next_msg_impl);
- next_msg_impl = NULL;
+ AXIS2_FREE(env->allocator, next_msg);
+ next_msg = NULL;
}
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
sandesha2_next_msg_mgr_insert(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ sandesha2_next_msg_bean_t *bean)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
axis2_char_t *seq_id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
-
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
+ seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
if(!seq_id)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_KEY_IS_NULL, AXIS2_FAILURE);
return AXIS2_FALSE;
}
- axis2_hash_set(next_msg_impl->table, seq_id, AXIS2_HASH_KEY_STRING, bean);
+ axis2_hash_set(next_msg->table, seq_id, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -229,17 +146,14 @@
axis2_bool_t AXIS2_CALL
sandesha2_next_msg_mgr_remove(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- axis2_char_t *seq_id)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
- axis2_hash_set(next_msg_impl->table, seq_id, AXIS2_HASH_KEY_STRING, NULL);
+ axis2_hash_set(next_msg->table, seq_id, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_TRUE;
@@ -247,18 +161,16 @@
sandesha2_next_msg_bean_t *AXIS2_CALL
sandesha2_next_msg_mgr_retrieve(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- axis2_char_t *seq_id)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
sandesha2_next_msg_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
- bean = (sandesha2_next_msg_bean_t *) axis2_hash_get(next_msg_impl->table,
+ bean = (sandesha2_next_msg_bean_t *) axis2_hash_get(next_msg->table,
seq_id, AXIS2_HASH_KEY_STRING);
return bean;
@@ -266,38 +178,34 @@
axis2_bool_t AXIS2_CALL
sandesha2_next_msg_mgr_update(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ sandesha2_next_msg_bean_t *bean)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
axis2_char_t *seq_id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
+ seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
if(!seq_id)
{
return AXIS2_FALSE;
}
- axis2_hash_set(next_msg_impl->table, seq_id, AXIS2_HASH_KEY_STRING, bean);
+ axis2_hash_set(next_msg->table, seq_id, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
}
axis2_array_list_t *AXIS2_CALL
sandesha2_next_msg_mgr_find(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ sandesha2_next_msg_bean_t *bean)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
axis2_array_list_t *beans = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
beans = axis2_array_list_create(env, 0);
if(!beans)
@@ -307,7 +215,7 @@
}
if(!bean)
return beans;
- for (i = axis2_hash_first (next_msg_impl->table, env); i;
+ for (i = axis2_hash_first (next_msg->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_next_msg_bean_t *temp = NULL;
@@ -320,14 +228,14 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_next_msg_bean_t *) v;
- next_msg_no = SANDESHA2_NEXT_MSG_BEAN_GET_NEXT_MSG_NO_TO_PROCESS(bean, env);
- temp_next_msg_no = SANDESHA2_NEXT_MSG_BEAN_GET_NEXT_MSG_NO_TO_PROCESS(temp, env);
+ next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean, env);
+ temp_next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(temp, env);
if(next_msg_no > 0 && (next_msg_no != temp_next_msg_no))
{
equal = AXIS2_FALSE;
}
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
- temp_seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(temp, env);
+ seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
+ temp_seq_id = sandesha2_next_msg_bean_get_seq_id(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
@@ -344,19 +252,16 @@
sandesha2_next_msg_bean_t *AXIS2_CALL
sandesha2_next_msg_mgr_find_unique(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env,
- sandesha2_next_msg_bean_t *bean)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env,
+ sandesha2_next_msg_bean_t *bean)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
axis2_array_list_t *beans = NULL;
int i = 0, size = 0;
sandesha2_next_msg_bean_t *ret = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
-
beans = sandesha2_next_msg_mgr_find(next_msg, env,
bean);
@@ -381,16 +286,14 @@
axis2_array_list_t *AXIS2_CALL
sandesha2_next_msg_mgr_retrieve_all(
- sandesha2_next_msg_mgr_t *next_msg,
- const axis2_env_t *env)
+ sandesha2_next_msg_mgr_t *next_msg,
+ const axis2_env_t *env)
{
- sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
- for (i = axis2_hash_first (next_msg_impl->table, env); i;
+ for (i = axis2_hash_first (next_msg->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_next_msg_bean_t *bean = NULL;
@@ -398,9 +301,9 @@
axis2_hash_this (i, NULL, NULL, &v);
bean = (sandesha2_next_msg_bean_t *) v;
- AXIS2_ARRAY_LIST_ADD(next_msg_impl->values, env, bean);
+ AXIS2_ARRAY_LIST_ADD(next_msg->values, env, bean);
}
- return next_msg_impl->values;
+ return next_msg->values;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c Fri Nov 10 01:51:08 2006
@@ -23,222 +23,115 @@
#include <axis2_thread.h>
#include <axis2_property.h>
-typedef struct sandesha2_sender_mgr_impl sandesha2_sender_mgr_impl_t;
-
/**
* @brief Sandesha Sequence Report Struct Impl
* Sandesha Sequence Report
*/
-struct sandesha2_sender_mgr_impl
+struct sandesha2_sender_mgr_t
{
- sandesha2_sender_mgr_t sender;
-
axis2_hash_t *table;
axis2_thread_mutex_t *mutex;
};
-#define SANDESHA2_INTF_TO_IMPL(sender) ((sandesha2_sender_mgr_impl_t *) sender)
-
-axis2_status_t AXIS2_CALL
-sandesha2_sender_mgr_free(
- void *sender,
- const axis2_env_t *envv);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_sender_mgr_insert(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_sender_mgr_remove(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- const axis2_char_t *msg_id);
-
-sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_sender_mgr_retrieve(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- const axis2_char_t *msg_id);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_sender_mgr_update(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_sender_mgr_find_by_internal_seq_id(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_char_t *internal_seq_id);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_sender_mgr_find_by_sender_bean(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean);
-
-sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_sender_mgr_find_unique(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean);
-
-sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_sender_mgr_get_next_msg_to_send(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env);
-
-sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_sender_mgr_retrieve_from_msg_ref_key(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_char_t *msg_ctx_ref_key);
-
static axis2_status_t
sandesha2_sender_mgr_update_next_sending_time(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean);
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean);
-/*
-static axis2_array_list_t *
-sandesha2_sender_mgr_find_beans_with_msg_no(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_array_list_t *list,
- long msg_no);
-*/
AXIS2_EXTERN sandesha2_sender_mgr_t * AXIS2_CALL
sandesha2_sender_mgr_create(
- const axis2_env_t *env,
- axis2_ctx_t *ctx)
+ const axis2_env_t *env,
+ axis2_ctx_t *ctx)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
+ sandesha2_sender_mgr_t *sender = NULL;
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sender_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_mgr_impl_t));
+ sender = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_sender_mgr_t));
- sender_impl->table = NULL;
- sender_impl->mutex = NULL;
+ sender->table = NULL;
+ sender->mutex = NULL;
- sender_impl->sender.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_mgr_ops_t));
-
- sender_impl->mutex = axis2_thread_mutex_create(env->allocator,
+ sender->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- if(!sender_impl->mutex)
+ if(!sender->mutex)
{
- sandesha2_sender_mgr_free(&(sender_impl->sender), env);
+ sandesha2_sender_mgr_free(sender, env);
return NULL;
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_RETRANSMITTER, AXIS2_FALSE);
if(NULL != property)
- sender_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!sender_impl->table)
+ sender->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(!sender->table)
{
axis2_property_t *property = NULL;
property = axis2_property_create(env);
- sender_impl->table = axis2_hash_make(env);
- if(!property || !sender_impl->table)
+ sender->table = axis2_hash_make(env);
+ if(!property || !sender->table)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, sender_impl->table);
+ AXIS2_PROPERTY_SET_VALUE(property, env, sender->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_RETRANSMITTER,
property, AXIS2_FALSE);
}
- sender_impl->sender.ops->free = sandesha2_sender_mgr_free;
- sender_impl->sender.ops->insert =
- sandesha2_sender_mgr_insert;
- sender_impl->sender.ops->remove =
- sandesha2_sender_mgr_remove;
- sender_impl->sender.ops->retrieve =
- sandesha2_sender_mgr_retrieve;
- sender_impl->sender.ops->update =
- sandesha2_sender_mgr_update;
- sender_impl->sender.ops->find_by_internal_seq_id =
- sandesha2_sender_mgr_find_by_internal_seq_id;
- sender_impl->sender.ops->find_by_sender_bean =
- sandesha2_sender_mgr_find_by_sender_bean;
- sender_impl->sender.ops->find_unique =
- sandesha2_sender_mgr_find_unique;
- sender_impl->sender.ops->get_next_msg_to_send =
- sandesha2_sender_mgr_get_next_msg_to_send;
- sender_impl->sender.ops->retrieve_from_msg_ref_key =
- sandesha2_sender_mgr_retrieve_from_msg_ref_key;
- return &(sender_impl->sender);
+ return sender;
}
axis2_status_t AXIS2_CALL
sandesha2_sender_mgr_free(
- void *sender,
- const axis2_env_t *env)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
- if(sender_impl->mutex)
+ if(sender->mutex)
{
- axis2_thread_mutex_destroy(sender_impl->mutex);
- sender_impl->mutex = NULL;
+ axis2_thread_mutex_destroy(sender->mutex);
+ sender->mutex = NULL;
}
- if(sender_impl->table)
+ if(sender->table)
{
- axis2_hash_free(sender_impl->table, env);
- sender_impl->table = NULL;
+ axis2_hash_free(sender->table, env);
+ sender->table = NULL;
}
-
- if((&(sender_impl->sender))->ops)
- {
- AXIS2_FREE(env->allocator, (&(sender_impl->sender))->ops);
- (&(sender_impl->sender))->ops = NULL;
- }
-
- if(sender_impl)
+ if(sender)
{
- AXIS2_FREE(env->allocator, sender_impl);
- sender_impl = NULL;
+ AXIS2_FREE(env->allocator, sender);
+ sender = NULL;
}
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
sandesha2_sender_mgr_insert(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_char_t *msg_id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
if(!msg_id)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_KEY_IS_NULL, AXIS2_FAILURE);
return AXIS2_FALSE;
}
- axis2_hash_set(sender_impl->table, msg_id, AXIS2_HASH_KEY_STRING, bean);
+ axis2_hash_set(sender->table, msg_id, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -246,17 +139,14 @@
axis2_bool_t AXIS2_CALL
sandesha2_sender_mgr_remove(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- const axis2_char_t *msg_id)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ const axis2_char_t *msg_id)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
- axis2_hash_set(sender_impl->table, msg_id, AXIS2_HASH_KEY_STRING, NULL);
+ axis2_hash_set(sender->table, msg_id, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_TRUE;
@@ -264,19 +154,16 @@
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_retrieve(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- const axis2_char_t *msg_id)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ const axis2_char_t *msg_id)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
sandesha2_sender_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
- bean = (sandesha2_sender_bean_t *) axis2_hash_get(sender_impl->table,
+ bean = (sandesha2_sender_bean_t *) axis2_hash_get(sender->table,
msg_id, AXIS2_HASH_KEY_STRING);
return bean;
@@ -284,18 +171,16 @@
axis2_bool_t AXIS2_CALL
sandesha2_sender_mgr_update(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_char_t *msg_id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
if(!msg_id)
{
return AXIS2_FALSE;
@@ -306,17 +191,14 @@
axis2_array_list_t *AXIS2_CALL
sandesha2_sender_mgr_find_by_internal_seq_id(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_char_t *internal_seq_id)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ axis2_char_t *internal_seq_id)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_array_list_t *list = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
list = axis2_array_list_create(env, 0);
if(!list)
@@ -326,7 +208,7 @@
}
if(!internal_seq_id || 0 == AXIS2_STRCMP(internal_seq_id, ""))
return list;
- for (i = axis2_hash_first (sender_impl->table, env); i;
+ for (i = axis2_hash_first (sender->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_sender_bean_t *sender_bean = NULL;
@@ -335,7 +217,7 @@
axis2_hash_this (i, NULL, NULL, &v);
sender_bean = (sandesha2_sender_bean_t *) v;
- temp_internal_seq_id = SANDESHA2_SENDER_BEAN_GET_INTERNAL_SEQ_ID(
+ temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
sender_bean, env);
if(internal_seq_id && temp_internal_seq_id && 0 == AXIS2_STRCMP(
internal_seq_id, temp_internal_seq_id))
@@ -348,19 +230,16 @@
return list;
}
-
axis2_array_list_t *AXIS2_CALL
sandesha2_sender_mgr_find_by_sender_bean(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_array_list_t *beans = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
beans = axis2_array_list_create(env, 0);
if(!beans)
@@ -372,7 +251,7 @@
{
return beans;
}
- for (i = axis2_hash_first (sender_impl->table, env); i;
+ for (i = axis2_hash_first (sender->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_sender_bean_t *temp = NULL;
@@ -397,52 +276,52 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_sender_bean_t *) v;
- ref_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
- temp_ref_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(temp, env);
+ ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
+ temp_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(temp, env);
if(ref_key && temp_ref_key && 0 != AXIS2_STRCMP(ref_key, temp_ref_key))
{
add = AXIS2_FALSE;
}
- time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(bean, env);
- temp_time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(temp, env);
+ time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
+ temp_time_to_send = sandesha2_sender_bean_get_time_to_send(temp, env);
if(time_to_send > 0 && (time_to_send != temp_time_to_send))
{
add = AXIS2_FALSE;
}
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(bean, env);
- temp_msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(temp, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
+ temp_msg_id = sandesha2_sender_bean_get_msg_id(temp, env);
if(msg_id && temp_msg_id && 0 != AXIS2_STRCMP(msg_id, temp_msg_id))
{
add = AXIS2_FALSE;
}
- internal_seq_id = SANDESHA2_SENDER_BEAN_GET_INTERNAL_SEQ_ID(bean, env);
- temp_internal_seq_id = SANDESHA2_SENDER_BEAN_GET_INTERNAL_SEQ_ID(temp,
+ internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
+ temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(temp,
env);
if(internal_seq_id && temp_internal_seq_id && 0 != AXIS2_STRCMP(
internal_seq_id, temp_internal_seq_id))
{
add = AXIS2_FALSE;
}
- msg_no = SANDESHA2_SENDER_BEAN_GET_MSG_NO(bean, env);
- temp_msg_no = SANDESHA2_SENDER_BEAN_GET_MSG_NO(temp, env);
+ msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
+ temp_msg_no = sandesha2_sender_bean_get_msg_no(temp, env);
if(msg_no > 0 && (msg_no != temp_msg_no))
{
add = AXIS2_FALSE;
}
- msg_type = SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(bean, env);
- temp_msg_type = SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(temp, env);
+ msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
+ temp_msg_type = sandesha2_sender_bean_get_msg_type(temp, env);
if(msg_type != SANDESHA2_MSG_TYPE_UNKNOWN && (msg_type != temp_msg_type))
{
add = AXIS2_FALSE;
}
- is_send = SANDESHA2_SENDER_BEAN_IS_SEND(bean, env);
- temp_is_send = SANDESHA2_SENDER_BEAN_IS_SEND(temp, env);
+ is_send = sandesha2_sender_bean_is_send(bean, env);
+ temp_is_send = sandesha2_sender_bean_is_send(temp, env);
if(is_send != temp_is_send)
{
add = AXIS2_FALSE;
}
- is_resend = SANDESHA2_SENDER_BEAN_IS_RESEND(bean, env);
- temp_is_resend = SANDESHA2_SENDER_BEAN_IS_RESEND(temp, env);
+ is_resend = sandesha2_sender_bean_is_resend(bean, env);
+ temp_is_resend = sandesha2_sender_bean_is_resend(temp, env);
if(is_resend != temp_is_resend)
{
add = AXIS2_FALSE;
@@ -459,19 +338,16 @@
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_find_unique(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_array_list_t *beans = NULL;
int i = 0, size = 0;
sandesha2_sender_bean_t *ret = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
beans = sandesha2_sender_mgr_find_by_sender_bean(sender, env,
bean);
@@ -499,15 +375,12 @@
sandesha2_sender_mgr_t *sender,
const axis2_env_t *env)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
long lowest_app_msg_no = 0;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
- for (i = axis2_hash_first (sender_impl->table, env); i;
+ for (i = axis2_hash_first (sender->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_sender_bean_t *temp = NULL;
@@ -516,20 +389,20 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_sender_bean_t *) v;
- is_send = SANDESHA2_SENDER_BEAN_IS_SEND(temp, env);
+ is_send = sandesha2_sender_bean_is_send(temp, env);
if(AXIS2_TRUE == is_send)
{
long time_to_send = 0;
long time_now = 0;
- time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(temp, env);
+ time_to_send = sandesha2_sender_bean_get_time_to_send(temp, env);
time_now = sandesha2_utils_get_current_time_in_millis(env);
if(time_now >= time_to_send)
{
- int msg_type = SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(temp, env);
+ int msg_type = sandesha2_sender_bean_get_msg_type(temp, env);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
{
- long msg_no = SANDESHA2_SENDER_BEAN_GET_MSG_NO(temp, env);
+ long msg_no = sandesha2_sender_bean_get_msg_no(temp, env);
if(lowest_app_msg_no == 0 || msg_no < lowest_app_msg_no)
lowest_app_msg_no = msg_no;
}
@@ -537,7 +410,7 @@
}
}
- for (i = axis2_hash_first (sender_impl->table, env); i;
+ for (i = axis2_hash_first (sender->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_sender_bean_t *temp = NULL;
@@ -548,24 +421,24 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_sender_bean_t *) v;
/* test code */
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(temp, env);
+ msg_id = sandesha2_sender_bean_get_msg_id(temp, env);
/* end of test code */
- is_send = SANDESHA2_SENDER_BEAN_IS_SEND(temp, env);
+ is_send = sandesha2_sender_bean_is_send(temp, env);
if(AXIS2_TRUE == is_send)
{
long time_to_send = 0;
long time_now = 0;
- time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(temp, env);
+ time_to_send = sandesha2_sender_bean_get_time_to_send(temp, env);
time_now = sandesha2_utils_get_current_time_in_millis(env);
if(time_now >= time_to_send)
{
axis2_bool_t valid = AXIS2_FALSE;
- int msg_type = SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(temp, env);
+ int msg_type = sandesha2_sender_bean_get_msg_type(temp, env);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
{
- long msg_no = SANDESHA2_SENDER_BEAN_GET_MSG_NO(temp, env);
+ long msg_no = sandesha2_sender_bean_get_msg_no(temp, env);
if(msg_no == lowest_app_msg_no)
valid = AXIS2_TRUE;
@@ -586,9 +459,9 @@
static axis2_status_t
sandesha2_sender_mgr_update_next_sending_time(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- sandesha2_sender_bean_t *bean)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *bean)
{
return AXIS2_SUCCESS;
}
@@ -596,19 +469,16 @@
/*
static axis2_array_list_t *
sandesha2_sender_mgr_find_beans_with_msg_no(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_array_list_t *list,
- long msg_no)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ axis2_array_list_t *list,
+ long msg_no)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_array_list_t *beans = NULL;
int i = 0, size =0;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, list, NULL);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
beans = axis2_array_list_create(env, 0);
if(!beans)
@@ -624,7 +494,7 @@
bean = (sandesha2_sender_bean_t *) AXIS2_ARRAY_LIST_GET(list,
env, i);
- msg_no_l = SANDESHA2_SENDER_BEAN_GET_MSG_NO(bean, env);
+ msg_no_l = sandesha2_sender_bean_get_msg_no(bean, env);
if(msg_no_l == msg_no)
{
AXIS2_ARRAY_LIST_ADD(beans, env, bean);
@@ -638,19 +508,16 @@
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_retrieve_from_msg_ref_key(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env,
- axis2_char_t *msg_ctx_ref_key)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env,
+ axis2_char_t *msg_ctx_ref_key)
{
- sandesha2_sender_mgr_impl_t *sender_impl = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx_ref_key, NULL);
- sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
-
- for (i = axis2_hash_first (sender_impl->table, env); i;
+ for (i = axis2_hash_first (sender->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_sender_bean_t *bean = NULL;
@@ -659,7 +526,7 @@
axis2_hash_this (i, NULL, NULL, &v);
bean = (sandesha2_sender_bean_t *) v;
- msg_ctx_ref_key_l = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
+ msg_ctx_ref_key_l = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
if(msg_ctx_ref_key_l && 0 == AXIS2_STRCMP(msg_ctx_ref_key_l,
msg_ctx_ref_key))
{
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c Fri Nov 10 01:51:08 2006
@@ -23,81 +23,21 @@
#include <axis2_thread.h>
#include <axis2_property.h>
-typedef struct sandesha2_seq_property_mgr_impl sandesha2_seq_property_mgr_impl_t;
-
/**
* @brief Sandesha Sequence Report Struct Impl
* Sandesha Sequence Report
*/
-struct sandesha2_seq_property_mgr_impl
+struct sandesha2_seq_property_mgr_t
{
- sandesha2_seq_property_mgr_t seq_property;
-
axis2_hash_t *table;
axis2_array_list_t *values;
axis2_thread_mutex_t *mutex;
};
-#define SANDESHA2_INTF_TO_IMPL(seq_property) ((sandesha2_seq_property_mgr_impl_t *) seq_property)
-
-axis2_status_t AXIS2_CALL
-sandesha2_seq_property_mgr_free(
- void *seq_property,
- const axis2_env_t *envv);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_seq_property_mgr_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_seq_property_mgr_remove(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- axis2_char_t *name);
-
-sandesha2_seq_property_bean_t *AXIS2_CALL
-sandesha2_seq_property_mgr_retrieve(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- axis2_char_t *name);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_seq_property_mgr_update(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_seq_property_mgr_find(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
-
-sandesha2_seq_property_bean_t *AXIS2_CALL
-sandesha2_seq_property_mgr_find_unique(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_seq_property_mgr_retrieve_all(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_seq_property_mgr_update_or_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
-
static axis2_char_t *
sandesha2_seq_property_mgr_get_id(
- sandesha2_seq_property_mgr_t *seq_property,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
const axis2_env_t *env,
sandesha2_seq_property_bean_t *bean);
@@ -106,30 +46,27 @@
const axis2_env_t *env,
axis2_ctx_t *ctx)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- seq_property_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_mgr_impl_t));
+ seq_prop_mgr = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_mgr_t));
- seq_property_impl->table = NULL;
- seq_property_impl->values = NULL;
- seq_property_impl->mutex = NULL;
+ seq_prop_mgr->table = NULL;
+ seq_prop_mgr->values = NULL;
+ seq_prop_mgr->mutex = NULL;
- seq_property_impl->seq_property.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_mgr_ops_t));
-
- seq_property_impl->mutex = axis2_thread_mutex_create(env->allocator,
+ seq_prop_mgr->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- if(!seq_property_impl->mutex)
+ if(!seq_prop_mgr->mutex)
{
- sandesha2_seq_property_mgr_free(&(seq_property_impl->seq_property), env);
+ sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
return NULL;
}
- seq_property_impl->values = axis2_array_list_create(env, 0);
- if(!seq_property_impl->values)
+ seq_prop_mgr->values = axis2_array_list_create(env, 0);
+ if(!seq_prop_mgr->values)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -138,114 +75,84 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_SEQ_PROPERTY, AXIS2_FALSE);
if(NULL != property)
- seq_property_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!seq_property_impl->table)
+ seq_prop_mgr->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(!seq_prop_mgr->table)
{
axis2_property_t *property = NULL;
property = axis2_property_create(env);
- seq_property_impl->table = axis2_hash_make(env);
- if(!property || !seq_property_impl->table)
+ seq_prop_mgr->table = axis2_hash_make(env);
+ if(!property || !seq_prop_mgr->table)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, seq_property_impl->table);
+ AXIS2_PROPERTY_SET_VALUE(property, env, seq_prop_mgr->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_SEQ_PROPERTY,
property, AXIS2_FALSE);
}
- seq_property_impl->seq_property.ops->free = sandesha2_seq_property_mgr_free;
- seq_property_impl->seq_property.ops->insert =
- sandesha2_seq_property_mgr_insert;
- seq_property_impl->seq_property.ops->remove =
- sandesha2_seq_property_mgr_remove;
- seq_property_impl->seq_property.ops->retrieve =
- sandesha2_seq_property_mgr_retrieve;
- seq_property_impl->seq_property.ops->update =
- sandesha2_seq_property_mgr_update;
- seq_property_impl->seq_property.ops->find =
- sandesha2_seq_property_mgr_find;
- seq_property_impl->seq_property.ops->find_unique =
- sandesha2_seq_property_mgr_find_unique;
- seq_property_impl->seq_property.ops->retrieve_all =
- sandesha2_seq_property_mgr_retrieve_all;
- seq_property_impl->seq_property.ops->update_or_insert =
- sandesha2_seq_property_mgr_update_or_insert;
-
- return &(seq_property_impl->seq_property);
+ return seq_prop_mgr;
}
axis2_status_t AXIS2_CALL
sandesha2_seq_property_mgr_free(
- void *seq_property,
- const axis2_env_t *env)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
- if(seq_property_impl->mutex)
- {
- axis2_thread_mutex_destroy(seq_property_impl->mutex);
- seq_property_impl->mutex = NULL;
- }
- if(seq_property_impl->values)
+ if(seq_prop_mgr->mutex)
{
- AXIS2_ARRAY_LIST_FREE(seq_property_impl->values, env);
- seq_property_impl->values = NULL;
+ axis2_thread_mutex_destroy(seq_prop_mgr->mutex);
+ seq_prop_mgr->mutex = NULL;
}
-
- if(seq_property_impl->table)
+ if(seq_prop_mgr->values)
{
- axis2_hash_free(seq_property_impl->table, env);
- seq_property_impl->table = NULL;
+ AXIS2_ARRAY_LIST_FREE(seq_prop_mgr->values, env);
+ seq_prop_mgr->values = NULL;
}
- if((&(seq_property_impl->seq_property))->ops)
+ if(seq_prop_mgr->table)
{
- AXIS2_FREE(env->allocator, (&(seq_property_impl->seq_property))->ops);
- (&(seq_property_impl->seq_property))->ops = NULL;
+ axis2_hash_free(seq_prop_mgr->table, env);
+ seq_prop_mgr->table = NULL;
}
- if(seq_property_impl)
+ if(seq_prop_mgr)
{
- AXIS2_FREE(env->allocator, seq_property_impl);
- seq_property_impl = NULL;
+ AXIS2_FREE(env->allocator, seq_prop_mgr);
+ seq_prop_mgr = NULL;
}
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *seq_id = NULL;
axis2_char_t *id = NULL;
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
-
- seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
+ seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
if(!seq_id)
{
return AXIS2_FALSE;
}
- name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
+ name = sandesha2_seq_property_bean_get_name(bean, env);
if(!name)
{
return AXIS2_FALSE;
}
id = axis2_strcat(env, seq_id, ":", name, NULL);
- axis2_hash_set(seq_property_impl->table, id, AXIS2_HASH_KEY_STRING, bean);
+ axis2_hash_set(seq_prop_mgr->table, id, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -253,25 +160,22 @@
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_remove(
- sandesha2_seq_property_mgr_t *seq_property,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
const axis2_env_t *env,
axis2_char_t *seq_id,
axis2_char_t *name)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
sandesha2_seq_property_bean_t *bean = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
-
- bean = sandesha2_seq_property_mgr_retrieve(seq_property, env,
+ bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id, name);
key = axis2_strcat(env, seq_id, ":", name, NULL);
- axis2_hash_set(seq_property_impl->table, key, AXIS2_HASH_KEY_STRING, NULL);
+ axis2_hash_set(seq_prop_mgr->table, key, AXIS2_HASH_KEY_STRING, NULL);
AXIS2_FREE(env->allocator, key);
return AXIS2_TRUE;
@@ -280,22 +184,20 @@
sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve(
- sandesha2_seq_property_mgr_t *seq_property,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
const axis2_env_t *env,
axis2_char_t *seq_id,
axis2_char_t *name)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
sandesha2_seq_property_bean_t *bean = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
key = axis2_strcat(env, seq_id, ":", name, NULL);
- bean = (sandesha2_seq_property_bean_t *) axis2_hash_get(seq_property_impl->table,
+ bean = (sandesha2_seq_property_bean_t *) axis2_hash_get(seq_prop_mgr->table,
key, AXIS2_HASH_KEY_STRING);
return bean;
@@ -303,29 +205,27 @@
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_update(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *id = NULL;
sandesha2_seq_property_bean_t *bean_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
- id = sandesha2_seq_property_mgr_get_id(seq_property, env, bean);
+ id = sandesha2_seq_property_mgr_get_id(seq_prop_mgr, env, bean);
if(!id)
{
return AXIS2_FALSE;
}
- bean_l = axis2_hash_get(seq_property_impl->table, id,
+ bean_l = axis2_hash_get(seq_prop_mgr->table, id,
AXIS2_HASH_KEY_STRING);
if(!bean_l)
{
return AXIS2_FALSE;
}
- axis2_hash_set(seq_property_impl->table, id,
+ axis2_hash_set(seq_prop_mgr->table, id,
AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -333,16 +233,14 @@
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_find(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_array_list_t *beans = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
beans = axis2_array_list_create(env, 0);
if(!beans)
@@ -354,7 +252,7 @@
{
return beans;
}
- for (i = axis2_hash_first (seq_property_impl->table, env); i;
+ for (i = axis2_hash_first (seq_prop_mgr->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_seq_property_bean_t *temp = NULL;
@@ -369,20 +267,20 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_seq_property_bean_t *) v;
- seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
- temp_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(temp, env);
+ seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
+ temp_seq_id = sandesha2_seq_property_bean_get_seq_id(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
- name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
- temp_name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(temp, env);
+ name = sandesha2_seq_property_bean_get_name(bean, env);
+ temp_name = sandesha2_seq_property_bean_get_name(temp, env);
if(name && temp_name && 0 != AXIS2_STRCMP(name, temp_name))
{
equal = AXIS2_FALSE;
}
- value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(bean, env);
- temp_value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(temp,
+ value = sandesha2_seq_property_bean_get_value(bean, env);
+ temp_value = sandesha2_seq_property_bean_get_value(temp,
env);
if(value && temp_value && 0 != AXIS2_STRCMP(value, temp_value))
{
@@ -400,21 +298,18 @@
sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_find_unique(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_array_list_t *beans = NULL;
int i = 0, size = 0;
sandesha2_seq_property_bean_t *ret = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
-
- beans = sandesha2_seq_property_mgr_find(seq_property, env,
+ beans = sandesha2_seq_property_mgr_find(seq_prop_mgr, env,
bean);
if(beans)
size = AXIS2_ARRAY_LIST_SIZE(beans, env);
@@ -430,23 +325,20 @@
ret = AXIS2_ARRAY_LIST_GET(beans, env, i);
break;
}
-
return ret;
}
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve_all(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
- for (i = axis2_hash_first (seq_property_impl->table, env); i;
+ for (i = axis2_hash_first (seq_prop_mgr->table, env); i;
i = axis2_hash_next (env, i))
{
sandesha2_seq_property_bean_t *bean = NULL;
@@ -454,39 +346,36 @@
axis2_hash_this (i, NULL, NULL, &v);
bean = (sandesha2_seq_property_bean_t *) v;
- AXIS2_ARRAY_LIST_ADD(seq_property_impl->values, env, bean);
+ AXIS2_ARRAY_LIST_ADD(seq_prop_mgr->values, env, bean);
}
-
- return seq_property_impl->values;
+ return seq_prop_mgr->values;
}
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_update_or_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean)
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *id = NULL;
sandesha2_seq_property_bean_t *bean_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
- id = sandesha2_seq_property_mgr_get_id(seq_property, env, bean);
+ id = sandesha2_seq_property_mgr_get_id(seq_prop_mgr, env, bean);
if(!id)
{
return AXIS2_FALSE;
}
- bean_l = axis2_hash_get(seq_property_impl->table, id,
+ bean_l = axis2_hash_get(seq_prop_mgr->table, id,
AXIS2_HASH_KEY_STRING);
if(!bean_l)
{
- axis2_hash_set(seq_property_impl->table, id,
+ axis2_hash_set(seq_prop_mgr->table, id,
AXIS2_HASH_KEY_STRING, bean);
}
- axis2_hash_set(seq_property_impl->table, id,
+ axis2_hash_set(seq_prop_mgr->table, id,
AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -494,20 +383,18 @@
static axis2_char_t *
sandesha2_seq_property_mgr_get_id(
- sandesha2_seq_property_mgr_t *seq_property,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr,
const axis2_env_t *env,
sandesha2_seq_property_bean_t *bean)
{
- sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *seq_id = NULL;
axis2_char_t *name = NULL;
axis2_char_t *id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
- seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
- name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
+ seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
+ name = sandesha2_seq_property_bean_get_name(bean, env);
id = axis2_strcat(env, seq_id, ":", name, NULL);
return id;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Fri Nov 10 01:51:08 2006
@@ -127,17 +127,17 @@
}
if(storage_mgr->next_msg_mgr)
{
- SANDESHA2_NEXT_MSG_MGR_FREE(storage_mgr->next_msg_mgr, env);
+ sandesha2_next_msg_mgr_free(storage_mgr->next_msg_mgr, env);
storage_mgr->next_msg_mgr = NULL;
}
if(storage_mgr->sender_mgr)
{
- SANDESHA2_SENDER_MGR_FREE(storage_mgr->sender_mgr, env);
+ sandesha2_sender_mgr_free(storage_mgr->sender_mgr, env);
storage_mgr->sender_mgr = NULL;
}
if(storage_mgr->seq_property_mgr)
{
- SANDESHA2_SEQ_PROPERTY_MGR_FREE(storage_mgr->seq_property_mgr, env);
+ sandesha2_seq_property_mgr_free(storage_mgr->seq_property_mgr, env);
storage_mgr->seq_property_mgr = NULL;
}
if(storage_mgr->invoker_mgr)
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org