From: Jarno Rajahalme Date: Tue, 25 Mar 2014 22:26:23 +0000 (-0700) Subject: lib/ofpbuf: Inline the trivial ofpbuf functions. X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d8b352b3e111615b0c1961704138748c6a71c204;p=sliver-openvswitch.git lib/ofpbuf: Inline the trivial ofpbuf functions. Inline the most trivial ofpbuf functions to allow for better optimization. Also inline the most often used ofpbuf_pull() and ofpbuf_try_pull(), which should help streamline packet parsing. Signed-off-by: Jarno Rajahalme Signed-off-by: Ben Pfaff --- diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index 3de8ca5e2..c0af06878 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -121,15 +121,6 @@ ofpbuf_uninit(struct ofpbuf *b) } } -/* Returns a pointer that may be passed to free() to accomplish the same thing - * as ofpbuf_uninit(b). The return value is a null pointer if ofpbuf_uninit() - * would not free any memory. */ -void * -ofpbuf_get_uninit_pointer(struct ofpbuf *b) -{ - return b && b->source == OFPBUF_MALLOC ? b->base : NULL; -} - /* Frees memory that 'b' points to and allocates a new ofpbuf */ void ofpbuf_reinit(struct ofpbuf *b, size_t size) @@ -217,34 +208,6 @@ ofpbuf_clone_data_with_headroom(const void *data, size_t size, size_t headroom) return b; } -/* Frees memory that 'b' points to, as well as 'b' itself. */ -void -ofpbuf_delete(struct ofpbuf *b) -{ - if (b) { - ofpbuf_uninit(b); - free(b); - } -} - -/* Returns the number of bytes of headroom in 'b', that is, the number of bytes - * of unused space in ofpbuf 'b' before the data that is in use. (Most - * commonly, the data in a ofpbuf is at its beginning, and thus the ofpbuf's - * headroom is 0.) */ -size_t -ofpbuf_headroom(const struct ofpbuf *b) -{ - return (char*)b->data - (char*)b->base; -} - -/* Returns the number of bytes that may be appended to the tail end of ofpbuf - * 'b' before the ofpbuf must be reallocated. */ -size_t -ofpbuf_tailroom(const struct ofpbuf *b) -{ - return (char*)ofpbuf_end(b) - (char*)ofpbuf_tail(b); -} - static void ofpbuf_copy__(struct ofpbuf *b, uint8_t *new_base, size_t new_headroom, size_t new_tailroom) @@ -505,67 +468,6 @@ ofpbuf_push(struct ofpbuf *b, const void *p, size_t size) return dst; } -/* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to - * byte 'offset'. Otherwise, returns a null pointer. */ -void * -ofpbuf_at(const struct ofpbuf *b, size_t offset, size_t size) -{ - return offset + size <= b->size ? (char *) b->data + offset : NULL; -} - -/* Returns a pointer to byte 'offset' in 'b', which must contain at least - * 'offset + size' bytes of data. */ -void * -ofpbuf_at_assert(const struct ofpbuf *b, size_t offset, size_t size) -{ - ovs_assert(offset + size <= b->size); - return ((char *) b->data) + offset; -} - -/* Returns the byte following the last byte of data in use in 'b'. */ -void * -ofpbuf_tail(const struct ofpbuf *b) -{ - return (char *) b->data + b->size; -} - -/* Returns the byte following the last byte allocated for use (but not - * necessarily in use) by 'b'. */ -void * -ofpbuf_end(const struct ofpbuf *b) -{ - return (char *) b->base + b->allocated; -} - -/* Clears any data from 'b'. */ -void -ofpbuf_clear(struct ofpbuf *b) -{ - b->data = b->base; - b->size = 0; -} - -/* Removes 'size' bytes from the head end of 'b', which must contain at least - * 'size' bytes of data. Returns the first byte of data removed. */ -void * -ofpbuf_pull(struct ofpbuf *b, size_t size) -{ - void *data = b->data; - ovs_assert(b->size >= size); - b->data = (char*)b->data + size; - b->size -= size; - return data; -} - -/* If 'b' has at least 'size' bytes of data, removes that many bytes from the - * head end of 'b' and returns the first byte removed. Otherwise, returns a - * null pointer without modifying 'b'. */ -void * -ofpbuf_try_pull(struct ofpbuf *b, size_t size) -{ - return b->size >= size ? ofpbuf_pull(b, size) : NULL; -} - /* 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().) */ diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h index ad37b5b4c..96b5479fd 100644 --- a/lib/ofpbuf.h +++ b/lib/ofpbuf.h @@ -61,7 +61,7 @@ void ofpbuf_use_const(struct ofpbuf *, const void *, size_t); void ofpbuf_init(struct ofpbuf *, size_t); void ofpbuf_uninit(struct ofpbuf *); -void *ofpbuf_get_uninit_pointer(struct ofpbuf *); +static inline void *ofpbuf_get_uninit_pointer(struct ofpbuf *); void ofpbuf_reinit(struct ofpbuf *, size_t); struct ofpbuf *ofpbuf_new(size_t); @@ -72,12 +72,14 @@ struct ofpbuf *ofpbuf_clone_with_headroom(const struct ofpbuf *, struct ofpbuf *ofpbuf_clone_data(const void *, size_t); struct ofpbuf *ofpbuf_clone_data_with_headroom(const void *, size_t, size_t headroom); -void ofpbuf_delete(struct ofpbuf *); +static inline void ofpbuf_delete(struct ofpbuf *); -void *ofpbuf_at(const struct ofpbuf *, size_t offset, size_t size); -void *ofpbuf_at_assert(const struct ofpbuf *, size_t offset, size_t size); -void *ofpbuf_tail(const struct ofpbuf *); -void *ofpbuf_end(const struct ofpbuf *); +static inline void *ofpbuf_at(const struct ofpbuf *, size_t offset, + size_t size); +static inline void *ofpbuf_at_assert(const struct ofpbuf *, size_t offset, + size_t size); +static inline void *ofpbuf_tail(const struct ofpbuf *); +static inline void *ofpbuf_end(const struct ofpbuf *); void *ofpbuf_put_uninit(struct ofpbuf *, size_t); void *ofpbuf_put_zeros(struct ofpbuf *, size_t); @@ -90,34 +92,127 @@ void *ofpbuf_push_uninit(struct ofpbuf *b, size_t); void *ofpbuf_push_zeros(struct ofpbuf *, size_t); void *ofpbuf_push(struct ofpbuf *b, const void *, size_t); -size_t ofpbuf_headroom(const struct ofpbuf *); -size_t ofpbuf_tailroom(const struct ofpbuf *); +static inline size_t ofpbuf_headroom(const struct ofpbuf *); +static inline size_t ofpbuf_tailroom(const struct ofpbuf *); void ofpbuf_prealloc_headroom(struct ofpbuf *, size_t); void ofpbuf_prealloc_tailroom(struct ofpbuf *, size_t); void ofpbuf_trim(struct ofpbuf *); void ofpbuf_padto(struct ofpbuf *, size_t); void ofpbuf_shift(struct ofpbuf *, int); -void ofpbuf_clear(struct ofpbuf *); -void *ofpbuf_pull(struct ofpbuf *, size_t); -void *ofpbuf_try_pull(struct ofpbuf *, size_t); +static inline void ofpbuf_clear(struct ofpbuf *); +static inline void *ofpbuf_pull(struct ofpbuf *, size_t); +static inline void *ofpbuf_try_pull(struct ofpbuf *, size_t); void *ofpbuf_steal_data(struct ofpbuf *); char *ofpbuf_to_string(const struct ofpbuf *, size_t maxbytes); +static inline struct ofpbuf *ofpbuf_from_list(const struct list *); +void ofpbuf_list_delete(struct list *); +static inline bool ofpbuf_equal(const struct ofpbuf *, const struct ofpbuf *); + + +/* Returns a pointer that may be passed to free() to accomplish the same thing + * as ofpbuf_uninit(b). The return value is a null pointer if ofpbuf_uninit() + * would not free any memory. */ +static inline void *ofpbuf_get_uninit_pointer(struct ofpbuf *b) +{ + /* XXX: If 'source' is OFPBUF_DPDK memory gets leaked! */ + return b && b->source == OFPBUF_MALLOC ? b->base : NULL; +} + +/* Frees memory that 'b' points to, as well as 'b' itself. */ +static inline void ofpbuf_delete(struct ofpbuf *b) +{ + if (b) { + ofpbuf_uninit(b); + free(b); + } +} + +/* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to + * byte 'offset'. Otherwise, returns a null pointer. */ +static inline void *ofpbuf_at(const struct ofpbuf *b, size_t offset, + size_t size) +{ + return offset + size <= b->size ? (char *) b->data + offset : NULL; +} + +/* Returns a pointer to byte 'offset' in 'b', which must contain at least + * 'offset + size' bytes of data. */ +static inline void *ofpbuf_at_assert(const struct ofpbuf *b, size_t offset, + size_t size) +{ + ovs_assert(offset + size <= b->size); + return ((char *) b->data) + offset; +} + +/* Returns the byte following the last byte of data in use in 'b'. */ +static inline void *ofpbuf_tail(const struct ofpbuf *b) +{ + return (char *) b->data + b->size; +} + +/* Returns the byte following the last byte allocated for use (but not + * necessarily in use) by 'b'. */ +static inline void *ofpbuf_end(const struct ofpbuf *b) +{ + return (char *) b->base + b->allocated; +} + +/* Returns the number of bytes of headroom in 'b', that is, the number of bytes + * of unused space in ofpbuf 'b' before the data that is in use. (Most + * commonly, the data in a ofpbuf is at its beginning, and thus the ofpbuf's + * headroom is 0.) */ +static inline size_t ofpbuf_headroom(const struct ofpbuf *b) +{ + return (char*)b->data - (char*)b->base; +} + +/* Returns the number of bytes that may be appended to the tail end of ofpbuf + * 'b' before the ofpbuf must be reallocated. */ +static inline size_t ofpbuf_tailroom(const struct ofpbuf *b) +{ + return (char*)ofpbuf_end(b) - (char*)ofpbuf_tail(b); +} + +/* Clears any data from 'b'. */ +static inline void ofpbuf_clear(struct ofpbuf *b) +{ + b->data = b->base; + b->size = 0; +} + +/* Removes 'size' bytes from the head end of 'b', which must contain at least + * 'size' bytes of data. Returns the first byte of data removed. */ +static inline void *ofpbuf_pull(struct ofpbuf *b, size_t size) +{ + void *data = b->data; + ovs_assert(b->size >= size); + b->data = (char*)b->data + size; + b->size -= size; + return data; +} + +/* If 'b' has at least 'size' bytes of data, removes that many bytes from the + * head end of 'b' and returns the first byte removed. Otherwise, returns a + * null pointer without modifying 'b'. */ +static inline void *ofpbuf_try_pull(struct ofpbuf *b, size_t size) +{ + return b->size >= size ? ofpbuf_pull(b, size) : NULL; +} static inline struct ofpbuf *ofpbuf_from_list(const struct list *list) { return CONTAINER_OF(list, struct ofpbuf, list_node); } -void ofpbuf_list_delete(struct list *); -static inline bool -ofpbuf_equal(const struct ofpbuf *a, const struct ofpbuf *b) +static inline bool ofpbuf_equal(const struct ofpbuf *a, const struct ofpbuf *b) { return a->size == b->size && memcmp(a->data, b->data, a->size) == 0; } + #ifdef __cplusplus } #endif