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/11/19 20:21:32 UTC
svn commit: r1543534 [4/8] - in /qpid/dispatch/trunk: ./ etc/
include/qpid/dispatch/ python/qpiddx/router/ router/ router/src/ src/
tests/ tools/src/py/
Modified: qpid/dispatch/trunk/src/iterator.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/iterator.c?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/iterator.c (original)
+++ qpid/dispatch/trunk/src/iterator.c Tue Nov 19 19:21:30 2013
@@ -33,24 +33,24 @@ typedef enum {
} parse_mode_t;
typedef struct {
- dx_buffer_t *buffer;
+ qd_buffer_t *buffer;
unsigned char *cursor;
int length;
} pointer_t;
-struct dx_field_iterator_t {
+struct qd_field_iterator_t {
pointer_t start_pointer;
pointer_t view_start_pointer;
pointer_t pointer;
- dx_iterator_view_t view;
+ qd_iterator_view_t view;
parse_mode_t mode;
unsigned char prefix;
int at_prefix;
int view_prefix;
};
-ALLOC_DECLARE(dx_field_iterator_t);
-ALLOC_DEFINE(dx_field_iterator_t);
+ALLOC_DECLARE(qd_field_iterator_t);
+ALLOC_DEFINE(qd_field_iterator_t);
typedef enum {
@@ -68,7 +68,7 @@ static char *my_area = "";
static char *my_router = "";
-static void parse_address_view(dx_field_iterator_t *iter)
+static void parse_address_view(qd_field_iterator_t *iter)
{
//
// This function starts with an iterator view that is identical to
@@ -76,17 +76,17 @@ static void parse_address_view(dx_field_
// to aid the router in looking up addresses.
//
- if (dx_field_iterator_prefix(iter, "_")) {
- if (dx_field_iterator_prefix(iter, "local/")) {
+ if (qd_field_iterator_prefix(iter, "_")) {
+ if (qd_field_iterator_prefix(iter, "local/")) {
iter->prefix = 'L';
iter->at_prefix = 1;
iter->view_prefix = 1;
return;
}
- if (dx_field_iterator_prefix(iter, "topo/")) {
- if (dx_field_iterator_prefix(iter, "all/") || dx_field_iterator_prefix(iter, my_area)) {
- if (dx_field_iterator_prefix(iter, "all/") || dx_field_iterator_prefix(iter, my_router)) {
+ if (qd_field_iterator_prefix(iter, "topo/")) {
+ if (qd_field_iterator_prefix(iter, "all/") || qd_field_iterator_prefix(iter, my_area)) {
+ if (qd_field_iterator_prefix(iter, "all/") || qd_field_iterator_prefix(iter, my_router)) {
iter->prefix = 'L';
iter->at_prefix = 1;
iter->view_prefix = 1;
@@ -114,7 +114,7 @@ static void parse_address_view(dx_field_
}
-static void parse_node_view(dx_field_iterator_t *iter)
+static void parse_node_view(qd_field_iterator_t *iter)
{
//
// This function starts with an iterator view that is identical to
@@ -122,7 +122,7 @@ static void parse_node_view(dx_field_ite
// to aid the router in looking up nodes.
//
- if (dx_field_iterator_prefix(iter, my_area)) {
+ if (qd_field_iterator_prefix(iter, my_area)) {
iter->prefix = 'R';
iter->at_prefix = 1;
iter->view_prefix = 1;
@@ -137,7 +137,7 @@ static void parse_node_view(dx_field_ite
}
-static void view_initialize(dx_field_iterator_t *iter)
+static void view_initialize(qd_field_iterator_t *iter)
{
//
// The default behavior is for the view to *not* have a prefix.
@@ -157,8 +157,8 @@ static void view_initialize(dx_field_ite
unsigned int octet;
pointer_t save_pointer = {0,0,0};
- while (!dx_field_iterator_end(iter) && state != STATE_AT_NODE_ID) {
- octet = dx_field_iterator_octet(iter);
+ while (!qd_field_iterator_end(iter) && state != STATE_AT_NODE_ID) {
+ octet = qd_field_iterator_octet(iter);
switch (state) {
case STATE_START :
if (octet == '/')
@@ -241,8 +241,8 @@ static void view_initialize(dx_field_ite
if (iter->view == ITER_VIEW_NODE_SPECIFIC) {
iter->mode = MODE_TO_END;
- while (!dx_field_iterator_end(iter)) {
- octet = dx_field_iterator_octet(iter);
+ while (!qd_field_iterator_end(iter)) {
+ octet = qd_field_iterator_octet(iter);
if (octet == '/')
break;
}
@@ -251,7 +251,7 @@ static void view_initialize(dx_field_ite
}
-void dx_field_iterator_set_address(const char *area, const char *router)
+void qd_field_iterator_set_address(const char *area, const char *router)
{
my_area = (char*) malloc(strlen(area) + 2);
strcpy(my_area, area);
@@ -263,9 +263,9 @@ void dx_field_iterator_set_address(const
}
-dx_field_iterator_t* dx_field_iterator_string(const char *text, dx_iterator_view_t view)
+qd_field_iterator_t* qd_field_iterator_string(const char *text, qd_iterator_view_t view)
{
- dx_field_iterator_t *iter = new_dx_field_iterator_t();
+ qd_field_iterator_t *iter = new_qd_field_iterator_t();
if (!iter)
return 0;
@@ -273,15 +273,15 @@ dx_field_iterator_t* dx_field_iterator_s
iter->start_pointer.cursor = (unsigned char*) text;
iter->start_pointer.length = strlen(text);
- dx_field_iterator_reset_view(iter, view);
+ qd_field_iterator_reset_view(iter, view);
return iter;
}
-dx_field_iterator_t* dx_field_iterator_binary(const char *text, int length, dx_iterator_view_t view)
+qd_field_iterator_t* qd_field_iterator_binary(const char *text, int length, qd_iterator_view_t view)
{
- dx_field_iterator_t *iter = new_dx_field_iterator_t();
+ qd_field_iterator_t *iter = new_qd_field_iterator_t();
if (!iter)
return 0;
@@ -289,42 +289,42 @@ dx_field_iterator_t* dx_field_iterator_b
iter->start_pointer.cursor = (unsigned char*) text;
iter->start_pointer.length = length;
- dx_field_iterator_reset_view(iter, view);
+ qd_field_iterator_reset_view(iter, view);
return iter;
}
-dx_field_iterator_t *dx_field_iterator_buffer(dx_buffer_t *buffer, int offset, int length, dx_iterator_view_t view)
+qd_field_iterator_t *qd_field_iterator_buffer(qd_buffer_t *buffer, int offset, int length, qd_iterator_view_t view)
{
- dx_field_iterator_t *iter = new_dx_field_iterator_t();
+ qd_field_iterator_t *iter = new_qd_field_iterator_t();
if (!iter)
return 0;
iter->start_pointer.buffer = buffer;
- iter->start_pointer.cursor = dx_buffer_base(buffer) + offset;
+ iter->start_pointer.cursor = qd_buffer_base(buffer) + offset;
iter->start_pointer.length = length;
- dx_field_iterator_reset_view(iter, view);
+ qd_field_iterator_reset_view(iter, view);
return iter;
}
-void dx_field_iterator_free(dx_field_iterator_t *iter)
+void qd_field_iterator_free(qd_field_iterator_t *iter)
{
- free_dx_field_iterator_t(iter);
+ free_qd_field_iterator_t(iter);
}
-void dx_field_iterator_reset(dx_field_iterator_t *iter)
+void qd_field_iterator_reset(qd_field_iterator_t *iter)
{
iter->pointer = iter->view_start_pointer;
iter->at_prefix = iter->view_prefix;
}
-void dx_field_iterator_reset_view(dx_field_iterator_t *iter, dx_iterator_view_t view)
+void qd_field_iterator_reset_view(qd_field_iterator_t *iter, qd_iterator_view_t view)
{
iter->pointer = iter->start_pointer;
iter->view = view;
@@ -335,7 +335,7 @@ void dx_field_iterator_reset_view(dx_fie
}
-unsigned char dx_field_iterator_octet(dx_field_iterator_t *iter)
+unsigned char qd_field_iterator_octet(qd_field_iterator_t *iter)
{
if (iter->at_prefix) {
iter->at_prefix = 0;
@@ -352,11 +352,11 @@ unsigned char dx_field_iterator_octet(dx
if (iter->pointer.length > 0) {
if (iter->pointer.buffer) {
- if (iter->pointer.cursor - dx_buffer_base(iter->pointer.buffer) == dx_buffer_size(iter->pointer.buffer)) {
+ if (iter->pointer.cursor - qd_buffer_base(iter->pointer.buffer) == qd_buffer_size(iter->pointer.buffer)) {
iter->pointer.buffer = iter->pointer.buffer->next;
if (iter->pointer.buffer == 0)
iter->pointer.length = 0;
- iter->pointer.cursor = dx_buffer_base(iter->pointer.buffer);
+ iter->pointer.cursor = qd_buffer_base(iter->pointer.buffer);
}
}
}
@@ -368,15 +368,15 @@ unsigned char dx_field_iterator_octet(dx
}
-int dx_field_iterator_end(dx_field_iterator_t *iter)
+int qd_field_iterator_end(qd_field_iterator_t *iter)
{
return iter->pointer.length == 0;
}
-dx_field_iterator_t *dx_field_iterator_sub(dx_field_iterator_t *iter, uint32_t length)
+qd_field_iterator_t *qd_field_iterator_sub(qd_field_iterator_t *iter, uint32_t length)
{
- dx_field_iterator_t *sub = new_dx_field_iterator_t();
+ qd_field_iterator_t *sub = new_qd_field_iterator_t();
if (!sub)
return 0;
@@ -393,40 +393,40 @@ dx_field_iterator_t *dx_field_iterator_s
}
-void dx_field_iterator_advance(dx_field_iterator_t *iter, uint32_t length)
+void qd_field_iterator_advance(qd_field_iterator_t *iter, uint32_t length)
{
// TODO - Make this more efficient.
- for (uint8_t idx = 0; idx < length && !dx_field_iterator_end(iter); idx++)
- dx_field_iterator_octet(iter);
+ for (uint8_t idx = 0; idx < length && !qd_field_iterator_end(iter); idx++)
+ qd_field_iterator_octet(iter);
}
-uint32_t dx_field_iterator_remaining(dx_field_iterator_t *iter)
+uint32_t qd_field_iterator_remaining(qd_field_iterator_t *iter)
{
return iter->pointer.length;
}
-int dx_field_iterator_equal(dx_field_iterator_t *iter, const unsigned char *string)
+int qd_field_iterator_equal(qd_field_iterator_t *iter, const unsigned char *string)
{
- dx_field_iterator_reset(iter);
- while (!dx_field_iterator_end(iter) && *string) {
- if (*string != dx_field_iterator_octet(iter))
+ qd_field_iterator_reset(iter);
+ while (!qd_field_iterator_end(iter) && *string) {
+ if (*string != qd_field_iterator_octet(iter))
return 0;
string++;
}
- return (dx_field_iterator_end(iter) && (*string == 0));
+ return (qd_field_iterator_end(iter) && (*string == 0));
}
-int dx_field_iterator_prefix(dx_field_iterator_t *iter, const char *prefix)
+int qd_field_iterator_prefix(qd_field_iterator_t *iter, const char *prefix)
{
pointer_t save_pointer = iter->pointer;
unsigned char *c = (unsigned char*) prefix;
while(*c) {
- if (*c != dx_field_iterator_octet(iter))
+ if (*c != qd_field_iterator_octet(iter))
break;
c++;
}
@@ -440,29 +440,29 @@ int dx_field_iterator_prefix(dx_field_it
}
-unsigned char *dx_field_iterator_copy(dx_field_iterator_t *iter)
+unsigned char *qd_field_iterator_copy(qd_field_iterator_t *iter)
{
int length = 0;
int idx = 0;
unsigned char *copy;
- dx_field_iterator_reset(iter);
- while (!dx_field_iterator_end(iter)) {
- dx_field_iterator_octet(iter);
+ qd_field_iterator_reset(iter);
+ while (!qd_field_iterator_end(iter)) {
+ qd_field_iterator_octet(iter);
length++;
}
- dx_field_iterator_reset(iter);
+ qd_field_iterator_reset(iter);
copy = (unsigned char*) malloc(length + 1);
- while (!dx_field_iterator_end(iter))
- copy[idx++] = dx_field_iterator_octet(iter);
+ while (!qd_field_iterator_end(iter))
+ copy[idx++] = qd_field_iterator_octet(iter);
copy[idx] = '\0';
return copy;
}
-dx_iovec_t *dx_field_iterator_iovec(const dx_field_iterator_t *iter)
+qd_iovec_t *qd_field_iterator_iovec(const qd_field_iterator_t *iter)
{
assert(!iter->view_prefix); // Not supported for views with a prefix
@@ -471,8 +471,8 @@ dx_iovec_t *dx_field_iterator_iovec(cons
//
pointer_t pointer = iter->view_start_pointer;
int bufcnt = 1;
- dx_buffer_t *buf = pointer.buffer;
- size_t bufsize = dx_buffer_size(buf) - (pointer.cursor - dx_buffer_base(pointer.buffer));
+ qd_buffer_t *buf = pointer.buffer;
+ size_t bufsize = qd_buffer_size(buf) - (pointer.cursor - qd_buffer_base(pointer.buffer));
ssize_t remaining = pointer.length - bufsize;
while (remaining > 0) {
@@ -480,13 +480,13 @@ dx_iovec_t *dx_field_iterator_iovec(cons
buf = buf->next;
if (!buf)
return 0;
- remaining -= dx_buffer_size(buf);
+ remaining -= qd_buffer_size(buf);
}
//
// Allocate an iovec object big enough to hold the number of buffers
//
- dx_iovec_t *iov = dx_iovec(bufcnt);
+ qd_iovec_t *iov = qd_iovec(bufcnt);
if (!iov)
return 0;
@@ -495,21 +495,21 @@ dx_iovec_t *dx_field_iterator_iovec(cons
//
bufcnt = 0;
buf = pointer.buffer;
- bufsize = dx_buffer_size(buf) - (pointer.cursor - dx_buffer_base(pointer.buffer));
+ bufsize = qd_buffer_size(buf) - (pointer.cursor - qd_buffer_base(pointer.buffer));
void *base = pointer.cursor;
remaining = pointer.length;
while (remaining > 0) {
if (bufsize > remaining)
bufsize = remaining;
- dx_iovec_array(iov)[bufcnt].iov_base = base;
- dx_iovec_array(iov)[bufcnt].iov_len = bufsize;
+ qd_iovec_array(iov)[bufcnt].iov_base = base;
+ qd_iovec_array(iov)[bufcnt].iov_len = bufsize;
bufcnt++;
remaining -= bufsize;
if (remaining > 0) {
buf = buf->next;
- base = dx_buffer_base(buf);
- bufsize = dx_buffer_size(buf);
+ base = qd_buffer_base(buf);
+ bufsize = qd_buffer_size(buf);
}
}
Modified: qpid/dispatch/trunk/src/log.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/log.c?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/log.c (original)
+++ qpid/dispatch/trunk/src/log.c Tue Nov 19 19:21:30 2013
@@ -29,10 +29,10 @@
#define TEXT_MAX 512
#define LIST_MAX 1000
-typedef struct dx_log_entry_t dx_log_entry_t;
+typedef struct qd_log_entry_t qd_log_entry_t;
-struct dx_log_entry_t {
- DEQ_LINKS(dx_log_entry_t);
+struct qd_log_entry_t {
+ DEQ_LINKS(qd_log_entry_t);
const char *module;
int cls;
const char *file;
@@ -41,13 +41,13 @@ struct dx_log_entry_t {
char text[TEXT_MAX];
};
-ALLOC_DECLARE(dx_log_entry_t);
-ALLOC_DEFINE(dx_log_entry_t);
+ALLOC_DECLARE(qd_log_entry_t);
+ALLOC_DEFINE(qd_log_entry_t);
-DEQ_DECLARE(dx_log_entry_t, dx_log_list_t);
+DEQ_DECLARE(qd_log_entry_t, qd_log_list_t);
static int mask = LOG_INFO;
-static dx_log_list_t entries;
+static qd_log_list_t entries;
static sys_mutex_t *log_lock = 0;
@@ -66,12 +66,12 @@ static const char *cls_prefix(int cls)
return "";
}
-void dx_log_impl(const char *module, int cls, const char *file, int line, const char *fmt, ...)
+void qd_log_impl(const char *module, int cls, const char *file, int line, const char *fmt, ...)
{
if (!(cls & mask))
return;
- dx_log_entry_t *entry = new_dx_log_entry_t();
+ qd_log_entry_t *entry = new_qd_log_entry_t();
DEQ_ITEM_INIT(entry);
entry->module = module;
entry->cls = cls;
@@ -91,25 +91,25 @@ void dx_log_impl(const char *module, int
if (DEQ_SIZE(entries) > LIST_MAX) {
entry = DEQ_HEAD(entries);
DEQ_REMOVE_HEAD(entries);
- free_dx_log_entry_t(entry);
+ free_qd_log_entry_t(entry);
}
sys_mutex_unlock(log_lock);
}
-void dx_log_set_mask(int _mask)
+void qd_log_set_mask(int _mask)
{
mask = _mask;
}
-void dx_log_initialize(void)
+void qd_log_initialize(void)
{
DEQ_INIT(entries);
log_lock = sys_mutex();
}
-void dx_log_finalize(void)
+void qd_log_finalize(void)
{
}
Modified: qpid/dispatch/trunk/src/log_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/log_private.h?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/log_private.h (original)
+++ qpid/dispatch/trunk/src/log_private.h Tue Nov 19 19:21:30 2013
@@ -21,7 +21,7 @@
#include <qpid/dispatch/log.h>
-void dx_log_initialize(void);
-void dx_log_finalize(void);
+void qd_log_initialize(void);
+void qd_log_finalize(void);
#endif
Modified: qpid/dispatch/trunk/src/message.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/message.c?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/message.c (original)
+++ qpid/dispatch/trunk/src/message.c Tue Nov 19 19:21:30 2013
@@ -48,17 +48,17 @@ static const unsigned char * const TAGS_
static const unsigned char * const TAGS_BINARY = (unsigned char*) "\xa0\xb0";
static const unsigned char * const TAGS_ANY = (unsigned char*) "\x45\xc0\xd0\xc1\xd1\xa0\xb0";
-ALLOC_DEFINE_CONFIG(dx_message_t, sizeof(dx_message_pvt_t), 0, 0);
-ALLOC_DEFINE(dx_message_content_t);
+ALLOC_DEFINE_CONFIG(qd_message_t, sizeof(qd_message_pvt_t), 0, 0);
+ALLOC_DEFINE(qd_message_content_t);
typedef void (*buffer_process_t) (void *context, const unsigned char *base, int length);
-static void advance(unsigned char **cursor, dx_buffer_t **buffer, int consume, buffer_process_t handler, void *context)
+static void advance(unsigned char **cursor, qd_buffer_t **buffer, int consume, buffer_process_t handler, void *context)
{
unsigned char *local_cursor = *cursor;
- dx_buffer_t *local_buffer = *buffer;
+ qd_buffer_t *local_buffer = *buffer;
- int remaining = dx_buffer_size(local_buffer) - (local_cursor - dx_buffer_base(local_buffer));
+ int remaining = qd_buffer_size(local_buffer) - (local_cursor - qd_buffer_base(local_buffer));
while (consume > 0) {
if (consume < remaining) {
if (handler)
@@ -74,8 +74,8 @@ static void advance(unsigned char **curs
local_cursor = 0;
break;
}
- local_cursor = dx_buffer_base(local_buffer);
- remaining = dx_buffer_size(local_buffer) - (local_cursor - dx_buffer_base(local_buffer));
+ local_cursor = qd_buffer_base(local_buffer);
+ remaining = qd_buffer_size(local_buffer) - (local_cursor - qd_buffer_base(local_buffer));
}
}
@@ -84,7 +84,7 @@ static void advance(unsigned char **curs
}
-static unsigned char next_octet(unsigned char **cursor, dx_buffer_t **buffer)
+static unsigned char next_octet(unsigned char **cursor, qd_buffer_t **buffer)
{
unsigned char result = **cursor;
advance(cursor, buffer, 1, 0, 0);
@@ -92,9 +92,9 @@ static unsigned char next_octet(unsigned
}
-static int traverse_field(unsigned char **cursor, dx_buffer_t **buffer, dx_field_location_t *field)
+static int traverse_field(unsigned char **cursor, qd_buffer_t **buffer, qd_field_location_t *field)
{
- dx_buffer_t *start_buffer = *buffer;
+ qd_buffer_t *start_buffer = *buffer;
unsigned char *start_cursor = *cursor;
unsigned char tag = next_octet(cursor, buffer);
@@ -134,7 +134,7 @@ static int traverse_field(unsigned char
if (field && !field->parsed) {
field->buffer = start_buffer;
- field->offset = start_cursor - dx_buffer_base(start_buffer);
+ field->offset = start_cursor - qd_buffer_base(start_buffer);
field->length = consume;
field->hdr_length = hdr_length;
field->parsed = 1;
@@ -145,7 +145,7 @@ static int traverse_field(unsigned char
}
-static int start_list(unsigned char **cursor, dx_buffer_t **buffer)
+static int start_list(unsigned char **cursor, qd_buffer_t **buffer)
{
unsigned char tag = next_octet(cursor, buffer);
if (!(*cursor)) return 0;
@@ -202,20 +202,20 @@ static int start_list(unsigned char **cu
// Return 1 if the pattern matches and we've advanced the cursor/buffer
// Return 1 if the pattern does not match
//
-static int dx_check_and_advance(dx_buffer_t **buffer,
+static int qd_check_and_advance(qd_buffer_t **buffer,
unsigned char **cursor,
const unsigned char *pattern,
int pattern_length,
const unsigned char *expected_tags,
- dx_field_location_t *location)
+ qd_field_location_t *location)
{
- dx_buffer_t *test_buffer = *buffer;
+ qd_buffer_t *test_buffer = *buffer;
unsigned char *test_cursor = *cursor;
if (!test_cursor)
return 1; // no match
- unsigned char *end_of_buffer = dx_buffer_base(test_buffer) + dx_buffer_size(test_buffer);
+ unsigned char *end_of_buffer = qd_buffer_base(test_buffer) + qd_buffer_size(test_buffer);
int idx = 0;
while (idx < pattern_length && *test_cursor == pattern[idx]) {
@@ -225,8 +225,8 @@ static int dx_check_and_advance(dx_buffe
test_buffer = test_buffer->next;
if (test_buffer == 0)
return 1; // Pattern didn't match
- test_cursor = dx_buffer_base(test_buffer);
- end_of_buffer = test_cursor + dx_buffer_size(test_buffer);
+ test_cursor = qd_buffer_base(test_buffer);
+ end_of_buffer = test_cursor + qd_buffer_size(test_buffer);
}
}
@@ -249,7 +249,7 @@ static int dx_check_and_advance(dx_buffe
//
location->parsed = 1;
location->buffer = *buffer;
- location->offset = *cursor - dx_buffer_base(*buffer);
+ location->offset = *cursor - qd_buffer_base(*buffer);
location->length = 0;
location->hdr_length = pattern_length;
@@ -295,12 +295,12 @@ static int dx_check_and_advance(dx_buffe
}
-static dx_field_location_t *dx_message_field_location(dx_message_t *msg, dx_message_field_t field)
+static qd_field_location_t *qd_message_field_location(qd_message_t *msg, qd_message_field_t field)
{
- dx_message_content_t *content = MSG_CONTENT(msg);
+ qd_message_content_t *content = MSG_CONTENT(msg);
switch (field) {
- case DX_FIELD_TO:
+ case QD_FIELD_TO:
while (1) {
if (content->field_to.parsed)
return &content->field_to;
@@ -308,8 +308,8 @@ static dx_field_location_t *dx_message_f
if (content->section_message_properties.parsed == 0)
break;
- dx_buffer_t *buffer = content->section_message_properties.buffer;
- unsigned char *cursor = dx_buffer_base(buffer) + content->section_message_properties.offset;
+ qd_buffer_t *buffer = content->section_message_properties.buffer;
+ unsigned char *cursor = qd_buffer_base(buffer) + content->section_message_properties.offset;
advance(&cursor, &buffer, content->section_message_properties.hdr_length, 0, 0);
int count = start_list(&cursor, &buffer);
@@ -327,7 +327,7 @@ static dx_field_location_t *dx_message_f
}
break;
- case DX_FIELD_REPLY_TO:
+ case QD_FIELD_REPLY_TO:
while (1) {
if (content->field_reply_to.parsed)
return &content->field_reply_to;
@@ -335,8 +335,8 @@ static dx_field_location_t *dx_message_f
if (content->section_message_properties.parsed == 0)
break;
- dx_buffer_t *buffer = content->section_message_properties.buffer;
- unsigned char *cursor = dx_buffer_base(buffer) + content->section_message_properties.offset;
+ qd_buffer_t *buffer = content->section_message_properties.buffer;
+ unsigned char *cursor = qd_buffer_base(buffer) + content->section_message_properties.offset;
advance(&cursor, &buffer, content->section_message_properties.hdr_length, 0, 0);
int count = start_list(&cursor, &buffer);
@@ -358,7 +358,7 @@ static dx_field_location_t *dx_message_f
}
break;
- case DX_FIELD_CORRELATION_ID:
+ case QD_FIELD_CORRELATION_ID:
while (1) {
if (content->field_correlation_id.parsed)
return &content->field_correlation_id;
@@ -366,8 +366,8 @@ static dx_field_location_t *dx_message_f
if (content->section_message_properties.parsed == 0)
break;
- dx_buffer_t *buffer = content->section_message_properties.buffer;
- unsigned char *cursor = dx_buffer_base(buffer) + content->section_message_properties.offset;
+ qd_buffer_t *buffer = content->section_message_properties.buffer;
+ unsigned char *cursor = qd_buffer_base(buffer) + content->section_message_properties.offset;
advance(&cursor, &buffer, content->section_message_properties.hdr_length, 0, 0);
int count = start_list(&cursor, &buffer);
@@ -391,17 +391,17 @@ static dx_field_location_t *dx_message_f
}
break;
- case DX_FIELD_DELIVERY_ANNOTATION:
+ case QD_FIELD_DELIVERY_ANNOTATION:
if (content->section_delivery_annotation.parsed)
return &content->section_delivery_annotation;
break;
- case DX_FIELD_APPLICATION_PROPERTIES:
+ case QD_FIELD_APPLICATION_PROPERTIES:
if (content->section_application_properties.parsed)
return &content->section_application_properties;
break;
- case DX_FIELD_BODY:
+ case QD_FIELD_BODY:
if (content->section_body.parsed)
return &content->section_body;
break;
@@ -414,35 +414,35 @@ static dx_field_location_t *dx_message_f
}
-dx_message_t *dx_message()
+qd_message_t *qd_message()
{
- dx_message_pvt_t *msg = (dx_message_pvt_t*) new_dx_message_t();
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) new_qd_message_t();
if (!msg)
return 0;
DEQ_ITEM_INIT(msg);
- msg->content = new_dx_message_content_t();
+ msg->content = new_qd_message_content_t();
if (msg->content == 0) {
- free_dx_message_t((dx_message_t*) msg);
+ free_qd_message_t((qd_message_t*) msg);
return 0;
}
- memset(msg->content, 0, sizeof(dx_message_content_t));
+ memset(msg->content, 0, sizeof(qd_message_content_t));
msg->content->lock = sys_mutex();
msg->content->ref_count = 1;
- msg->content->parse_depth = DX_DEPTH_NONE;
+ msg->content->parse_depth = QD_DEPTH_NONE;
msg->content->parsed_delivery_annotations = 0;
- return (dx_message_t*) msg;
+ return (qd_message_t*) msg;
}
-void dx_message_free(dx_message_t *in_msg)
+void qd_message_free(qd_message_t *in_msg)
{
uint32_t rc;
- dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
- dx_message_content_t *content = msg->content;
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
+ qd_message_content_t *content = msg->content;
sys_mutex_lock(content->lock);
rc = --content->ref_count;
@@ -450,35 +450,35 @@ void dx_message_free(dx_message_t *in_ms
if (rc == 0) {
if (content->parsed_delivery_annotations)
- dx_parse_free(content->parsed_delivery_annotations);
+ qd_parse_free(content->parsed_delivery_annotations);
- dx_buffer_t *buf = DEQ_HEAD(content->buffers);
+ qd_buffer_t *buf = DEQ_HEAD(content->buffers);
while (buf) {
DEQ_REMOVE_HEAD(content->buffers);
- dx_buffer_free(buf);
+ qd_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_buffer_free(buf);
+ qd_buffer_free(buf);
buf = DEQ_HEAD(content->new_delivery_annotations);
}
sys_mutex_free(content->lock);
- free_dx_message_content_t(content);
+ free_qd_message_content_t(content);
}
- free_dx_message_t((dx_message_t*) msg);
+ free_qd_message_t((qd_message_t*) msg);
}
-dx_message_t *dx_message_copy(dx_message_t *in_msg)
+qd_message_t *qd_message_copy(qd_message_t *in_msg)
{
- dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
- dx_message_content_t *content = msg->content;
- dx_message_pvt_t *copy = (dx_message_pvt_t*) new_dx_message_t();
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
+ qd_message_content_t *content = msg->content;
+ qd_message_pvt_t *copy = (qd_message_pvt_t*) new_qd_message_t();
if (!copy)
return 0;
@@ -490,41 +490,41 @@ dx_message_t *dx_message_copy(dx_message
content->ref_count++;
sys_mutex_unlock(content->lock);
- return (dx_message_t*) copy;
+ return (qd_message_t*) copy;
}
-dx_parsed_field_t *dx_message_delivery_annotations(dx_message_t *in_msg)
+qd_parsed_field_t *qd_message_delivery_annotations(qd_message_t *in_msg)
{
- dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
- dx_message_content_t *content = msg->content;
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
+ qd_message_content_t *content = msg->content;
if (content->parsed_delivery_annotations)
return content->parsed_delivery_annotations;
- dx_field_iterator_t *da = dx_message_field_iterator(in_msg, DX_FIELD_DELIVERY_ANNOTATION);
+ qd_field_iterator_t *da = qd_message_field_iterator(in_msg, QD_FIELD_DELIVERY_ANNOTATION);
if (da == 0)
return 0;
- content->parsed_delivery_annotations = dx_parse(da);
+ content->parsed_delivery_annotations = qd_parse(da);
if (content->parsed_delivery_annotations == 0 ||
- !dx_parse_ok(content->parsed_delivery_annotations) ||
- !dx_parse_is_map(content->parsed_delivery_annotations)) {
- dx_field_iterator_free(da);
- dx_parse_free(content->parsed_delivery_annotations);
+ !qd_parse_ok(content->parsed_delivery_annotations) ||
+ !qd_parse_is_map(content->parsed_delivery_annotations)) {
+ qd_field_iterator_free(da);
+ qd_parse_free(content->parsed_delivery_annotations);
content->parsed_delivery_annotations = 0;
return 0;
}
- dx_field_iterator_free(da);
+ qd_field_iterator_free(da);
return content->parsed_delivery_annotations;
}
-void dx_message_set_delivery_annotations(dx_message_t *msg, dx_composed_field_t *da)
+void qd_message_set_delivery_annotations(qd_message_t *msg, qd_composed_field_t *da)
{
- dx_message_content_t *content = MSG_CONTENT(msg);
- dx_buffer_list_t *field_buffers = dx_compose_buffers(da);
+ qd_message_content_t *content = MSG_CONTENT(msg);
+ qd_buffer_list_t *field_buffers = qd_compose_buffers(da);
assert(DEQ_SIZE(content->new_delivery_annotations) == 0);
content->new_delivery_annotations = *field_buffers;
@@ -532,13 +532,13 @@ void dx_message_set_delivery_annotations
}
-dx_message_t *dx_message_receive(dx_delivery_t *delivery)
+qd_message_t *qd_message_receive(qd_delivery_t *delivery)
{
- pn_delivery_t *pnd = dx_delivery_pn(delivery);
- dx_message_pvt_t *msg = (dx_message_pvt_t*) dx_delivery_context(delivery);
+ pn_delivery_t *pnd = qd_delivery_pn(delivery);
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) qd_delivery_context(delivery);
pn_link_t *link = pn_delivery_link(pnd);
ssize_t rc;
- dx_buffer_t *buf;
+ qd_buffer_t *buf;
//
// If there is no message associated with the delivery, this is the first time
@@ -546,8 +546,8 @@ dx_message_t *dx_message_receive(dx_deli
// link it and the delivery together.
//
if (!msg) {
- msg = (dx_message_pvt_t*) dx_message();
- dx_delivery_set_context(delivery, (void*) msg);
+ msg = (qd_message_pvt_t*) qd_message();
+ qd_delivery_set_context(delivery, (void*) msg);
}
//
@@ -557,7 +557,7 @@ dx_message_t *dx_message_receive(dx_deli
//
buf = DEQ_TAIL(msg->content->buffers);
if (!buf) {
- buf = dx_buffer();
+ buf = qd_buffer();
DEQ_INSERT_TAIL(msg->content->buffers, buf);
}
@@ -565,7 +565,7 @@ dx_message_t *dx_message_receive(dx_deli
//
// Try to receive enough data to fill the remaining space in the tail buffer.
//
- rc = pn_link_recv(link, (char*) dx_buffer_cursor(buf), dx_buffer_capacity(buf));
+ rc = pn_link_recv(link, (char*) qd_buffer_cursor(buf), qd_buffer_capacity(buf));
//
// If we receive PN_EOS, we have come to the end of the message.
@@ -576,12 +576,12 @@ dx_message_t *dx_message_receive(dx_deli
// will only happen if the size of the message content is an exact multiple
// of the buffer size.
//
- if (dx_buffer_size(buf) == 0) {
+ if (qd_buffer_size(buf) == 0) {
DEQ_REMOVE_TAIL(msg->content->buffers);
- dx_buffer_free(buf);
+ qd_buffer_free(buf);
}
- dx_delivery_set_context(delivery, 0);
- return (dx_message_t*) msg;
+ qd_delivery_set_context(delivery, 0);
+ return (qd_message_t*) msg;
}
if (rc > 0) {
@@ -589,14 +589,14 @@ dx_message_t *dx_message_receive(dx_deli
// We have received a positive number of bytes for the message. Advance
// the cursor in the buffer.
//
- dx_buffer_insert(buf, rc);
+ qd_buffer_insert(buf, rc);
//
// If the buffer is full, allocate a new empty buffer and append it to the
// tail of the message's list.
//
- if (dx_buffer_capacity(buf) == 0) {
- buf = dx_buffer();
+ if (qd_buffer_capacity(buf) == 0) {
+ buf = qd_buffer();
DEQ_INSERT_TAIL(msg->content->buffers, buf);
}
} else
@@ -619,13 +619,13 @@ static void send_handler(void *context,
}
-void dx_message_send(dx_message_t *in_msg, dx_link_t *link)
+void qd_message_send(qd_message_t *in_msg, qd_link_t *link)
{
- dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
- dx_message_content_t *content = msg->content;
- dx_buffer_t *buf = DEQ_HEAD(content->buffers);
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
+ qd_message_content_t *content = msg->content;
+ qd_buffer_t *buf = DEQ_HEAD(content->buffers);
unsigned char *cursor;
- pn_link_t *pnl = dx_link_pn(link);
+ pn_link_t *pnl = qd_link_pn(link);
if (DEQ_SIZE(content->new_delivery_annotations) > 0) {
//
@@ -638,16 +638,16 @@ void dx_message_send(dx_message_t *in_ms
// Start by making sure that we've parsed the message sections through
// the delivery annotations
//
- if (!dx_message_check(in_msg, DX_DEPTH_DELIVERY_ANNOTATIONS))
+ if (!qd_message_check(in_msg, QD_DEPTH_DELIVERY_ANNOTATIONS))
return;
//
// Send header if present
//
- cursor = dx_buffer_base(buf);
+ cursor = qd_buffer_base(buf);
if (content->section_message_header.length > 0) {
buf = content->section_message_header.buffer;
- cursor = content->section_message_header.offset + dx_buffer_base(buf);
+ cursor = content->section_message_header.offset + qd_buffer_base(buf);
advance(&cursor, &buf,
content->section_message_header.length + content->section_message_header.hdr_length,
send_handler, (void*) pnl);
@@ -656,9 +656,9 @@ void dx_message_send(dx_message_t *in_ms
//
// Send new delivery annotations
//
- dx_buffer_t *da_buf = DEQ_HEAD(content->new_delivery_annotations);
+ qd_buffer_t *da_buf = DEQ_HEAD(content->new_delivery_annotations);
while (da_buf) {
- pn_link_send(pnl, (char*) dx_buffer_base(da_buf), dx_buffer_size(da_buf));
+ pn_link_send(pnl, (char*) qd_buffer_base(da_buf), qd_buffer_size(da_buf));
da_buf = DEQ_NEXT(da_buf);
}
@@ -674,7 +674,7 @@ void dx_message_send(dx_message_t *in_ms
// Send remaining partial buffer
//
if (buf) {
- size_t len = dx_buffer_size(buf) - (cursor - dx_buffer_base(buf));
+ size_t len = qd_buffer_size(buf) - (cursor - qd_buffer_base(buf));
advance(&cursor, &buf, len, send_handler, (void*) pnl);
}
@@ -682,26 +682,26 @@ void dx_message_send(dx_message_t *in_ms
}
while (buf) {
- pn_link_send(pnl, (char*) dx_buffer_base(buf), dx_buffer_size(buf));
+ pn_link_send(pnl, (char*) qd_buffer_base(buf), qd_buffer_size(buf));
buf = DEQ_NEXT(buf);
}
}
-static int dx_check_field_LH(dx_message_content_t *content,
- dx_message_depth_t depth,
+static int qd_check_field_LH(qd_message_content_t *content,
+ qd_message_depth_t depth,
const unsigned char *long_pattern,
const unsigned char *short_pattern,
const unsigned char *expected_tags,
- dx_field_location_t *location,
+ qd_field_location_t *location,
int more)
{
#define LONG 10
#define SHORT 3
if (depth > content->parse_depth) {
- if (0 == dx_check_and_advance(&content->parse_buffer, &content->parse_cursor, long_pattern, LONG, expected_tags, location))
+ if (0 == qd_check_and_advance(&content->parse_buffer, &content->parse_cursor, long_pattern, LONG, expected_tags, location))
return 0;
- if (0 == dx_check_and_advance(&content->parse_buffer, &content->parse_cursor, short_pattern, SHORT, expected_tags, location))
+ if (0 == qd_check_and_advance(&content->parse_buffer, &content->parse_cursor, short_pattern, SHORT, expected_tags, location))
return 0;
if (!more)
content->parse_depth = depth;
@@ -710,9 +710,9 @@ static int dx_check_field_LH(dx_message_
}
-static int dx_message_check_LH(dx_message_content_t *content, dx_message_depth_t depth)
+static int qd_message_check_LH(qd_message_content_t *content, qd_message_depth_t depth)
{
- dx_buffer_t *buffer = DEQ_HEAD(content->buffers);
+ qd_buffer_t *buffer = DEQ_HEAD(content->buffers);
if (!buffer)
return 0; // Invalid - No data in the message
@@ -722,55 +722,55 @@ static int dx_message_check_LH(dx_messag
if (content->parse_buffer == 0) {
content->parse_buffer = buffer;
- content->parse_cursor = dx_buffer_base(content->parse_buffer);
+ content->parse_cursor = qd_buffer_base(content->parse_buffer);
}
- if (depth == DX_DEPTH_NONE)
+ if (depth == QD_DEPTH_NONE)
return 1;
//
// MESSAGE HEADER
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_HEADER,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_HEADER,
MSG_HDR_LONG, MSG_HDR_SHORT, TAGS_LIST, &content->section_message_header, 0))
return 0;
- if (depth == DX_DEPTH_HEADER)
+ if (depth == QD_DEPTH_HEADER)
return 1;
//
// DELIVERY ANNOTATION
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_DELIVERY_ANNOTATIONS,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_DELIVERY_ANNOTATIONS,
DELIVERY_ANNOTATION_LONG, DELIVERY_ANNOTATION_SHORT, TAGS_MAP, &content->section_delivery_annotation, 0))
return 0;
- if (depth == DX_DEPTH_DELIVERY_ANNOTATIONS)
+ if (depth == QD_DEPTH_DELIVERY_ANNOTATIONS)
return 1;
//
// MESSAGE ANNOTATION
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_MESSAGE_ANNOTATIONS,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_MESSAGE_ANNOTATIONS,
MESSAGE_ANNOTATION_LONG, MESSAGE_ANNOTATION_SHORT, TAGS_MAP, &content->section_message_annotation, 0))
return 0;
- if (depth == DX_DEPTH_MESSAGE_ANNOTATIONS)
+ if (depth == QD_DEPTH_MESSAGE_ANNOTATIONS)
return 1;
//
// PROPERTIES
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_PROPERTIES,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_PROPERTIES,
PROPERTIES_LONG, PROPERTIES_SHORT, TAGS_LIST, &content->section_message_properties, 0))
return 0;
- if (depth == DX_DEPTH_PROPERTIES)
+ if (depth == QD_DEPTH_PROPERTIES)
return 1;
//
// APPLICATION PROPERTIES
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_APPLICATION_PROPERTIES,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_APPLICATION_PROPERTIES,
APPLICATION_PROPERTIES_LONG, APPLICATION_PROPERTIES_SHORT, TAGS_MAP, &content->section_application_properties, 0))
return 0;
- if (depth == DX_DEPTH_APPLICATION_PROPERTIES)
+ if (depth == QD_DEPTH_APPLICATION_PROPERTIES)
return 1;
//
@@ -779,22 +779,22 @@ static int dx_message_check_LH(dx_messag
// not a problem for messages passing through Dispatch because through-only messages won't
// be parsed to BODY-depth.
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_BODY,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_BODY,
BODY_DATA_LONG, BODY_DATA_SHORT, TAGS_BINARY, &content->section_body, 1))
return 0;
- if (0 == dx_check_field_LH(content, DX_DEPTH_BODY,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_BODY,
BODY_SEQUENCE_LONG, BODY_SEQUENCE_SHORT, TAGS_LIST, &content->section_body, 1))
return 0;
- if (0 == dx_check_field_LH(content, DX_DEPTH_BODY,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_BODY,
BODY_VALUE_LONG, BODY_VALUE_SHORT, TAGS_ANY, &content->section_body, 0))
return 0;
- if (depth == DX_DEPTH_BODY)
+ if (depth == QD_DEPTH_BODY)
return 1;
//
// FOOTER
//
- if (0 == dx_check_field_LH(content, DX_DEPTH_ALL,
+ if (0 == qd_check_field_LH(content, QD_DEPTH_ALL,
FOOTER_LONG, FOOTER_SHORT, TAGS_MAP, &content->section_footer, 0))
return 0;
@@ -802,47 +802,47 @@ static int dx_message_check_LH(dx_messag
}
-int dx_message_check(dx_message_t *in_msg, dx_message_depth_t depth)
+int qd_message_check(qd_message_t *in_msg, qd_message_depth_t depth)
{
- dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg;
- dx_message_content_t *content = msg->content;
+ qd_message_pvt_t *msg = (qd_message_pvt_t*) in_msg;
+ qd_message_content_t *content = msg->content;
int result;
sys_mutex_lock(content->lock);
- result = dx_message_check_LH(content, depth);
+ result = qd_message_check_LH(content, depth);
sys_mutex_unlock(content->lock);
return result;
}
-dx_field_iterator_t *dx_message_field_iterator_typed(dx_message_t *msg, dx_message_field_t field)
+qd_field_iterator_t *qd_message_field_iterator_typed(qd_message_t *msg, qd_message_field_t field)
{
- dx_field_location_t *loc = dx_message_field_location(msg, field);
+ qd_field_location_t *loc = qd_message_field_location(msg, field);
if (!loc)
return 0;
- return dx_field_iterator_buffer(loc->buffer, loc->offset, loc->length + loc->hdr_length, ITER_VIEW_ALL);
+ return qd_field_iterator_buffer(loc->buffer, loc->offset, loc->length + loc->hdr_length, ITER_VIEW_ALL);
}
-dx_field_iterator_t *dx_message_field_iterator(dx_message_t *msg, dx_message_field_t field)
+qd_field_iterator_t *qd_message_field_iterator(qd_message_t *msg, qd_message_field_t field)
{
- dx_field_location_t *loc = dx_message_field_location(msg, field);
+ qd_field_location_t *loc = qd_message_field_location(msg, field);
if (!loc)
return 0;
- dx_buffer_t *buffer = loc->buffer;
- unsigned char *cursor = dx_buffer_base(loc->buffer) + loc->offset;
+ qd_buffer_t *buffer = loc->buffer;
+ unsigned char *cursor = qd_buffer_base(loc->buffer) + loc->offset;
advance(&cursor, &buffer, loc->hdr_length, 0, 0);
- return dx_field_iterator_buffer(buffer, cursor - dx_buffer_base(buffer), loc->length, ITER_VIEW_ALL);
+ return qd_field_iterator_buffer(buffer, cursor - qd_buffer_base(buffer), loc->length, ITER_VIEW_ALL);
}
-ssize_t dx_message_field_length(dx_message_t *msg, dx_message_field_t field)
+ssize_t qd_message_field_length(qd_message_t *msg, qd_message_field_t field)
{
- dx_field_location_t *loc = dx_message_field_location(msg, field);
+ qd_field_location_t *loc = qd_message_field_location(msg, field);
if (!loc)
return -1;
@@ -850,15 +850,15 @@ ssize_t dx_message_field_length(dx_messa
}
-ssize_t dx_message_field_copy(dx_message_t *msg, dx_message_field_t field, void *buffer, size_t *hdr_length)
+ssize_t qd_message_field_copy(qd_message_t *msg, qd_message_field_t field, void *buffer, size_t *hdr_length)
{
- dx_field_location_t *loc = dx_message_field_location(msg, field);
+ qd_field_location_t *loc = qd_message_field_location(msg, field);
if (!loc)
return -1;
- dx_buffer_t *buf = loc->buffer;
- size_t bufsize = dx_buffer_size(buf) - loc->offset;
- void *base = dx_buffer_base(buf) + loc->offset;
+ qd_buffer_t *buf = loc->buffer;
+ size_t bufsize = qd_buffer_size(buf) - loc->offset;
+ void *base = qd_buffer_base(buf) + loc->offset;
size_t remaining = loc->length + loc->hdr_length;
*hdr_length = loc->hdr_length;
@@ -870,8 +870,8 @@ ssize_t dx_message_field_copy(dx_message
remaining -= bufsize;
if (remaining > 0) {
buf = buf->next;
- base = dx_buffer_base(buf);
- bufsize = dx_buffer_size(buf);
+ base = qd_buffer_base(buf);
+ bufsize = qd_buffer_size(buf);
}
}
@@ -879,53 +879,53 @@ ssize_t dx_message_field_copy(dx_message
}
-void dx_message_compose_1(dx_message_t *msg, const char *to, dx_buffer_list_t *buffers)
+void qd_message_compose_1(qd_message_t *msg, const char *to, qd_buffer_list_t *buffers)
{
- dx_composed_field_t *field = dx_compose(DX_PERFORMATIVE_HEADER, 0);
- dx_message_content_t *content = MSG_CONTENT(msg);
+ qd_composed_field_t *field = qd_compose(QD_PERFORMATIVE_HEADER, 0);
+ qd_message_content_t *content = MSG_CONTENT(msg);
- dx_compose_start_list(field);
- dx_compose_insert_bool(field, 0); // durable
- //dx_compose_insert_null(field); // priority
- //dx_compose_insert_null(field); // ttl
- //dx_compose_insert_boolean(field, 0); // first-acquirer
- //dx_compose_insert_uint(field, 0); // delivery-count
- dx_compose_end_list(field);
-
- field = dx_compose(DX_PERFORMATIVE_PROPERTIES, field);
- dx_compose_start_list(field);
- dx_compose_insert_null(field); // message-id
- dx_compose_insert_null(field); // user-id
- dx_compose_insert_string(field, to); // to
- //dx_compose_insert_null(field); // subject
- //dx_compose_insert_null(field); // reply-to
- //dx_compose_insert_null(field); // correlation-id
- //dx_compose_insert_null(field); // content-type
- //dx_compose_insert_null(field); // content-encoding
- //dx_compose_insert_timestamp(field, 0); // absolute-expiry-time
- //dx_compose_insert_timestamp(field, 0); // creation-time
- //dx_compose_insert_null(field); // group-id
- //dx_compose_insert_uint(field, 0); // group-sequence
- //dx_compose_insert_null(field); // reply-to-group-id
- dx_compose_end_list(field);
+ qd_compose_start_list(field);
+ qd_compose_insert_bool(field, 0); // durable
+ //qd_compose_insert_null(field); // priority
+ //qd_compose_insert_null(field); // ttl
+ //qd_compose_insert_boolean(field, 0); // first-acquirer
+ //qd_compose_insert_uint(field, 0); // delivery-count
+ qd_compose_end_list(field);
+
+ field = qd_compose(QD_PERFORMATIVE_PROPERTIES, field);
+ qd_compose_start_list(field);
+ qd_compose_insert_null(field); // message-id
+ qd_compose_insert_null(field); // user-id
+ qd_compose_insert_string(field, to); // to
+ //qd_compose_insert_null(field); // subject
+ //qd_compose_insert_null(field); // reply-to
+ //qd_compose_insert_null(field); // correlation-id
+ //qd_compose_insert_null(field); // content-type
+ //qd_compose_insert_null(field); // content-encoding
+ //qd_compose_insert_timestamp(field, 0); // absolute-expiry-time
+ //qd_compose_insert_timestamp(field, 0); // creation-time
+ //qd_compose_insert_null(field); // group-id
+ //qd_compose_insert_uint(field, 0); // group-sequence
+ //qd_compose_insert_null(field); // reply-to-group-id
+ qd_compose_end_list(field);
if (buffers) {
- field = dx_compose(DX_PERFORMATIVE_BODY_DATA, field);
- dx_compose_insert_binary_buffers(field, buffers);
+ field = qd_compose(QD_PERFORMATIVE_BODY_DATA, field);
+ qd_compose_insert_binary_buffers(field, buffers);
}
- dx_buffer_list_t *field_buffers = dx_compose_buffers(field);
+ qd_buffer_list_t *field_buffers = qd_compose_buffers(field);
content->buffers = *field_buffers;
DEQ_INIT(*field_buffers); // Zero out the linkage to the now moved buffers.
- dx_compose_free(field);
+ qd_compose_free(field);
}
-void dx_message_compose_2(dx_message_t *msg, dx_composed_field_t *field)
+void qd_message_compose_2(qd_message_t *msg, qd_composed_field_t *field)
{
- dx_message_content_t *content = MSG_CONTENT(msg);
- dx_buffer_list_t *field_buffers = dx_compose_buffers(field);
+ qd_message_content_t *content = MSG_CONTENT(msg);
+ qd_buffer_list_t *field_buffers = qd_compose_buffers(field);
content->buffers = *field_buffers;
DEQ_INIT(*field_buffers); // Zero out the linkage to the now moved buffers.
Modified: qpid/dispatch/trunk/src/message_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/message_private.h?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/message_private.h (original)
+++ qpid/dispatch/trunk/src/message_private.h Tue Nov 19 19:21:30 2013
@@ -28,13 +28,13 @@
*
* +--------------+ +----------------------+
* | | | |
- * | dx_message_t |----------->| dx_message_content_t |
+ * | qd_message_t |----------->| qd_message_content_t |
* | | +----->| |
* +--------------+ | +----------------------+
* | |
* +--------------+ | | +-------------+ +-------------+ +-------------+
- * | | | +--->| dx_buffer_t |-->| dx_buffer_t |-->| dx_buffer_t |--/
- * | dx_message_t |-----+ +-------------+ +-------------+ +-------------+
+ * | | | +--->| qd_buffer_t |-->| qd_buffer_t |-->| qd_buffer_t |--/
+ * | qd_message_t |-----+ +-------------+ +-------------+ +-------------+
* | |
* +--------------+
*
@@ -45,15 +45,15 @@
*/
typedef struct {
- dx_buffer_t *buffer; // Buffer that contains the first octet of the field, null if the field is not present
+ qd_buffer_t *buffer; // Buffer that contains the first octet of the field, null if the field is not present
size_t offset; // Offset in the buffer to the first octet of the header
size_t length; // Length of the field or zero if unneeded
size_t hdr_length; // Length of the field's header (not included in the length of the field)
int parsed; // non-zero iff the buffer chain has been parsed to find this field
-} dx_field_location_t;
+} qd_field_location_t;
-// TODO - consider using pointers to dx_field_location_t below to save memory
+// TODO - consider using pointers to qd_field_location_t below to save memory
// TODO - we need a second buffer list for modified annotations and header
// There are three message scenarios:
// 1) Received message is held and forwarded unmodified - single buffer list
@@ -66,34 +66,34 @@ typedef struct {
typedef struct {
sys_mutex_t *lock;
uint32_t ref_count; // The number of messages referencing this
- dx_buffer_list_t buffers; // The buffer chain containing the message
- dx_buffer_list_t new_delivery_annotations; // The buffer chain containing the new delivery annotations (MOVE TO MSG_PVT)
- dx_field_location_t section_message_header; // The message header list
- dx_field_location_t section_delivery_annotation; // The delivery annotation map
- dx_field_location_t section_message_annotation; // The message annotation map
- dx_field_location_t section_message_properties; // The message properties list
- dx_field_location_t section_application_properties; // The application properties list
- dx_field_location_t section_body; // The message body: Data
- dx_field_location_t section_footer; // The footer
- dx_field_location_t field_user_id; // The string value of the user-id
- dx_field_location_t field_to; // The string value of the to field
- dx_field_location_t field_reply_to; // The string value of the reply_to field
- dx_field_location_t field_correlation_id; // The string value of the correlation_id field
- dx_field_location_t body; // The body of the message
- dx_buffer_t *parse_buffer;
+ qd_buffer_list_t buffers; // The buffer chain containing the message
+ qd_buffer_list_t new_delivery_annotations; // The buffer chain containing the new delivery annotations (MOVE TO MSG_PVT)
+ qd_field_location_t section_message_header; // The message header list
+ qd_field_location_t section_delivery_annotation; // The delivery annotation map
+ qd_field_location_t section_message_annotation; // The message annotation map
+ qd_field_location_t section_message_properties; // The message properties list
+ qd_field_location_t section_application_properties; // The application properties list
+ qd_field_location_t section_body; // The message body: Data
+ qd_field_location_t section_footer; // The footer
+ qd_field_location_t field_user_id; // The string value of the user-id
+ qd_field_location_t field_to; // The string value of the to field
+ qd_field_location_t field_reply_to; // The string value of the reply_to field
+ qd_field_location_t field_correlation_id; // The string value of the correlation_id field
+ qd_field_location_t body; // The body of the message
+ qd_buffer_t *parse_buffer;
unsigned char *parse_cursor;
- dx_message_depth_t parse_depth;
- dx_parsed_field_t *parsed_delivery_annotations;
-} dx_message_content_t;
+ qd_message_depth_t parse_depth;
+ qd_parsed_field_t *parsed_delivery_annotations;
+} qd_message_content_t;
typedef struct {
- DEQ_LINKS(dx_message_t); // Deque linkage that overlays the dx_message_t
- dx_message_content_t *content;
-} dx_message_pvt_t;
+ DEQ_LINKS(qd_message_t); // Deque linkage that overlays the qd_message_t
+ qd_message_content_t *content;
+} qd_message_pvt_t;
-ALLOC_DECLARE(dx_message_t);
-ALLOC_DECLARE(dx_message_content_t);
+ALLOC_DECLARE(qd_message_t);
+ALLOC_DECLARE(qd_message_content_t);
-#define MSG_CONTENT(m) (((dx_message_pvt_t*) m)->content)
+#define MSG_CONTENT(m) (((qd_message_pvt_t*) m)->content)
#endif
Modified: qpid/dispatch/trunk/src/parse.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/parse.c?rev=1543534&r1=1543533&r2=1543534&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/parse.c (original)
+++ qpid/dispatch/trunk/src/parse.c Tue Nov 19 19:21:30 2013
@@ -22,26 +22,26 @@
#include <qpid/dispatch/parse.h>
#include <qpid/dispatch/amqp.h>
-DEQ_DECLARE(dx_parsed_field_t, dx_parsed_field_list_t);
+DEQ_DECLARE(qd_parsed_field_t, qd_parsed_field_list_t);
-struct dx_parsed_field_t {
- DEQ_LINKS(dx_parsed_field_t);
- dx_parsed_field_t *parent;
- dx_parsed_field_list_t children;
+struct qd_parsed_field_t {
+ DEQ_LINKS(qd_parsed_field_t);
+ qd_parsed_field_t *parent;
+ qd_parsed_field_list_t children;
uint8_t tag;
- dx_field_iterator_t *raw_iter;
+ qd_field_iterator_t *raw_iter;
const char *parse_error;
};
-ALLOC_DECLARE(dx_parsed_field_t);
-ALLOC_DEFINE(dx_parsed_field_t);
+ALLOC_DECLARE(qd_parsed_field_t);
+ALLOC_DEFINE(qd_parsed_field_t);
-static char *get_type_info(dx_field_iterator_t *iter, uint8_t *tag, uint32_t *length, uint32_t *count, uint32_t *clen)
+static char *get_type_info(qd_field_iterator_t *iter, uint8_t *tag, uint32_t *length, uint32_t *count, uint32_t *clen)
{
- if (dx_field_iterator_end(iter))
+ if (qd_field_iterator_end(iter))
return "Insufficient Data to Determine Tag";
- *tag = dx_field_iterator_octet(iter);
+ *tag = qd_field_iterator_octet(iter);
*count = 0;
*length = 0;
*clen = 0;
@@ -56,17 +56,17 @@ static char *get_type_info(dx_field_iter
case 0xB0:
case 0xD0:
case 0xF0:
- *length += ((unsigned int) dx_field_iterator_octet(iter)) << 24;
- *length += ((unsigned int) dx_field_iterator_octet(iter)) << 16;
- *length += ((unsigned int) dx_field_iterator_octet(iter)) << 8;
+ *length += ((unsigned int) qd_field_iterator_octet(iter)) << 24;
+ *length += ((unsigned int) qd_field_iterator_octet(iter)) << 16;
+ *length += ((unsigned int) qd_field_iterator_octet(iter)) << 8;
// fall through to the next case
case 0xA0:
case 0xC0:
case 0xE0:
- if (dx_field_iterator_end(iter))
+ if (qd_field_iterator_end(iter))
return "Insufficient Data to Determine Length";
- *length += (unsigned int) dx_field_iterator_octet(iter);
+ *length += (unsigned int) qd_field_iterator_octet(iter);
break;
default:
@@ -76,22 +76,22 @@ static char *get_type_info(dx_field_iter
switch (*tag & 0xF0) {
case 0xD0:
case 0xF0:
- *count += ((unsigned int) dx_field_iterator_octet(iter)) << 24;
- *count += ((unsigned int) dx_field_iterator_octet(iter)) << 16;
- *count += ((unsigned int) dx_field_iterator_octet(iter)) << 8;
+ *count += ((unsigned int) qd_field_iterator_octet(iter)) << 24;
+ *count += ((unsigned int) qd_field_iterator_octet(iter)) << 16;
+ *count += ((unsigned int) qd_field_iterator_octet(iter)) << 8;
*clen = 3;
// fall through to the next case
case 0xC0:
case 0xE0:
- if (dx_field_iterator_end(iter))
+ if (qd_field_iterator_end(iter))
return "Insufficient Data to Determine Count";
- *count += (unsigned int) dx_field_iterator_octet(iter);
+ *count += (unsigned int) qd_field_iterator_octet(iter);
*clen += 1;
break;
}
- if ((*tag == DX_AMQP_MAP8 || *tag == DX_AMQP_MAP32) && (*count & 1))
+ if ((*tag == QD_AMQP_MAP8 || *tag == QD_AMQP_MAP32) && (*count & 1))
return "Odd Number of Elements in a Map";
if (*clen > *length)
@@ -101,9 +101,9 @@ static char *get_type_info(dx_field_iter
}
-static dx_parsed_field_t *dx_parse_internal(dx_field_iterator_t *iter, dx_parsed_field_t *p)
+static qd_parsed_field_t *qd_parse_internal(qd_field_iterator_t *iter, qd_parsed_field_t *p)
{
- dx_parsed_field_t *field = new_dx_parsed_field_t();
+ qd_parsed_field_t *field = new_qd_parsed_field_t();
if (!field)
return 0;
@@ -119,12 +119,12 @@ static dx_parsed_field_t *dx_parse_inter
field->parse_error = get_type_info(iter, &field->tag, &length, &count, &length_of_count);
if (!field->parse_error) {
- field->raw_iter = dx_field_iterator_sub(iter, length);
- dx_field_iterator_advance(iter, length - length_of_count);
+ field->raw_iter = qd_field_iterator_sub(iter, length);
+ qd_field_iterator_advance(iter, length - length_of_count);
for (uint32_t idx = 0; idx < count; idx++) {
- dx_parsed_field_t *child = dx_parse_internal(field->raw_iter, field);
+ qd_parsed_field_t *child = qd_parse_internal(field->raw_iter, field);
DEQ_INSERT_TAIL(field->children, child);
- if (!dx_parse_ok(child)) {
+ if (!qd_parse_ok(child)) {
field->parse_error = child->parse_error;
break;
}
@@ -135,80 +135,80 @@ static dx_parsed_field_t *dx_parse_inter
}
-dx_parsed_field_t *dx_parse(dx_field_iterator_t *iter)
+qd_parsed_field_t *qd_parse(qd_field_iterator_t *iter)
{
- return dx_parse_internal(iter, 0);
+ return qd_parse_internal(iter, 0);
}
-void dx_parse_free(dx_parsed_field_t *field)
+void qd_parse_free(qd_parsed_field_t *field)
{
if (!field)
return;
assert(field->parent == 0);
if (field->raw_iter)
- dx_field_iterator_free(field->raw_iter);
+ qd_field_iterator_free(field->raw_iter);
- dx_parsed_field_t *sub_field = DEQ_HEAD(field->children);
+ qd_parsed_field_t *sub_field = DEQ_HEAD(field->children);
while (sub_field) {
- dx_parsed_field_t *next = DEQ_NEXT(sub_field);
+ qd_parsed_field_t *next = DEQ_NEXT(sub_field);
DEQ_REMOVE_HEAD(field->children);
sub_field->parent = 0;
- dx_parse_free(sub_field);
+ qd_parse_free(sub_field);
sub_field = next;
}
- free_dx_parsed_field_t(field);
+ free_qd_parsed_field_t(field);
}
-int dx_parse_ok(dx_parsed_field_t *field)
+int qd_parse_ok(qd_parsed_field_t *field)
{
return field->parse_error == 0;
}
-const char *dx_parse_error(dx_parsed_field_t *field)
+const char *qd_parse_error(qd_parsed_field_t *field)
{
return field->parse_error;
}
-uint8_t dx_parse_tag(dx_parsed_field_t *field)
+uint8_t qd_parse_tag(qd_parsed_field_t *field)
{
return field->tag;
}
-dx_field_iterator_t *dx_parse_raw(dx_parsed_field_t *field)
+qd_field_iterator_t *qd_parse_raw(qd_parsed_field_t *field)
{
return field->raw_iter;
}
-uint32_t dx_parse_as_uint(dx_parsed_field_t *field)
+uint32_t qd_parse_as_uint(qd_parsed_field_t *field)
{
uint32_t result = 0;
- dx_field_iterator_reset(field->raw_iter);
+ qd_field_iterator_reset(field->raw_iter);
switch (field->tag) {
- case DX_AMQP_UINT:
- result |= ((uint32_t) dx_field_iterator_octet(field->raw_iter)) << 24;
- result |= ((uint32_t) dx_field_iterator_octet(field->raw_iter)) << 16;
+ case QD_AMQP_UINT:
+ result |= ((uint32_t) qd_field_iterator_octet(field->raw_iter)) << 24;
+ result |= ((uint32_t) qd_field_iterator_octet(field->raw_iter)) << 16;
- case DX_AMQP_USHORT:
- result |= ((uint32_t) dx_field_iterator_octet(field->raw_iter)) << 8;
+ case QD_AMQP_USHORT:
+ result |= ((uint32_t) qd_field_iterator_octet(field->raw_iter)) << 8;
// Fall Through...
- case DX_AMQP_UBYTE:
- case DX_AMQP_SMALLUINT:
- case DX_AMQP_BOOLEAN:
- result |= (uint32_t) dx_field_iterator_octet(field->raw_iter);
+ case QD_AMQP_UBYTE:
+ case QD_AMQP_SMALLUINT:
+ case QD_AMQP_BOOLEAN:
+ result |= (uint32_t) qd_field_iterator_octet(field->raw_iter);
break;
- case DX_AMQP_TRUE:
+ case QD_AMQP_TRUE:
result = 1;
break;
}
@@ -217,29 +217,29 @@ uint32_t dx_parse_as_uint(dx_parsed_fiel
}
-uint64_t dx_parse_as_ulong(dx_parsed_field_t *field)
+uint64_t qd_parse_as_ulong(qd_parsed_field_t *field)
{
uint64_t result = 0;
- dx_field_iterator_reset(field->raw_iter);
+ qd_field_iterator_reset(field->raw_iter);
switch (field->tag) {
- case DX_AMQP_ULONG:
- case DX_AMQP_TIMESTAMP:
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 56;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 48;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 40;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 32;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 24;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 16;
- result |= ((uint64_t) dx_field_iterator_octet(field->raw_iter)) << 8;
+ case QD_AMQP_ULONG:
+ case QD_AMQP_TIMESTAMP:
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 56;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 48;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 40;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 32;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 24;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 16;
+ result |= ((uint64_t) qd_field_iterator_octet(field->raw_iter)) << 8;
// Fall Through...
- case DX_AMQP_SMALLULONG:
- result |= (uint64_t) dx_field_iterator_octet(field->raw_iter);
+ case QD_AMQP_SMALLULONG:
+ result |= (uint64_t) qd_field_iterator_octet(field->raw_iter);
// Fall Through...
- case DX_AMQP_ULONG0:
+ case QD_AMQP_ULONG0:
break;
}
@@ -247,28 +247,28 @@ uint64_t dx_parse_as_ulong(dx_parsed_fie
}
-int32_t dx_parse_as_int(dx_parsed_field_t *field)
+int32_t qd_parse_as_int(qd_parsed_field_t *field)
{
int32_t result = 0;
- dx_field_iterator_reset(field->raw_iter);
+ qd_field_iterator_reset(field->raw_iter);
switch (field->tag) {
- case DX_AMQP_INT:
- result |= ((int32_t) dx_field_iterator_octet(field->raw_iter)) << 24;
- result |= ((int32_t) dx_field_iterator_octet(field->raw_iter)) << 16;
+ case QD_AMQP_INT:
+ result |= ((int32_t) qd_field_iterator_octet(field->raw_iter)) << 24;
+ result |= ((int32_t) qd_field_iterator_octet(field->raw_iter)) << 16;
- case DX_AMQP_SHORT:
- result |= ((int32_t) dx_field_iterator_octet(field->raw_iter)) << 8;
+ case QD_AMQP_SHORT:
+ result |= ((int32_t) qd_field_iterator_octet(field->raw_iter)) << 8;
// Fall Through...
- case DX_AMQP_BYTE:
- case DX_AMQP_SMALLINT:
- case DX_AMQP_BOOLEAN:
- result |= (int32_t) dx_field_iterator_octet(field->raw_iter);
+ case QD_AMQP_BYTE:
+ case QD_AMQP_SMALLINT:
+ case QD_AMQP_BOOLEAN:
+ result |= (int32_t) qd_field_iterator_octet(field->raw_iter);
break;
- case DX_AMQP_TRUE:
+ case QD_AMQP_TRUE:
result = 1;
break;
}
@@ -277,25 +277,25 @@ int32_t dx_parse_as_int(dx_parsed_field_
}
-int64_t dx_parse_as_long(dx_parsed_field_t *field)
+int64_t qd_parse_as_long(qd_parsed_field_t *field)
{
int64_t result = 0;
- dx_field_iterator_reset(field->raw_iter);
+ qd_field_iterator_reset(field->raw_iter);
switch (field->tag) {
- case DX_AMQP_LONG:
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 56;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 48;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 40;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 32;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 24;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 16;
- result |= ((int64_t) dx_field_iterator_octet(field->raw_iter)) << 8;
+ case QD_AMQP_LONG:
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 56;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 48;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 40;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 32;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 24;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 16;
+ result |= ((int64_t) qd_field_iterator_octet(field->raw_iter)) << 8;
// Fall Through...
- case DX_AMQP_SMALLLONG:
- result |= (uint64_t) dx_field_iterator_octet(field->raw_iter);
+ case QD_AMQP_SMALLLONG:
+ result |= (uint64_t) qd_field_iterator_octet(field->raw_iter);
break;
}
@@ -303,24 +303,24 @@ int64_t dx_parse_as_long(dx_parsed_field
}
-uint32_t dx_parse_sub_count(dx_parsed_field_t *field)
+uint32_t qd_parse_sub_count(qd_parsed_field_t *field)
{
uint32_t count = DEQ_SIZE(field->children);
- if (field->tag == DX_AMQP_MAP8 || field->tag == DX_AMQP_MAP32)
+ if (field->tag == QD_AMQP_MAP8 || field->tag == QD_AMQP_MAP32)
count = count >> 1;
return count;
}
-dx_parsed_field_t *dx_parse_sub_key(dx_parsed_field_t *field, uint32_t idx)
+qd_parsed_field_t *qd_parse_sub_key(qd_parsed_field_t *field, uint32_t idx)
{
- if (field->tag != DX_AMQP_MAP8 && field->tag != DX_AMQP_MAP32)
+ if (field->tag != QD_AMQP_MAP8 && field->tag != QD_AMQP_MAP32)
return 0;
idx = idx << 1;
- dx_parsed_field_t *key = DEQ_HEAD(field->children);
+ qd_parsed_field_t *key = DEQ_HEAD(field->children);
while (idx && key) {
idx--;
key = DEQ_NEXT(key);
@@ -330,12 +330,12 @@ dx_parsed_field_t *dx_parse_sub_key(dx_p
}
-dx_parsed_field_t *dx_parse_sub_value(dx_parsed_field_t *field, uint32_t idx)
+qd_parsed_field_t *qd_parse_sub_value(qd_parsed_field_t *field, uint32_t idx)
{
- if (field->tag == DX_AMQP_MAP8 || field->tag == DX_AMQP_MAP32)
+ if (field->tag == QD_AMQP_MAP8 || field->tag == QD_AMQP_MAP32)
idx = (idx << 1) + 1;
- dx_parsed_field_t *key = DEQ_HEAD(field->children);
+ qd_parsed_field_t *key = DEQ_HEAD(field->children);
while (idx && key) {
idx--;
key = DEQ_NEXT(key);
@@ -345,39 +345,39 @@ dx_parsed_field_t *dx_parse_sub_value(dx
}
-int dx_parse_is_map(dx_parsed_field_t *field)
+int qd_parse_is_map(qd_parsed_field_t *field)
{
- return field->tag == DX_AMQP_MAP8 || field->tag == DX_AMQP_MAP32;
+ return field->tag == QD_AMQP_MAP8 || field->tag == QD_AMQP_MAP32;
}
-int dx_parse_is_list(dx_parsed_field_t *field)
+int qd_parse_is_list(qd_parsed_field_t *field)
{
- return field->tag == DX_AMQP_LIST8 || field->tag == DX_AMQP_LIST32;
+ return field->tag == QD_AMQP_LIST8 || field->tag == QD_AMQP_LIST32;
}
-int dx_parse_is_scalar(dx_parsed_field_t *field)
+int qd_parse_is_scalar(qd_parsed_field_t *field)
{
return DEQ_SIZE(field->children) == 0;
}
-dx_parsed_field_t *dx_parse_value_by_key(dx_parsed_field_t *field, const char *key)
+qd_parsed_field_t *qd_parse_value_by_key(qd_parsed_field_t *field, const char *key)
{
- uint32_t count = dx_parse_sub_count(field);
+ uint32_t count = qd_parse_sub_count(field);
for (uint32_t idx = 0; idx < count; idx++) {
- dx_parsed_field_t *sub = dx_parse_sub_key(field, idx);
+ qd_parsed_field_t *sub = qd_parse_sub_key(field, idx);
if (!sub)
return 0;
- dx_field_iterator_t *iter = dx_parse_raw(sub);
+ qd_field_iterator_t *iter = qd_parse_raw(sub);
if (!iter)
return 0;
- if (dx_field_iterator_equal(iter, (const unsigned char*) key)) {
- return dx_parse_sub_value(field, idx);
+ if (qd_field_iterator_equal(iter, (const unsigned char*) key)) {
+ return qd_parse_sub_value(field, idx);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org