#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 = NULL;
- b->l2_5_ofs = b->l3_ofs = b->l4_ofs = UINT16_MAX;
+ b->header = NULL;
+ b->msg = NULL;
list_poison(&b->list_node);
}
+static void
+ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated, size_t size,
+ enum ofpbuf_source source)
+{
+ b->base = base;
+ b->data = base;
+ b->size = size;
+
+ ofpbuf_init__(b, allocated, source);
+}
+
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
* memory starting at 'base'. 'base' should be the first byte of a region
* obtained from malloc(). It will be freed (with free()) if 'b' is resized or
* freed. */
-void
+static void
ofpbuf_use(struct ofpbuf *b, void *base, size_t allocated)
{
- ofpbuf_use__(b, base, allocated, OFPBUF_MALLOC);
+ ofpbuf_use__(b, base, allocated, 0, OFPBUF_MALLOC);
+}
+
+/* Converts ds into ofpbuf 'b'. 'b' contains the 'ds->allocated' bytes of
+ * memory starting at 'ds->string'. 'ds' should not be modified any more.
+ * The memory allocated for 'ds' will be freed (with free()) if 'b' is
+ * resized or freed. */
+void
+ofpbuf_use_ds(struct ofpbuf *b, const struct ds *ds)
+{
+ ofpbuf_use__(b, ds->string, ds->allocated + 1, ds->length, OFPBUF_MALLOC);
}
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
void
ofpbuf_use_stack(struct ofpbuf *b, void *base, size_t allocated)
{
- ofpbuf_use__(b, base, allocated, OFPBUF_STACK);
+ ofpbuf_use__(b, base, allocated, 0, OFPBUF_STACK);
}
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
void
ofpbuf_use_stub(struct ofpbuf *b, void *base, size_t allocated)
{
- ofpbuf_use__(b, base, allocated, OFPBUF_STUB);
+ ofpbuf_use__(b, base, allocated, 0, OFPBUF_STUB);
}
/* Initializes 'b' as an ofpbuf whose data starts at 'data' and continues for
void
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_use__(b, CONST_CAST(void *, data), size, size, OFPBUF_STACK);
}
/* Initializes 'b' as an empty ofpbuf with an initial capacity of 'size'
if (b->source == OFPBUF_MALLOC) {
free(b->base);
}
- if (b->source == OFPBUF_DPDK) {
- free_dpdk_buf(b);
- }
}
}
{
struct ofpbuf *new_buffer;
- new_buffer = ofpbuf_clone_data_with_headroom(buffer->data, buffer->size,
+ new_buffer = ofpbuf_clone_data_with_headroom(buffer->data,
+ buffer->size,
headroom);
- if (buffer->l2) {
- uintptr_t data_delta = (char *)new_buffer->data - (char *)buffer->data;
+ if (buffer->header) {
+ uintptr_t data_delta
+ = (char *)new_buffer->data - (char *)buffer->data;
- new_buffer->l2 = (char *) buffer->l2 + data_delta;
+ new_buffer->header = (char *) buffer->header + 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;
+ new_buffer->msg = buffer->msg;
return new_buffer;
}
new_allocated = new_headroom + b->size + new_tailroom;
switch (b->source) {
- case OFPBUF_DPDK:
- OVS_NOT_REACHED();
-
case OFPBUF_MALLOC:
if (new_headroom == ofpbuf_headroom(b)) {
new_base = xrealloc(b->base, new_allocated);
new_data = (char *) new_base + new_headroom;
if (b->data != new_data) {
- uintptr_t data_delta = (char *) new_data - (char *) b->data;
+ if (b->header) {
+ uintptr_t data_delta = (char *) b->header - (char *) b->data;
- b->data = new_data;
- if (b->l2) {
- b->l2 = (char *) b->l2 + data_delta;
+ b->header = (char *) new_data + data_delta;
}
+ if (b->msg) {
+ uintptr_t data_delta = (char *) b->msg - (char *) b->data;
+
+ b->msg = (char *) new_data + data_delta;
+ }
+ b->data = new_data;
}
}
}
}
-/* Trims the size of 'b' to fit its actual content, reducing its tailroom to
- * 0. Its headroom, if any, is preserved.
+/* Trims the size of 'b' to fit its actual content, reducing its headroom and
+ * tailroom to 0, if any.
*
* Buffers not obtained from malloc() are not resized, since that wouldn't save
- * any memory. */
+ * any memory.
+ *
+ * Caller needs to updates 'b->header' and 'b->msg' so that they point to the
+ * same locations in the data. (If they pointed into the tailroom or headroom
+ * then they become invalid.)
+ *
+ */
void
ofpbuf_trim(struct ofpbuf *b)
{
- ovs_assert(b->source != OFPBUF_DPDK);
-
if (b->source == OFPBUF_MALLOC
&& (ofpbuf_headroom(b) || ofpbuf_tailroom(b))) {
ofpbuf_resize__(b, 0, 0);
/* Shifts all of the data within the allocated space in 'b' by 'delta' bytes.
* For example, a 'delta' of 1 would cause each byte of data to move one byte
* forward (from address 'p' to 'p+1'), and a 'delta' of -1 would cause each
- * byte to move one byte backward (from 'p' to 'p-1'). */
+ * byte to move one byte backward (from 'p' to 'p-1').
+ *
+ * If used, user must make sure the 'header' and 'msg' pointers are updated
+ * after shifting.
+ */
void
ofpbuf_shift(struct ofpbuf *b, int delta)
{
b->data = (char*)b->data + size;
}
-/* Reserves 'size' bytes of headroom so that they can be later allocated with
- * ofpbuf_push_uninit() without reallocating the ofpbuf. */
-void
-ofpbuf_reserve_with_tailroom(struct ofpbuf *b, size_t headroom,
- size_t tailroom)
-{
- ovs_assert(!b->size);
- ofpbuf_prealloc_tailroom(b, headroom + tailroom);
- b->data = (char*)b->data + headroom;
-}
-
/* Prefixes 'size' bytes to the head end of 'b', reallocating and copying its
* data if necessary. Returns a pointer to the first byte of the data's
* location in the ofpbuf. The new data is left uninitialized. */
ofpbuf_steal_data(struct ofpbuf *b)
{
void *p;
- ovs_assert(b->source != OFPBUF_DPDK);
if (b->source == OFPBUF_MALLOC && b->data == b->base) {
p = b->data;
free(b->base);
}
}
- b->base = b->data = NULL;
+ b->base = NULL;
+ b->data = NULL;
+ b->header = NULL;
+ b->msg = NULL;
return p;
}
/* Removes each of the "struct ofpbuf"s on 'list' from the list and frees
* them. */
void
-ofpbuf_list_delete(struct list *list)
+ofpbuf_list_delete(struct ovs_list *list)
{
- struct ofpbuf *b, *next;
+ struct ofpbuf *b;
- LIST_FOR_EACH_SAFE (b, next, list_node, list) {
- list_remove(&b->list_node);
+ LIST_FOR_EACH_POP (b, list_node, list) {
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->l2 = b->data;
- /* Adjust layer offsets after l2_5. */
- ofpbuf_adjust_layer_offset(&b->l3_ofs, increment);
- ofpbuf_adjust_layer_offset(&b->l4_ofs, increment);
-
- return b->l2;
-}
-
-/* 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->l2;
-}