2009-07-08 13:19:16 -07:00
|
|
|
/*
|
2013-02-27 17:02:53 -08:00
|
|
|
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
|
2009-07-08 13:19:16 -07:00
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at:
|
2009-07-08 13:19:16 -07:00
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include "ofpbuf.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2010-02-11 13:56:45 -08:00
|
|
|
#include "dynamic-string.h"
|
2014-03-24 19:23:08 -07:00
|
|
|
#include "netdev-dpdk.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
#include "util.h"
|
|
|
|
|
2014-03-31 13:22:39 -07:00
|
|
|
static void
|
|
|
|
ofpbuf_init__(struct ofpbuf *b, size_t allocated, enum ofpbuf_source source)
|
|
|
|
{
|
|
|
|
b->allocated = allocated;
|
|
|
|
b->source = source;
|
2015-03-02 17:29:44 -08:00
|
|
|
b->header = NULL;
|
|
|
|
b->msg = NULL;
|
2014-03-31 13:22:39 -07:00
|
|
|
list_poison(&b->list_node);
|
|
|
|
}
|
|
|
|
|
2010-12-23 14:23:41 -08:00
|
|
|
static void
|
|
|
|
ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated,
|
|
|
|
enum ofpbuf_source source)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2015-03-02 17:29:44 -08:00
|
|
|
b->base = base;
|
|
|
|
b->data = base;
|
|
|
|
b->size = 0;
|
2014-03-30 01:31:50 -07:00
|
|
|
|
2014-03-31 13:22:39 -07:00
|
|
|
ofpbuf_init__(b, allocated, source);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2010-12-23 14:23:41 -08:00
|
|
|
/* 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
|
|
|
|
ofpbuf_use(struct ofpbuf *b, void *base, size_t allocated)
|
|
|
|
{
|
|
|
|
ofpbuf_use__(b, base, allocated, OFPBUF_MALLOC);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
|
|
|
|
* memory starting at 'base'. 'base' should point to a buffer on the stack.
|
2012-04-17 21:55:27 -07:00
|
|
|
* (Nothing actually relies on 'base' being allocated on the stack. It could
|
|
|
|
* be static or malloc()'d memory. But stack space is the most common use
|
|
|
|
* case.)
|
2010-12-23 14:23:41 -08:00
|
|
|
*
|
|
|
|
* 'base' should be appropriately aligned. Using an array of uint32_t or
|
|
|
|
* uint64_t for the buffer is a reasonable way to ensure appropriate alignment
|
2013-02-27 17:02:53 -08:00
|
|
|
* for 32- or 64-bit data.
|
2010-12-23 14:23:41 -08:00
|
|
|
*
|
2012-04-17 21:55:27 -07:00
|
|
|
* An ofpbuf operation that requires reallocating data will assert-fail if this
|
|
|
|
* function was used to initialize it. Thus, one need not call ofpbuf_uninit()
|
|
|
|
* on an ofpbuf initialized by this function (though doing so is harmless),
|
|
|
|
* because it is guaranteed that 'b' does not own any heap-allocated memory. */
|
2010-12-23 14:23:41 -08:00
|
|
|
void
|
|
|
|
ofpbuf_use_stack(struct ofpbuf *b, void *base, size_t allocated)
|
|
|
|
{
|
|
|
|
ofpbuf_use__(b, base, allocated, OFPBUF_STACK);
|
|
|
|
}
|
|
|
|
|
2012-04-17 21:55:27 -07:00
|
|
|
/* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of
|
|
|
|
* memory starting at 'base'. 'base' should point to a buffer on the stack.
|
|
|
|
* (Nothing actually relies on 'base' being allocated on the stack. It could
|
2013-05-01 18:22:41 -07:00
|
|
|
* be static or malloc()'d memory. But stack space is the most common use
|
2012-04-17 21:55:27 -07:00
|
|
|
* case.)
|
|
|
|
*
|
|
|
|
* 'base' should be appropriately aligned. Using an array of uint32_t or
|
|
|
|
* uint64_t for the buffer is a reasonable way to ensure appropriate alignment
|
2013-02-27 17:02:53 -08:00
|
|
|
* for 32- or 64-bit data.
|
2012-04-17 21:55:27 -07:00
|
|
|
*
|
|
|
|
* An ofpbuf operation that requires reallocating data will copy the provided
|
|
|
|
* buffer into a malloc()'d buffer. Thus, it is wise to call ofpbuf_uninit()
|
|
|
|
* on an ofpbuf initialized by this function, so that if it expanded into the
|
|
|
|
* heap, that memory is freed. */
|
|
|
|
void
|
|
|
|
ofpbuf_use_stub(struct ofpbuf *b, void *base, size_t allocated)
|
|
|
|
{
|
|
|
|
ofpbuf_use__(b, base, allocated, OFPBUF_STUB);
|
|
|
|
}
|
|
|
|
|
2010-12-02 14:53:12 -08:00
|
|
|
/* Initializes 'b' as an ofpbuf whose data starts at 'data' and continues for
|
|
|
|
* 'size' bytes. This is appropriate for an ofpbuf that will be used to
|
|
|
|
* inspect existing data, without moving it around or reallocating it, and
|
2010-12-23 14:23:41 -08:00
|
|
|
* generally without modifying it at all.
|
|
|
|
*
|
|
|
|
* An ofpbuf operation that requires reallocating data will assert-fail if this
|
|
|
|
* function was used to initialize it. */
|
2010-12-02 14:53:12 -08:00
|
|
|
void
|
|
|
|
ofpbuf_use_const(struct ofpbuf *b, const void *data, size_t size)
|
|
|
|
{
|
2012-07-13 16:00:29 -07:00
|
|
|
ofpbuf_use__(b, CONST_CAST(void *, data), size, OFPBUF_STACK);
|
2015-03-02 17:29:44 -08:00
|
|
|
b->size = size;
|
2014-03-31 13:22:39 -07:00
|
|
|
}
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
/* Initializes 'b' as an empty ofpbuf with an initial capacity of 'size'
|
|
|
|
* bytes. */
|
|
|
|
void
|
|
|
|
ofpbuf_init(struct ofpbuf *b, size_t size)
|
|
|
|
{
|
|
|
|
ofpbuf_use(b, size ? xmalloc(size) : NULL, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Frees memory that 'b' points to. */
|
|
|
|
void
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_uninit(struct ofpbuf *b)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2014-03-24 19:23:08 -07:00
|
|
|
if (b) {
|
|
|
|
if (b->source == OFPBUF_MALLOC) {
|
2015-03-02 17:29:44 -08:00
|
|
|
free(b->base);
|
2014-03-24 19:23:08 -07:00
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Frees memory that 'b' points to and allocates a new ofpbuf */
|
|
|
|
void
|
|
|
|
ofpbuf_reinit(struct ofpbuf *b, size_t size)
|
|
|
|
{
|
|
|
|
ofpbuf_uninit(b);
|
|
|
|
ofpbuf_init(b, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Creates and returns a new ofpbuf with an initial capacity of 'size'
|
|
|
|
* bytes. */
|
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_new(size_t size)
|
|
|
|
{
|
|
|
|
struct ofpbuf *b = xmalloc(sizeof *b);
|
|
|
|
ofpbuf_init(b, size);
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
2010-09-01 12:55:38 -07:00
|
|
|
/* Creates and returns a new ofpbuf with an initial capacity of 'size +
|
|
|
|
* headroom' bytes, reserving the first 'headroom' bytes as headroom. */
|
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_new_with_headroom(size_t size, size_t headroom)
|
|
|
|
{
|
|
|
|
struct ofpbuf *b = ofpbuf_new(size + headroom);
|
|
|
|
ofpbuf_reserve(b, headroom);
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
2010-12-27 14:36:16 -08:00
|
|
|
/* Creates and returns a new ofpbuf that initially contains a copy of the
|
2015-03-02 17:29:44 -08:00
|
|
|
* 'buffer->size' bytes of data starting at 'buffer->data' with no headroom or
|
2010-12-27 14:36:16 -08:00
|
|
|
* tailroom. */
|
2009-07-08 13:19:16 -07:00
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_clone(const struct ofpbuf *buffer)
|
|
|
|
{
|
2011-12-27 10:35:56 -08:00
|
|
|
return ofpbuf_clone_with_headroom(buffer, 0);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2010-09-01 12:55:38 -07:00
|
|
|
/* Creates and returns a new ofpbuf whose data are copied from 'buffer'. The
|
|
|
|
* returned ofpbuf will additionally have 'headroom' bytes of headroom. */
|
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_clone_with_headroom(const struct ofpbuf *buffer, size_t headroom)
|
|
|
|
{
|
2011-12-27 10:35:56 -08:00
|
|
|
struct ofpbuf *new_buffer;
|
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
new_buffer = ofpbuf_clone_data_with_headroom(buffer->data,
|
|
|
|
buffer->size,
|
2011-12-27 10:35:56 -08:00
|
|
|
headroom);
|
2015-03-02 17:29:44 -08:00
|
|
|
if (buffer->header) {
|
2014-04-02 15:44:21 -07:00
|
|
|
uintptr_t data_delta
|
2015-03-02 17:29:44 -08:00
|
|
|
= (char *)new_buffer->data - (char *)buffer->data;
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
new_buffer->header = (char *) buffer->header + data_delta;
|
2011-12-27 10:35:56 -08:00
|
|
|
}
|
2015-03-02 17:29:44 -08:00
|
|
|
new_buffer->msg = buffer->msg;
|
2011-12-27 10:35:56 -08:00
|
|
|
|
|
|
|
return new_buffer;
|
2010-09-01 12:55:38 -07:00
|
|
|
}
|
|
|
|
|
2010-12-27 14:36:16 -08:00
|
|
|
/* Creates and returns a new ofpbuf that initially contains a copy of the
|
|
|
|
* 'size' bytes of data starting at 'data' with no headroom or tailroom. */
|
2009-07-08 13:19:16 -07:00
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_clone_data(const void *data, size_t size)
|
|
|
|
{
|
2010-12-27 14:36:16 -08:00
|
|
|
return ofpbuf_clone_data_with_headroom(data, size, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Creates and returns a new ofpbuf that initially contains 'headroom' bytes of
|
|
|
|
* headroom followed by a copy of the 'size' bytes of data starting at
|
|
|
|
* 'data'. */
|
|
|
|
struct ofpbuf *
|
|
|
|
ofpbuf_clone_data_with_headroom(const void *data, size_t size, size_t headroom)
|
|
|
|
{
|
|
|
|
struct ofpbuf *b = ofpbuf_new_with_headroom(size, headroom);
|
2009-07-08 13:19:16 -07:00
|
|
|
ofpbuf_put(b, data, size);
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
2010-07-14 10:05:53 -07:00
|
|
|
static void
|
2010-12-27 14:32:45 -08:00
|
|
|
ofpbuf_copy__(struct ofpbuf *b, uint8_t *new_base,
|
|
|
|
size_t new_headroom, size_t new_tailroom)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2015-03-02 17:29:44 -08:00
|
|
|
const uint8_t *old_base = b->base;
|
2010-12-27 14:32:45 -08:00
|
|
|
size_t old_headroom = ofpbuf_headroom(b);
|
|
|
|
size_t old_tailroom = ofpbuf_tailroom(b);
|
|
|
|
size_t copy_headroom = MIN(old_headroom, new_headroom);
|
|
|
|
size_t copy_tailroom = MIN(old_tailroom, new_tailroom);
|
|
|
|
|
|
|
|
memcpy(&new_base[new_headroom - copy_headroom],
|
|
|
|
&old_base[old_headroom - copy_headroom],
|
2015-03-02 17:29:44 -08:00
|
|
|
copy_headroom + b->size + copy_tailroom);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2010-12-27 14:32:45 -08:00
|
|
|
/* Reallocates 'b' so that it has exactly 'new_headroom' and 'new_tailroom'
|
|
|
|
* bytes of headroom and tailroom, respectively. */
|
2010-07-14 10:05:53 -07:00
|
|
|
static void
|
2010-12-27 14:32:45 -08:00
|
|
|
ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom)
|
2010-07-14 10:05:53 -07:00
|
|
|
{
|
2010-12-27 14:32:45 -08:00
|
|
|
void *new_base, *new_data;
|
2010-12-23 14:23:41 -08:00
|
|
|
size_t new_allocated;
|
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
new_allocated = new_headroom + b->size + new_tailroom;
|
2010-12-23 14:23:41 -08:00
|
|
|
|
|
|
|
switch (b->source) {
|
|
|
|
case OFPBUF_MALLOC:
|
2010-12-27 14:32:45 -08:00
|
|
|
if (new_headroom == ofpbuf_headroom(b)) {
|
2015-03-02 17:29:44 -08:00
|
|
|
new_base = xrealloc(b->base, new_allocated);
|
2010-12-27 14:32:45 -08:00
|
|
|
} else {
|
|
|
|
new_base = xmalloc(new_allocated);
|
|
|
|
ofpbuf_copy__(b, new_base, new_headroom, new_tailroom);
|
2015-03-02 17:29:44 -08:00
|
|
|
free(b->base);
|
2010-12-27 14:32:45 -08:00
|
|
|
}
|
2010-12-23 14:23:41 -08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case OFPBUF_STACK:
|
2013-12-17 10:32:12 -08:00
|
|
|
OVS_NOT_REACHED();
|
2010-12-23 14:23:41 -08:00
|
|
|
|
2012-04-17 21:55:27 -07:00
|
|
|
case OFPBUF_STUB:
|
|
|
|
b->source = OFPBUF_MALLOC;
|
|
|
|
new_base = xmalloc(new_allocated);
|
|
|
|
ofpbuf_copy__(b, new_base, new_headroom, new_tailroom);
|
|
|
|
break;
|
|
|
|
|
2010-12-23 14:23:41 -08:00
|
|
|
default:
|
2013-12-17 10:32:12 -08:00
|
|
|
OVS_NOT_REACHED();
|
2010-12-23 14:23:41 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
b->allocated = new_allocated;
|
2015-03-02 17:29:44 -08:00
|
|
|
b->base = new_base;
|
2010-12-27 14:32:45 -08:00
|
|
|
|
|
|
|
new_data = (char *) new_base + new_headroom;
|
2015-03-02 17:29:44 -08:00
|
|
|
if (b->data != new_data) {
|
|
|
|
if (b->header) {
|
|
|
|
uintptr_t data_delta = (char *) new_data - (char *) b->data;
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
b->header = (char *) b->header + data_delta;
|
2010-12-27 14:32:45 -08:00
|
|
|
}
|
2015-03-02 17:29:44 -08:00
|
|
|
b->data = new_data;
|
2010-12-27 14:32:45 -08:00
|
|
|
}
|
2010-07-14 10:05:53 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensures that 'b' has room for at least 'size' bytes at its tail end,
|
|
|
|
* reallocating and copying its data if necessary. Its headroom, if any, is
|
|
|
|
* preserved. */
|
|
|
|
void
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_prealloc_tailroom(struct ofpbuf *b, size_t size)
|
2010-07-14 10:05:53 -07:00
|
|
|
{
|
|
|
|
if (size > ofpbuf_tailroom(b)) {
|
2010-12-27 14:32:45 -08:00
|
|
|
ofpbuf_resize__(b, ofpbuf_headroom(b), MAX(size, 64));
|
2010-07-14 10:05:53 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-27 14:32:45 -08:00
|
|
|
/* Ensures that 'b' has room for at least 'size' bytes at its head,
|
|
|
|
* reallocating and copying its data if necessary. Its tailroom, if any, is
|
|
|
|
* preserved. */
|
2009-07-08 13:19:16 -07:00
|
|
|
void
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_prealloc_headroom(struct ofpbuf *b, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2010-12-27 14:32:45 -08:00
|
|
|
if (size > ofpbuf_headroom(b)) {
|
|
|
|
ofpbuf_resize__(b, MAX(size, 64), ofpbuf_tailroom(b));
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2014-10-04 11:28:43 +08:00
|
|
|
/* Trims the size of 'b' to fit its actual content, reducing its headroom and
|
|
|
|
* tailroom to 0, if any.
|
2010-12-23 14:23:41 -08:00
|
|
|
*
|
|
|
|
* Buffers not obtained from malloc() are not resized, since that wouldn't save
|
|
|
|
* any memory. */
|
2009-07-08 13:19:16 -07:00
|
|
|
void
|
|
|
|
ofpbuf_trim(struct ofpbuf *b)
|
|
|
|
{
|
2010-12-27 14:32:45 -08:00
|
|
|
if (b->source == OFPBUF_MALLOC
|
|
|
|
&& (ofpbuf_headroom(b) || ofpbuf_tailroom(b))) {
|
|
|
|
ofpbuf_resize__(b, 0, 0);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-31 16:49:06 -07:00
|
|
|
/* If 'b' is shorter than 'length' bytes, pads its tail out with zeros to that
|
|
|
|
* length. */
|
|
|
|
void
|
|
|
|
ofpbuf_padto(struct ofpbuf *b, size_t length)
|
|
|
|
{
|
2015-03-02 17:29:44 -08:00
|
|
|
if (b->size < length) {
|
|
|
|
ofpbuf_put_zeros(b, length - b->size);
|
2011-05-31 16:49:06 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-22 11:42:42 -08:00
|
|
|
/* 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'). */
|
|
|
|
void
|
|
|
|
ofpbuf_shift(struct ofpbuf *b, int delta)
|
|
|
|
{
|
|
|
|
ovs_assert(delta > 0 ? delta <= ofpbuf_tailroom(b)
|
|
|
|
: delta < 0 ? -delta <= ofpbuf_headroom(b)
|
|
|
|
: true);
|
|
|
|
|
|
|
|
if (delta != 0) {
|
2015-03-02 17:29:44 -08:00
|
|
|
char *dst = (char *) b->data + delta;
|
|
|
|
memmove(dst, b->data, b->size);
|
|
|
|
b->data = dst;
|
2013-11-22 11:42:42 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
/* Appends 'size' bytes of data to the tail end of 'b', reallocating and
|
|
|
|
* copying its data if necessary. Returns a pointer to the first byte of the
|
|
|
|
* new data, which is left uninitialized. */
|
|
|
|
void *
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_put_uninit(struct ofpbuf *b, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
void *p;
|
|
|
|
ofpbuf_prealloc_tailroom(b, size);
|
|
|
|
p = ofpbuf_tail(b);
|
2015-03-02 17:29:44 -08:00
|
|
|
b->size += size;
|
2009-07-08 13:19:16 -07:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Appends 'size' zeroed bytes to the tail end of 'b'. Data in 'b' is
|
|
|
|
* reallocated and copied if necessary. Returns a pointer to the first byte of
|
|
|
|
* the data's location in the ofpbuf. */
|
|
|
|
void *
|
|
|
|
ofpbuf_put_zeros(struct ofpbuf *b, size_t size)
|
|
|
|
{
|
|
|
|
void *dst = ofpbuf_put_uninit(b, size);
|
|
|
|
memset(dst, 0, size);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Appends the 'size' bytes of data in 'p' to the tail end of 'b'. Data in 'b'
|
|
|
|
* is reallocated and copied if necessary. Returns a pointer to the first
|
|
|
|
* byte of the data's location in the ofpbuf. */
|
|
|
|
void *
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_put(struct ofpbuf *b, const void *p, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
void *dst = ofpbuf_put_uninit(b, size);
|
|
|
|
memcpy(dst, p, size);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2010-12-08 13:09:59 -08:00
|
|
|
/* Parses as many pairs of hex digits as possible (possibly separated by
|
|
|
|
* spaces) from the beginning of 's', appending bytes for their values to 'b'.
|
|
|
|
* Returns the first character of 's' that is not the first of a pair of hex
|
|
|
|
* digits. If 'n' is nonnull, stores the number of bytes added to 'b' in
|
|
|
|
* '*n'. */
|
|
|
|
char *
|
|
|
|
ofpbuf_put_hex(struct ofpbuf *b, const char *s, size_t *n)
|
|
|
|
{
|
2015-03-02 17:29:44 -08:00
|
|
|
size_t initial_size = b->size;
|
2010-12-08 13:09:59 -08:00
|
|
|
for (;;) {
|
|
|
|
uint8_t byte;
|
|
|
|
bool ok;
|
|
|
|
|
2013-11-04 22:37:23 -08:00
|
|
|
s += strspn(s, " \t\r\n");
|
2010-12-08 13:09:59 -08:00
|
|
|
byte = hexits_value(s, 2, &ok);
|
|
|
|
if (!ok) {
|
|
|
|
if (n) {
|
2015-03-02 17:29:44 -08:00
|
|
|
*n = b->size - initial_size;
|
2010-12-08 13:09:59 -08:00
|
|
|
}
|
2012-07-13 16:00:29 -07:00
|
|
|
return CONST_CAST(char *, s);
|
2010-12-08 13:09:59 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
ofpbuf_put(b, &byte, 1);
|
|
|
|
s += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
/* Reserves 'size' bytes of headroom so that they can be later allocated with
|
|
|
|
* ofpbuf_push_uninit() without reallocating the ofpbuf. */
|
|
|
|
void
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_reserve(struct ofpbuf *b, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2015-03-02 17:29:44 -08:00
|
|
|
ovs_assert(!b->size);
|
2009-07-08 13:19:16 -07:00
|
|
|
ofpbuf_prealloc_tailroom(b, size);
|
2015-03-02 17:29:44 -08:00
|
|
|
b->data = (char*)b->data + size;
|
2013-12-16 08:14:52 -08:00
|
|
|
}
|
|
|
|
|
2010-12-27 14:32:45 -08:00
|
|
|
/* 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. */
|
2009-07-08 13:19:16 -07:00
|
|
|
void *
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_push_uninit(struct ofpbuf *b, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
ofpbuf_prealloc_headroom(b, size);
|
2015-03-02 17:29:44 -08:00
|
|
|
b->data = (char*)b->data - size;
|
|
|
|
b->size += size;
|
|
|
|
return b->data;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2010-12-27 14:32:45 -08:00
|
|
|
/* Prefixes 'size' zeroed 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. */
|
2010-04-09 12:36:16 -07:00
|
|
|
void *
|
|
|
|
ofpbuf_push_zeros(struct ofpbuf *b, size_t size)
|
|
|
|
{
|
|
|
|
void *dst = ofpbuf_push_uninit(b, size);
|
|
|
|
memset(dst, 0, size);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2010-12-27 14:32:45 -08:00
|
|
|
/* Copies the 'size' bytes starting at 'p' 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. */
|
2009-07-08 13:19:16 -07:00
|
|
|
void *
|
2010-08-30 00:24:53 -07:00
|
|
|
ofpbuf_push(struct ofpbuf *b, const void *p, size_t size)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
void *dst = ofpbuf_push_uninit(b, size);
|
|
|
|
memcpy(dst, p, size);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2011-03-11 11:52:49 -08:00
|
|
|
/* Returns the data in 'b' as a block of malloc()'d memory and frees the buffer
|
|
|
|
* within 'b'. (If 'b' itself was dynamically allocated, e.g. with
|
|
|
|
* ofpbuf_new(), then it should still be freed with, e.g., ofpbuf_delete().) */
|
|
|
|
void *
|
|
|
|
ofpbuf_steal_data(struct ofpbuf *b)
|
|
|
|
{
|
|
|
|
void *p;
|
2014-03-20 11:00:14 -07:00
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
if (b->source == OFPBUF_MALLOC && b->data == b->base) {
|
|
|
|
p = b->data;
|
2011-03-11 11:52:49 -08:00
|
|
|
} else {
|
2015-03-02 17:29:44 -08:00
|
|
|
p = xmemdup(b->data, b->size);
|
2011-03-11 11:52:49 -08:00
|
|
|
if (b->source == OFPBUF_MALLOC) {
|
2015-03-02 17:29:44 -08:00
|
|
|
free(b->base);
|
2011-03-11 11:52:49 -08:00
|
|
|
}
|
|
|
|
}
|
2015-03-02 17:29:44 -08:00
|
|
|
b->base = NULL;
|
|
|
|
b->data = NULL;
|
2011-03-11 11:52:49 -08:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2010-02-11 13:56:45 -08:00
|
|
|
/* Returns a string that describes some of 'b''s metadata plus a hex dump of up
|
|
|
|
* to 'maxbytes' from the start of the buffer. */
|
|
|
|
char *
|
|
|
|
ofpbuf_to_string(const struct ofpbuf *b, size_t maxbytes)
|
|
|
|
{
|
|
|
|
struct ds s;
|
|
|
|
|
|
|
|
ds_init(&s);
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
ds_put_format(&s, "size=%"PRIu32", allocated=%"PRIu32", head=%"PRIuSIZE", tail=%"PRIuSIZE"\n",
|
2015-03-02 17:29:44 -08:00
|
|
|
b->size, b->allocated,
|
2010-02-11 13:56:45 -08:00
|
|
|
ofpbuf_headroom(b), ofpbuf_tailroom(b));
|
2015-03-02 17:29:44 -08:00
|
|
|
ds_put_hex_dump(&s, b->data, MIN(b->size, maxbytes), 0, false);
|
2010-02-11 13:56:45 -08:00
|
|
|
return ds_cstr(&s);
|
|
|
|
}
|
2010-12-06 10:03:31 -08:00
|
|
|
|
|
|
|
/* Removes each of the "struct ofpbuf"s on 'list' from the list and frees
|
|
|
|
* them. */
|
|
|
|
void
|
2014-12-15 14:10:38 +01:00
|
|
|
ofpbuf_list_delete(struct ovs_list *list)
|
2010-12-06 10:03:31 -08:00
|
|
|
{
|
2015-04-06 14:02:28 -07:00
|
|
|
struct ofpbuf *b;
|
2010-12-06 10:03:31 -08:00
|
|
|
|
2015-04-06 14:02:28 -07:00
|
|
|
LIST_FOR_EACH_POP (b, list_node, list) {
|
2010-12-06 10:03:31 -08:00
|
|
|
ofpbuf_delete(b);
|
|
|
|
}
|
|
|
|
}
|