You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/10/08 20:11:49 UTC
svn commit: r1530376 - in /qpid/trunk/qpid/extras/dispatch:
include/qpid/dispatch/buffer.h include/qpid/dispatch/message.h src/agent.c
src/buffer.c src/compose.c src/message.c src/python_embedded.c
src/router_node.c tests/message_test.c
Author: tross
Date: Tue Oct 8 18:11:48 2013
New Revision: 1530376
URL: http://svn.apache.org/r1530376
Log:
QPID-5217 - Brought message and buffer create/destroy functions into compliance with the standard
create and destroy convention.
Modified:
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/buffer.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/message.h
qpid/trunk/qpid/extras/dispatch/src/agent.c
qpid/trunk/qpid/extras/dispatch/src/buffer.c
qpid/trunk/qpid/extras/dispatch/src/compose.c
qpid/trunk/qpid/extras/dispatch/src/message.c
qpid/trunk/qpid/extras/dispatch/src/python_embedded.c
qpid/trunk/qpid/extras/dispatch/src/router_node.c
qpid/trunk/qpid/extras/dispatch/tests/message_test.c
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/buffer.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/buffer.h?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/buffer.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/buffer.h Tue Oct 8 18:11:48 2013
@@ -36,12 +36,12 @@ void dx_buffer_set_size(size_t size);
/**
*/
-dx_buffer_t *dx_allocate_buffer(void);
+dx_buffer_t *dx_buffer(void);
/**
* @param buf A pointer to an allocated buffer
*/
-void dx_free_buffer(dx_buffer_t *buf);
+void dx_buffer_free(dx_buffer_t *buf);
/**
* @param buf A pointer to an allocated buffer
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/message.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/message.h?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/message.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/message.h Tue Oct 8 18:11:48 2013
@@ -96,7 +96,7 @@ typedef enum {
* @return A pointer to a dx_message_t that is the sole reference to a newly allocated
* message.
*/
-dx_message_t *dx_allocate_message(void);
+dx_message_t *dx_message(void);
/**
* Free a message reference. If this is the last reference to the message, free the
@@ -104,7 +104,7 @@ dx_message_t *dx_allocate_message(void);
*
* @param msg A pointer to a dx_message_t that is no longer needed.
*/
-void dx_free_message(dx_message_t *msg);
+void dx_message_free(dx_message_t *msg);
/**
* Make a new reference to an existing message.
Modified: qpid/trunk/qpid/extras/dispatch/src/agent.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/agent.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/agent.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/agent.c Tue Oct 8 18:11:48 2013
@@ -138,11 +138,11 @@ static void dx_agent_process_get(dx_agen
//
// Create a message and send it.
//
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_compose_2(msg, field);
dx_router_send(agent->dx, reply_to, msg);
- dx_free_message(msg);
+ dx_message_free(msg);
dx_compose_free(field);
}
@@ -234,7 +234,7 @@ static void dx_agent_deferred_handler(vo
if (msg) {
dx_agent_process_request(agent, msg);
- dx_free_message(msg);
+ dx_message_free(msg);
}
} while (msg);
}
Modified: qpid/trunk/qpid/extras/dispatch/src/buffer.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/buffer.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/buffer.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/buffer.c Tue Oct 8 18:11:48 2013
@@ -34,7 +34,7 @@ void dx_buffer_set_size(size_t size)
}
-dx_buffer_t *dx_allocate_buffer(void)
+dx_buffer_t *dx_buffer(void)
{
size_locked = 1;
dx_buffer_t *buf = new_dx_buffer_t();
@@ -45,7 +45,7 @@ dx_buffer_t *dx_allocate_buffer(void)
}
-void dx_free_buffer(dx_buffer_t *buf)
+void dx_buffer_free(dx_buffer_t *buf)
{
free_dx_buffer_t(buf);
}
Modified: qpid/trunk/qpid/extras/dispatch/src/compose.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/compose.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/compose.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/compose.c Tue Oct 8 18:11:48 2013
@@ -43,7 +43,7 @@ static void dx_insert(dx_composed_field_
while (len > 0) {
if (buf == 0 || dx_buffer_capacity(buf) == 0) {
- buf = dx_allocate_buffer();
+ buf = dx_buffer();
if (buf == 0)
return;
DEQ_INSERT_TAIL(field->buffers, buf);
@@ -212,7 +212,7 @@ void dx_compose_free(dx_composed_field_t
dx_buffer_t *buf = DEQ_HEAD(field->buffers);
while (buf) {
DEQ_REMOVE_HEAD(field->buffers);
- dx_free_buffer(buf);
+ dx_buffer_free(buf);
buf = DEQ_HEAD(field->buffers);
}
Modified: qpid/trunk/qpid/extras/dispatch/src/message.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/message.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/message.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/message.c Tue Oct 8 18:11:48 2013
@@ -376,7 +376,7 @@ static dx_field_location_t *dx_message_f
}
-dx_message_t *dx_allocate_message()
+dx_message_t *dx_message()
{
dx_message_pvt_t *msg = (dx_message_pvt_t*) new_dx_message_t();
if (!msg)
@@ -400,7 +400,7 @@ dx_message_t *dx_allocate_message()
}
-void dx_free_message(dx_message_t *in_msg)
+void dx_message_free(dx_message_t *in_msg)
{
uint32_t rc;
dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
@@ -417,14 +417,14 @@ void dx_free_message(dx_message_t *in_ms
dx_buffer_t *buf = DEQ_HEAD(content->buffers);
while (buf) {
DEQ_REMOVE_HEAD(content->buffers);
- dx_free_buffer(buf);
+ dx_buffer_free(buf);
buf = DEQ_HEAD(content->buffers);
}
buf = DEQ_HEAD(content->new_delivery_annotations);
while (buf) {
DEQ_REMOVE_HEAD(content->new_delivery_annotations);
- dx_free_buffer(buf);
+ dx_buffer_free(buf);
buf = DEQ_HEAD(content->new_delivery_annotations);
}
@@ -508,7 +508,7 @@ dx_message_t *dx_message_receive(dx_deli
// link it and the delivery together.
//
if (!msg) {
- msg = (dx_message_pvt_t*) dx_allocate_message();
+ msg = (dx_message_pvt_t*) dx_message();
dx_delivery_set_context(delivery, (void*) msg);
}
@@ -519,7 +519,7 @@ dx_message_t *dx_message_receive(dx_deli
//
buf = DEQ_TAIL(msg->content->buffers);
if (!buf) {
- buf = dx_allocate_buffer();
+ buf = dx_buffer();
DEQ_INSERT_TAIL(msg->content->buffers, buf);
}
@@ -540,7 +540,7 @@ dx_message_t *dx_message_receive(dx_deli
//
if (dx_buffer_size(buf) == 0) {
DEQ_REMOVE_TAIL(msg->content->buffers);
- dx_free_buffer(buf);
+ dx_buffer_free(buf);
}
dx_delivery_set_context(delivery, 0);
return (dx_message_t*) msg;
@@ -558,7 +558,7 @@ dx_message_t *dx_message_receive(dx_deli
// tail of the message's list.
//
if (dx_buffer_capacity(buf) == 0) {
- buf = dx_allocate_buffer();
+ buf = dx_buffer();
DEQ_INSERT_TAIL(msg->content->buffers, buf);
}
} else
Modified: qpid/trunk/qpid/extras/dispatch/src/python_embedded.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/python_embedded.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/python_embedded.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/python_embedded.c Tue Oct 8 18:11:48 2013
@@ -549,10 +549,10 @@ static PyObject* dx_python_send(PyObject
field = dx_compose(DX_PERFORMATIVE_BODY_AMQP_VALUE, field);
dx_py_to_composed(body, field);
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_compose_2(msg, field);
dx_router_send2(ioa->dx, address, msg);
- dx_free_message(msg);
+ dx_message_free(msg);
dx_compose_free(field);
Py_INCREF(Py_None);
Modified: qpid/trunk/qpid/extras/dispatch/src/router_node.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/router_node.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/router_node.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/router_node.c Tue Oct 8 18:11:48 2013
@@ -253,7 +253,7 @@ static int router_writable_link_handler(
pn_link_advance(pn_link);
event_count++;
- dx_free_message(re->message);
+ dx_message_free(re->message);
free_dx_routed_event_t(re);
re = DEQ_HEAD(to_send);
}
@@ -580,14 +580,14 @@ static void router_rx_handler(void* cont
}
sys_mutex_unlock(router->lock);
- dx_free_message(msg);
+ dx_message_free(msg);
//
// Invoke the in-process handler now that the lock is released.
//
if (handler) {
handler(handler_context, in_process_copy, rlink->mask_bit);
- dx_free_message(in_process_copy);
+ dx_message_free(in_process_copy);
}
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/message_test.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/message_test.c?rev=1530376&r1=1530375&r2=1530376&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/message_test.c (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/message_test.c Tue Oct 8 18:11:48 2013
@@ -47,7 +47,7 @@ static void set_content(dx_message_conte
dx_buffer_t *buf;
while (len > (size_t) (cursor - buffer)) {
- buf = dx_allocate_buffer();
+ buf = dx_buffer();
size_t segment = dx_buffer_capacity(buf);
size_t remaining = len - (size_t) (cursor - buffer);
if (segment > remaining)
@@ -62,7 +62,7 @@ static void set_content(dx_message_conte
static char* test_send_to_messenger(void *context)
{
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_content_t *content = MSG_CONTENT(msg);
dx_message_compose_1(msg, "test_addr_0", 0);
@@ -78,7 +78,7 @@ static char* test_send_to_messenger(void
return "Address mismatch in received message";
pn_message_free(pn_msg);
- dx_free_message(msg);
+ dx_message_free(msg);
return 0;
}
@@ -93,7 +93,7 @@ static char* test_receive_from_messenger
int result = pn_message_encode(pn_msg, buffer, &size);
if (result != 0) return "Error in pn_message_encode";
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_content_t *content = MSG_CONTENT(msg);
set_content(content, size);
@@ -118,7 +118,7 @@ static char* test_receive_from_messenger
return "Incorrect field content returned from field_copy";
pn_message_free(pn_msg);
- dx_free_message(msg);
+ dx_message_free(msg);
return 0;
}
@@ -133,7 +133,7 @@ static char* test_insufficient_check_dep
int result = pn_message_encode(pn_msg, buffer, &size);
if (result != 0) return "Error in pn_message_encode";
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_content_t *content = MSG_CONTENT(msg);
set_content(content, size);
@@ -144,7 +144,7 @@ static char* test_insufficient_check_dep
dx_field_iterator_t *iter = dx_message_field_iterator(msg, DX_FIELD_TO);
if (iter) return "Expected no iterator for the 'to' field";
- dx_free_message(msg);
+ dx_message_free(msg);
return 0;
}
@@ -159,7 +159,7 @@ static char* test_check_multiple(void *c
int result = pn_message_encode(pn_msg, buffer, &size);
if (result != 0) return "Error in pn_message_encode";
- dx_message_t *msg = dx_allocate_message();
+ dx_message_t *msg = dx_message();
dx_message_content_t *content = MSG_CONTENT(msg);
set_content(content, size);
@@ -173,7 +173,7 @@ static char* test_check_multiple(void *c
valid = dx_message_check(msg, DX_DEPTH_PROPERTIES);
if (!valid) return "dx_message_check returns 'invalid' for PROPERTIES";
- dx_free_message(msg);
+ dx_message_free(msg);
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org