#include "util.h"
static void
-ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated,
- enum ofpbuf_source source)
+ofpbuf_init__(struct ofpbuf *b, size_t allocated, enum ofpbuf_source source)
{
- b->base = b->data = base;
b->allocated = allocated;
b->source = source;
- b->size = 0;
- b->l2 = b->l2_5 = b->l3 = b->l4 = NULL;
+ b->frame = NULL;
+ b->l2_5_ofs = b->l3_ofs = b->l4_ofs = UINT16_MAX;
list_poison(&b->list_node);
- b->private_p = NULL;
+}
+
+static void
+ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated,
+ enum ofpbuf_source source)
+{
+ ofpbuf_set_base(b, base);
+ ofpbuf_set_data(b, base);
+ ofpbuf_set_size(b, 0);
+
+ ofpbuf_init__(b, allocated, source);
}
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
ofpbuf_use_const(struct ofpbuf *b, const void *data, size_t size)
{
ofpbuf_use__(b, CONST_CAST(void *, data), size, OFPBUF_STACK);
- b->size = size;
+ ofpbuf_set_size(b, size);
+}
+
+/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
+ * memory starting at 'base'. DPDK allocated ofpbuf and *data is allocated
+ * from one continous memory region, so in memory data start right after
+ * ofpbuf. Therefore there is special method to free this type of
+ * buffer. ofpbuf base, data and size are initialized by dpdk rcv() so no
+ * need to initialize those fields. */
+void
+ofpbuf_init_dpdk(struct ofpbuf *b, size_t allocated)
+{
+ ofpbuf_init__(b, allocated, OFPBUF_DPDK);
}
/* Initializes 'b' as an empty ofpbuf with an initial capacity of 'size'
{
if (b) {
if (b->source == OFPBUF_MALLOC) {
- free(b->base);
- }
- if (b->source == OFPBUF_DPDK) {
- free_dpdk_buf(b);
+ free(ofpbuf_base(b));
}
+ ovs_assert(b->source != OFPBUF_DPDK);
}
}
}
/* Creates and returns a new ofpbuf that initially contains a copy of the
- * 'buffer->size' bytes of data starting at 'buffer->data' with no headroom or
+ * 'ofpbuf_size(buffer)' bytes of data starting at 'buffer->data' with no headroom or
* tailroom. */
struct ofpbuf *
ofpbuf_clone(const struct ofpbuf *buffer)
ofpbuf_clone_with_headroom(const struct ofpbuf *buffer, size_t headroom)
{
struct ofpbuf *new_buffer;
- uintptr_t data_delta;
- new_buffer = ofpbuf_clone_data_with_headroom(buffer->data, buffer->size,
+ new_buffer = ofpbuf_clone_data_with_headroom(ofpbuf_data(buffer),
+ ofpbuf_size(buffer),
headroom);
- data_delta = (char *) new_buffer->data - (char *) buffer->data;
+ if (buffer->frame) {
+ uintptr_t data_delta
+ = (char *)ofpbuf_data(new_buffer) - (char *)ofpbuf_data(buffer);
- if (buffer->l2) {
- new_buffer->l2 = (char *) buffer->l2 + data_delta;
- }
- if (buffer->l2_5) {
- new_buffer->l2_5 = (char *) buffer->l2_5 + data_delta;
- }
- if (buffer->l3) {
- new_buffer->l3 = (char *) buffer->l3 + data_delta;
- }
- if (buffer->l4) {
- new_buffer->l4 = (char *) buffer->l4 + data_delta;
+ new_buffer->frame = (char *) buffer->frame + data_delta;
}
+ new_buffer->l2_5_ofs = buffer->l2_5_ofs;
+ new_buffer->l3_ofs = buffer->l3_ofs;
+ new_buffer->l4_ofs = buffer->l4_ofs;
return new_buffer;
}
ofpbuf_copy__(struct ofpbuf *b, uint8_t *new_base,
size_t new_headroom, size_t new_tailroom)
{
- const uint8_t *old_base = b->base;
+ const uint8_t *old_base = ofpbuf_base(b);
size_t old_headroom = ofpbuf_headroom(b);
size_t old_tailroom = ofpbuf_tailroom(b);
size_t copy_headroom = MIN(old_headroom, new_headroom);
memcpy(&new_base[new_headroom - copy_headroom],
&old_base[old_headroom - copy_headroom],
- copy_headroom + b->size + copy_tailroom);
+ copy_headroom + ofpbuf_size(b) + copy_tailroom);
}
/* Reallocates 'b' so that it has exactly 'new_headroom' and 'new_tailroom'
void *new_base, *new_data;
size_t new_allocated;
- new_allocated = new_headroom + b->size + new_tailroom;
+ new_allocated = new_headroom + ofpbuf_size(b) + new_tailroom;
switch (b->source) {
case OFPBUF_DPDK:
case OFPBUF_MALLOC:
if (new_headroom == ofpbuf_headroom(b)) {
- new_base = xrealloc(b->base, new_allocated);
+ new_base = xrealloc(ofpbuf_base(b), new_allocated);
} else {
new_base = xmalloc(new_allocated);
ofpbuf_copy__(b, new_base, new_headroom, new_tailroom);
- free(b->base);
+ free(ofpbuf_base(b));
}
break;
}
b->allocated = new_allocated;
- b->base = new_base;
+ ofpbuf_set_base(b, new_base);
new_data = (char *) new_base + new_headroom;
- if (b->data != new_data) {
- uintptr_t data_delta = (char *) new_data - (char *) b->data;
- b->data = new_data;
- if (b->l2) {
- b->l2 = (char *) b->l2 + data_delta;
- }
- if (b->l2_5) {
- b->l2_5 = (char *) b->l2_5 + data_delta;
- }
- if (b->l3) {
- b->l3 = (char *) b->l3 + data_delta;
- }
- if (b->l4) {
- b->l4 = (char *) b->l4 + data_delta;
+ if (ofpbuf_data(b) != new_data) {
+ if (b->frame) {
+ uintptr_t data_delta = (char *) new_data - (char *) ofpbuf_data(b);
+
+ b->frame = (char *) b->frame + data_delta;
}
+ ofpbuf_set_data(b, new_data);
}
}
void
ofpbuf_padto(struct ofpbuf *b, size_t length)
{
- if (b->size < length) {
- ofpbuf_put_zeros(b, length - b->size);
+ if (ofpbuf_size(b) < length) {
+ ofpbuf_put_zeros(b, length - ofpbuf_size(b));
}
}
: true);
if (delta != 0) {
- char *dst = (char *) b->data + delta;
- memmove(dst, b->data, b->size);
- b->data = dst;
+ char *dst = (char *) ofpbuf_data(b) + delta;
+ memmove(dst, ofpbuf_data(b), ofpbuf_size(b));
+ ofpbuf_set_data(b, dst);
}
}
void *p;
ofpbuf_prealloc_tailroom(b, size);
p = ofpbuf_tail(b);
- b->size += size;
+ ofpbuf_set_size(b, ofpbuf_size(b) + size);
return p;
}
char *
ofpbuf_put_hex(struct ofpbuf *b, const char *s, size_t *n)
{
- size_t initial_size = b->size;
+ size_t initial_size = ofpbuf_size(b);
for (;;) {
uint8_t byte;
bool ok;
byte = hexits_value(s, 2, &ok);
if (!ok) {
if (n) {
- *n = b->size - initial_size;
+ *n = ofpbuf_size(b) - initial_size;
}
return CONST_CAST(char *, s);
}
void
ofpbuf_reserve(struct ofpbuf *b, size_t size)
{
- ovs_assert(!b->size);
+ ovs_assert(!ofpbuf_size(b));
ofpbuf_prealloc_tailroom(b, size);
- b->data = (char*)b->data + size;
+ ofpbuf_set_data(b, (char*)ofpbuf_data(b) + size);
}
/* Reserves 'size' bytes of headroom so that they can be later allocated with
ofpbuf_reserve_with_tailroom(struct ofpbuf *b, size_t headroom,
size_t tailroom)
{
- ovs_assert(!b->size);
+ ovs_assert(!ofpbuf_size(b));
ofpbuf_prealloc_tailroom(b, headroom + tailroom);
- b->data = (char*)b->data + headroom;
+ ofpbuf_set_data(b, (char*)ofpbuf_data(b) + headroom);
}
/* Prefixes 'size' bytes to the head end of 'b', reallocating and copying its
ofpbuf_push_uninit(struct ofpbuf *b, size_t size)
{
ofpbuf_prealloc_headroom(b, size);
- b->data = (char*)b->data - size;
- b->size += size;
- return b->data;
+ ofpbuf_set_data(b, (char*)ofpbuf_data(b) - size);
+ ofpbuf_set_size(b, ofpbuf_size(b) + size);
+ return ofpbuf_data(b);
}
/* Prefixes 'size' zeroed bytes to the head end of 'b', reallocating and
void *p;
ovs_assert(b->source != OFPBUF_DPDK);
- if (b->source == OFPBUF_MALLOC && b->data == b->base) {
- p = b->data;
+ if (b->source == OFPBUF_MALLOC && ofpbuf_data(b) == ofpbuf_base(b)) {
+ p = ofpbuf_data(b);
} else {
- p = xmemdup(b->data, b->size);
+ p = xmemdup(ofpbuf_data(b), ofpbuf_size(b));
if (b->source == OFPBUF_MALLOC) {
- free(b->base);
+ free(ofpbuf_base(b));
}
}
- b->base = b->data = NULL;
+ ofpbuf_set_base(b, NULL);
+ ofpbuf_set_data(b, NULL);
return p;
}
struct ds s;
ds_init(&s);
- ds_put_format(&s, "size=%"PRIuSIZE", allocated=%"PRIuSIZE", head=%"PRIuSIZE", tail=%"PRIuSIZE"\n",
- b->size, b->allocated,
+ ds_put_format(&s, "size=%"PRIu32", allocated=%"PRIu32", head=%"PRIuSIZE", tail=%"PRIuSIZE"\n",
+ ofpbuf_size(b), b->allocated,
ofpbuf_headroom(b), ofpbuf_tailroom(b));
- ds_put_hex_dump(&s, b->data, MIN(b->size, maxbytes), 0, false);
+ ds_put_hex_dump(&s, ofpbuf_data(b), MIN(ofpbuf_size(b), maxbytes), 0, false);
return ds_cstr(&s);
}
ofpbuf_delete(b);
}
}
+
+static inline void
+ofpbuf_adjust_layer_offset(uint16_t *offset, int increment)
+{
+ if (*offset != UINT16_MAX) {
+ *offset += increment;
+ }
+}
+
+/* Adjust the size of the l2_5 portion of the ofpbuf, updating the l2
+ * pointer and the layer offsets. The caller is responsible for
+ * modifying the contents. */
+void *
+ofpbuf_resize_l2_5(struct ofpbuf *b, int increment)
+{
+ if (increment >= 0) {
+ ofpbuf_push_uninit(b, increment);
+ } else {
+ ofpbuf_pull(b, -increment);
+ }
+
+ b->frame = ofpbuf_data(b);
+ /* Adjust layer offsets after l2_5. */
+ ofpbuf_adjust_layer_offset(&b->l3_ofs, increment);
+ ofpbuf_adjust_layer_offset(&b->l4_ofs, increment);
+
+ return b->frame;
+}
+
+/* Adjust the size of the l2 portion of the ofpbuf, updating the l2
+ * pointer and the layer offsets. The caller is responsible for
+ * modifying the contents. */
+void *
+ofpbuf_resize_l2(struct ofpbuf *b, int increment)
+{
+ ofpbuf_resize_l2_5(b, increment);
+ ofpbuf_adjust_layer_offset(&b->l2_5_ofs, increment);
+ return b->frame;
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff