validation: buffer: split pool, buffer and packet tests

Split pools, buffers, packets tests into separate executables to make
them independent.

Alloc and free API functions are now part of corresponding event types:
buffers, packets, timeouts, etc. Hence remove them from pool tests.

Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
---
 test/validation/Makefile.am                   |  12 +-
 test/validation/buffer/odp_buffer_pool_test.c | 253 ----------
 test/validation/buffer/odp_buffer_test.c      |  56 ---
 test/validation/buffer/odp_buffer_tests.h     |  28 --
 test/validation/buffer/odp_packet_test.c      | 662 -------------------------
 test/validation/odp_buffer.c                  | 149 +++++-
 test/validation/odp_packet.c                  | 688 ++++++++++++++++++++++++++
 test/validation/odp_pool.c                    | 134 +++++
 test/validation/odp_timer.c                   |  77 +++
 9 files changed, 1044 insertions(+), 1015 deletions(-)
 delete mode 100644 test/validation/buffer/odp_buffer_pool_test.c
 delete mode 100644 test/validation/buffer/odp_buffer_test.c
 delete mode 100644 test/validation/buffer/odp_buffer_tests.h
 delete mode 100644 test/validation/buffer/odp_packet_test.c
 create mode 100644 test/validation/odp_packet.c
 create mode 100644 test/validation/odp_pool.c

On Fri, Feb 13, 2015 at 10:59 AM, Taras Kondratiuk <
taras.kondratiuk@linaro.org> wrote:

> Split pools, buffers, packets tests into separate executables to make
> them independent.
>
> Alloc and free API functions are now part of corresponding event types:
> buffers, packets, timeouts, etc. Hence remove them from pool tests.
>
> Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
>

Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>


> ---
>  test/validation/Makefile.am                   |  12 +-
>  test/validation/buffer/odp_buffer_pool_test.c | 253 ----------
>  test/validation/buffer/odp_buffer_test.c      |  56 ---
>  test/validation/buffer/odp_buffer_tests.h     |  28 --
>  test/validation/buffer/odp_packet_test.c      | 662
> -------------------------
>  test/validation/odp_buffer.c                  | 149 +++++-
>  test/validation/odp_packet.c                  | 688
> ++++++++++++++++++++++++++
>  test/validation/odp_pool.c                    | 134 +++++
>  test/validation/odp_timer.c                   |  77 +++
>  9 files changed, 1044 insertions(+), 1015 deletions(-)
>  delete mode 100644 test/validation/buffer/odp_buffer_pool_test.c
>  delete mode 100644 test/validation/buffer/odp_buffer_test.c
>  delete mode 100644 test/validation/buffer/odp_buffer_tests.h
>  delete mode 100644 test/validation/buffer/odp_packet_test.c
>  create mode 100644 test/validation/odp_packet.c
>  create mode 100644 test/validation/odp_pool.c
>
> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
> index f9d7d7a..a0823b6 100644
> --- a/test/validation/Makefile.am
> +++ b/test/validation/Makefile.am
> @@ -6,30 +6,28 @@ AM_LDFLAGS += -static
>  TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform}
>
>  if test_vald
> -TESTS = odp_init odp_init_abort odp_init_log odp_queue odp_crypto odp_shm
> odp_schedule odp_pktio_run odp_buffer odp_system odp_timer odp_time
> odp_synchronizers odp_classification
> +TESTS = odp_init odp_init_abort odp_init_log odp_queue odp_crypto odp_shm
> odp_schedule odp_pktio_run odp_pool odp_buffer odp_packet odp_system
> odp_timer odp_time odp_synchronizers odp_classification
>  endif
>
>  dist_bin_SCRIPTS = $(srcdir)/odp_pktio_run
>
> -bin_PROGRAMS = odp_init odp_init_abort odp_init_log odp_queue odp_crypto
> odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time
> odp_synchronizers odp_classification
> +bin_PROGRAMS = odp_init odp_init_abort odp_init_log odp_queue odp_crypto
> odp_shm odp_schedule odp_pktio odp_pool odp_buffer odp_packet odp_system
> odp_timer odp_time odp_synchronizers odp_classification
>  odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto
> -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer
>  odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification
>
>  dist_odp_init_SOURCES = odp_init.c
>  dist_odp_init_abort_SOURCES = odp_init_abort.c
>  dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c
>  dist_odp_queue_SOURCES = odp_queue.c common/odp_cunit_common.c
> +dist_odp_pool_SOURCES = odp_pool.c common/odp_cunit_common.c
>  dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \
>                           crypto/odp_crypto_test_sync_inp.c \
>                           crypto/odp_crypto_test_rng.c \
>                           odp_crypto.c common/odp_cunit_common.c
>  dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c
>  dist_odp_schedule_SOURCES = odp_schedule.c common/odp_cunit_common.c
> -dist_odp_buffer_SOURCES = buffer/odp_buffer_pool_test.c \
> -                         buffer/odp_buffer_test.c \
> -                         buffer/odp_packet_test.c \
> -                         odp_buffer.c common/odp_cunit_common.c
> +dist_odp_buffer_SOURCES = odp_buffer.c common/odp_cunit_common.c
> +dist_odp_packet_SOURCES = odp_packet.c common/odp_cunit_common.c
>  dist_odp_system_SOURCES = odp_system.c common/odp_cunit_common.c
>  dist_odp_timer_SOURCES = odp_timer.c common/odp_cunit_common.c
>  dist_odp_time_SOURCES = odp_time.c common/odp_cunit_common.c
> diff --git a/test/validation/buffer/odp_buffer_pool_test.c
> b/test/validation/buffer/odp_buffer_pool_test.c
> deleted file mode 100644
> index c018b59..0000000
> --- a/test/validation/buffer/odp_buffer_pool_test.c
> +++ /dev/null
> @@ -1,253 +0,0 @@
> -/* Copyright (c) 2014, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:    BSD-3-Clause
> - */
> -
> -#include "odp_buffer_tests.h"
> -
> -static int pool_name_number = 1;
> -static const int default_buffer_size = 1500;
> -static const int default_buffer_num = 1000;
> -
> -odp_pool_t pool_create(int buf_num, int buf_size, int buf_type)
> -{
> -       odp_pool_t pool;
> -       char pool_name[ODP_POOL_NAME_LEN];
> -       odp_pool_param_t params = {
> -                       .buf = {
> -                               .size  = buf_size,
> -                               .align = ODP_CACHE_LINE_SIZE,
> -                               .num   = buf_num,
> -                       },
> -                       .type = buf_type,
> -       };
> -
> -       snprintf(pool_name, sizeof(pool_name),
> -                "test_buffer_pool-%d", pool_name_number++);
> -
> -       pool = odp_pool_create(pool_name, ODP_SHM_INVALID, &params);
> -       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> -
> -       return pool;
> -}
> -
> -static void pool_create_destroy_type(int type)
> -{
> -       odp_pool_t pool;
> -       pool = pool_create(default_buffer_num, default_buffer_size, type);
> -
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -}
> -
> -static void pool_create_destroy_raw(void)
> -{
> -       pool_create_destroy_type(ODP_POOL_BUFFER);
> -}
> -
> -static void pool_create_destroy_packet(void)
> -{
> -       pool_create_destroy_type(ODP_POOL_PACKET);
> -}
> -
> -static void pool_create_destroy_timeout(void)
> -{
> -       pool_create_destroy_type(ODP_POOL_TIMEOUT);
> -}
> -
> -static void pool_create_destroy_raw_shm(void)
> -{
> -       odp_pool_t pool;
> -       odp_shm_t test_shm;
> -       odp_pool_param_t params = {
> -                       .buf = {
> -                               .size  = 1500,
> -                               .align = ODP_CACHE_LINE_SIZE,
> -                               .num   = 10,
> -                       },
> -                       .type  = ODP_POOL_BUFFER,
> -       };
> -
> -       test_shm = odp_shm_reserve("test_shm",
> -                                  params.buf.size * params.buf.num * 2,
> -                                  ODP_CACHE_LINE_SIZE,
> -                                  0);
> -       CU_ASSERT_FATAL(test_shm != ODP_SHM_INVALID);
> -
> -       pool = odp_pool_create("test_shm_pool", test_shm, &params);
> -       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> -
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -       CU_ASSERT(odp_shm_free(test_shm) == 0);
> -}
> -
> -static void pool_lookup_info_print(void)
> -{
> -       odp_pool_t pool;
> -       const char pool_name[] = "pool_for_lookup_test";
> -       odp_pool_info_t info;
> -       odp_pool_param_t params = {
> -                       .buf = {
> -                               .size  = default_buffer_size,
> -                               .align = ODP_CACHE_LINE_SIZE,
> -                               .num  = default_buffer_num,
> -                       },
> -                       .type  = ODP_POOL_BUFFER,
> -       };
> -
> -       pool = odp_pool_create(pool_name, ODP_SHM_INVALID, &params);
> -       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> -
> -       pool = odp_pool_lookup(pool_name);
> -       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> -
> -       CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0);
> -       CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0);
> -       CU_ASSERT(info.shm == ODP_SHM_INVALID);
> -       CU_ASSERT(params.buf.size <= info.params.buf.size);
> -       CU_ASSERT(params.buf.align <= info.params.buf.align);
> -       CU_ASSERT(params.buf.num <= info.params.buf.num);
> -       CU_ASSERT(params.type == info.params.type);
> -
> -       odp_pool_print(pool);
> -
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -}
> -
> -static void pool_alloc_type(int type)
> -{
> -       odp_pool_t pool;
> -       const int num = 3;
> -       const size_t size = 1500;
> -       odp_buffer_t buffer[num];
> -       odp_packet_t packet[num];
> -       odp_timeout_t tmo[num];
> -       odp_event_t ev;
> -       int index;
> -       char wrong_type = 0, wrong_size = 0;
> -
> -       pool = pool_create(num, size, type);
> -       odp_pool_print(pool);
> -
> -       /* Try to allocate num items from the pool */
> -       for (index = 0; index < num; index++) {
> -               switch (type) {
> -               case ODP_POOL_BUFFER:
> -                       buffer[index] = odp_buffer_alloc(pool);
> -
> -                       if (buffer[index] == ODP_BUFFER_INVALID)
> -                               break;
> -
> -                       ev = odp_buffer_to_event(buffer[index]);
> -                       if (odp_event_type(ev) != ODP_EVENT_BUFFER)
> -                               wrong_type = 1;
> -                       if (odp_buffer_size(buffer[index]) < size)
> -                               wrong_size = 1;
> -                       if (wrong_type || wrong_size)
> -                               odp_buffer_print(buffer[index]);
> -                       break;
> -               case ODP_POOL_PACKET:
> -                       packet[index] = odp_packet_alloc(pool, size);
> -
> -                       if (packet[index] == ODP_PACKET_INVALID)
> -                               break;
> -
> -                       ev = odp_packet_to_event(packet[index]);
> -                       if (odp_event_type(ev) != ODP_EVENT_PACKET)
> -                               wrong_type = 1;
> -                       break;
> -               case ODP_POOL_TIMEOUT:
> -                       tmo[index] = odp_timeout_alloc(pool);
> -
> -                       if (tmo[index] == ODP_TIMEOUT_INVALID)
> -                               break;
> -
> -                       ev = odp_timeout_to_event(tmo[index]);
> -                       if (odp_event_type(ev) != ODP_EVENT_TIMEOUT)
> -                               wrong_type = 1;
> -                       break;
> -               default:
> -                       break;
> -               }
> -
> -       }
> -
> -       /* Check that the pool had at least num items */
> -       CU_ASSERT(index == num);
> -       /* index points out of buffer[] or it point to an invalid buffer */
> -       index--;
> -
> -       /* Check that the pool had correct buffers */
> -       CU_ASSERT(wrong_type == 0);
> -       CU_ASSERT(wrong_size == 0);
> -
> -       switch (type) {
> -       case ODP_POOL_BUFFER:
> -               for (; index >= 0; index--)
> -                       odp_buffer_free(buffer[index]);
> -               break;
> -       case ODP_POOL_PACKET:
> -               for (; index >= 0; index--)
> -                       odp_packet_free(packet[index]);
> -               break;
> -       case ODP_POOL_TIMEOUT:
> -               for (; index >= 0; index--)
> -                       odp_timeout_free(tmo[index]);
> -               break;
> -       default:
> -               break;
> -       }
> -
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -}
> -
> -static void pool_alloc_buffer_raw(void)
> -{
> -       pool_alloc_type(ODP_POOL_BUFFER);
> -}
> -
> -static void pool_alloc_buffer_packet(void)
> -{
> -       pool_alloc_type(ODP_POOL_PACKET);
> -}
> -
> -static void pool_alloc_buffer_timeout(void)
> -{
> -       pool_alloc_type(ODP_POOL_TIMEOUT);
> -}
> -
> -static void pool_free_buffer(void)
> -{
> -       odp_pool_t pool;
> -       odp_buffer_t buffer;
> -       pool = pool_create(1, 64, ODP_POOL_BUFFER);
> -
> -       /* Allocate the only buffer from the pool */
> -       buffer = odp_buffer_alloc(pool);
> -       CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID);
> -
> -       /** @todo: is it correct to assume the pool had only one buffer? */
> -       CU_ASSERT_FATAL(odp_buffer_alloc(pool) == ODP_BUFFER_INVALID)
> -
> -       odp_buffer_free(buffer);
> -
> -       /* Check that the buffer was returned back to the pool */
> -       buffer = odp_buffer_alloc(pool);
> -       CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID);
> -
> -       odp_buffer_free(buffer);
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -}
> -
> -CU_TestInfo buffer_pool_tests[] = {
> -       _CU_TEST_INFO(pool_create_destroy_raw),
> -       _CU_TEST_INFO(pool_create_destroy_packet),
> -       _CU_TEST_INFO(pool_create_destroy_timeout),
> -       _CU_TEST_INFO(pool_create_destroy_raw_shm),
> -       _CU_TEST_INFO(pool_lookup_info_print),
> -       _CU_TEST_INFO(pool_alloc_buffer_raw),
> -       _CU_TEST_INFO(pool_alloc_buffer_packet),
> -       _CU_TEST_INFO(pool_alloc_buffer_timeout),
> -       _CU_TEST_INFO(pool_free_buffer),
> -       CU_TEST_INFO_NULL,
> -};
> diff --git a/test/validation/buffer/odp_buffer_test.c
> b/test/validation/buffer/odp_buffer_test.c
> deleted file mode 100644
> index 4c12681..0000000
> --- a/test/validation/buffer/odp_buffer_test.c
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -/* Copyright (c) 2014, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:    BSD-3-Clause
> - */
> -
> -#include "odp_buffer_tests.h"
> -
> -static odp_pool_t raw_pool;
> -static odp_buffer_t raw_buffer = ODP_BUFFER_INVALID;
> -static const size_t raw_buffer_size = 1500;
> -
> -int buffer_testsuite_init(void)
> -{
> -       odp_pool_param_t params = {
> -                       .buf = {
> -                               .size  = raw_buffer_size,
> -                               .align = ODP_CACHE_LINE_SIZE,
> -                               .num   = 100,
> -                       },
> -                       .type  = ODP_POOL_BUFFER,
> -       };
> -
> -       raw_pool = odp_pool_create("raw_pool", ODP_SHM_INVALID, &params);
> -       if (raw_pool == ODP_POOL_INVALID)
> -               return -1;
> -       raw_buffer = odp_buffer_alloc(raw_pool);
> -       if (raw_buffer == ODP_BUFFER_INVALID)
> -               return -1;
> -       return 0;
> -}
> -
> -int buffer_testsuite_finalize(void)
> -{
> -       odp_buffer_free(raw_buffer);
> -       if (odp_pool_destroy(raw_pool) != 0)
> -               return -1;
> -       return 0;
> -}
> -
> -static void buffer_management_basic(void)
> -{
> -       odp_event_t ev = odp_buffer_to_event(raw_buffer);
> -
> -       CU_ASSERT(odp_buffer_is_valid(raw_buffer) == 1);
> -       CU_ASSERT(odp_buffer_pool(raw_buffer) != ODP_POOL_INVALID);
> -       CU_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER);
> -       CU_ASSERT(odp_buffer_size(raw_buffer) >= raw_buffer_size);
> -       CU_ASSERT(odp_buffer_addr(raw_buffer) != NULL);
> -       odp_buffer_print(raw_buffer);
> -}
> -
> -CU_TestInfo buffer_tests[] = {
> -       _CU_TEST_INFO(buffer_management_basic),
> -       CU_TEST_INFO_NULL,
> -};
> diff --git a/test/validation/buffer/odp_buffer_tests.h
> b/test/validation/buffer/odp_buffer_tests.h
> deleted file mode 100644
> index fbdcbf7..0000000
> --- a/test/validation/buffer/odp_buffer_tests.h
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -/* Copyright (c) 2014, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:    BSD-3-Clause
> - */
> -
> -#ifndef ODP_BUFFER_TESTS_H_
> -#define ODP_BUFFER_TESTS_H_
> -
> -#include <odp.h>
> -#include "odp_cunit_common.h"
> -
> -/* Helper macro for CU_TestInfo initialization */
> -#define _CU_TEST_INFO(test_func) {#test_func, test_func}
> -
> -extern CU_TestInfo buffer_pool_tests[];
> -extern CU_TestInfo buffer_tests[];
> -extern CU_TestInfo packet_tests[];
> -
> -extern int buffer_testsuite_init(void);
> -extern int buffer_testsuite_finalize(void);
> -
> -extern int packet_testsuite_init(void);
> -extern int packet_testsuite_finalize(void);
> -
> -odp_pool_t pool_create(int buf_num, int buf_size, int buf_type);
> -
> -#endif /* ODP_BUFFER_TESTS_H_ */
> diff --git a/test/validation/buffer/odp_packet_test.c
> b/test/validation/buffer/odp_packet_test.c
> deleted file mode 100644
> index b8995f7..0000000
> --- a/test/validation/buffer/odp_packet_test.c
> +++ /dev/null
> @@ -1,662 +0,0 @@
> -/* Copyright (c) 2014, Linaro Limited
> - * All rights reserved.
> - *
> - * SPDX-License-Identifier:    BSD-3-Clause
> - */
> -
> -#include "odp_buffer_tests.h"
> -#include <stdlib.h>
> -
> -#define PACKET_BUF_LEN ODP_CONFIG_PACKET_BUF_LEN_MIN
> -/* Reserve some tailroom for tests */
> -#define PACKET_TAILROOM_RESERVE  4
> -
> -static odp_pool_t packet_pool;
> -static const uint32_t packet_len = PACKET_BUF_LEN -
> -                               ODP_CONFIG_PACKET_HEADROOM -
> -                               ODP_CONFIG_PACKET_TAILROOM -
> -                               PACKET_TAILROOM_RESERVE;
> -
> -odp_packet_t test_packet;
> -
> -int packet_testsuite_init(void)
> -{
> -       odp_pool_param_t params = {
> -               .buf = {
> -                       .size  = PACKET_BUF_LEN,
> -                       .align = ODP_CACHE_LINE_SIZE,
> -                       .num  = 100,
> -               },
> -               .type  = ODP_POOL_PACKET,
> -       };
> -
> -       packet_pool = odp_pool_create("packet_pool", ODP_SHM_INVALID,
> &params);
> -       if (packet_pool == ODP_POOL_INVALID)
> -               return -1;
> -
> -       test_packet = odp_packet_alloc(packet_pool, packet_len);
> -       if (odp_packet_is_valid(test_packet) == 0)
> -               return -1;
> -
> -       return 0;
> -}
> -
> -int packet_testsuite_finalize(void)
> -{
> -       odp_packet_free(test_packet);
> -       if (odp_pool_destroy(packet_pool) != 0)
> -               return -1;
> -       return 0;
> -}
> -
> -static void packet_alloc_free(void)
> -{
> -       odp_pool_t pool;
> -       odp_packet_t packet;
> -       pool = pool_create(1, PACKET_BUF_LEN, ODP_POOL_PACKET);
> -
> -       /* Allocate the only buffer from the pool */
> -       packet = odp_packet_alloc(pool, packet_len);
> -       CU_ASSERT_FATAL(packet != ODP_PACKET_INVALID);
> -       CU_ASSERT(odp_packet_len(packet) == packet_len);
> -       /** @todo: is it correct to assume the pool had only one buffer? */
> -       CU_ASSERT_FATAL(odp_packet_alloc(pool, packet_len) ==
> ODP_PACKET_INVALID)
> -
> -       odp_packet_free(packet);
> -
> -       /* Check that the buffer was returned back to the pool */
> -       packet = odp_packet_alloc(pool, packet_len);
> -       CU_ASSERT_FATAL(packet != ODP_PACKET_INVALID);
> -       CU_ASSERT(odp_packet_len(packet) == packet_len);
> -
> -       odp_packet_free(packet);
> -       CU_ASSERT(odp_pool_destroy(pool) == 0);
> -}
> -
> -static void packet_alloc_segmented(void)
> -{
> -       odp_packet_t pkt;
> -       const uint32_t len = ODP_CONFIG_PACKET_BUF_LEN_MAX -
> -                       ODP_CONFIG_PACKET_HEADROOM -
> -                       ODP_CONFIG_PACKET_TAILROOM;
> -
> -       pkt = odp_packet_alloc(packet_pool, len);
> -       CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
> -       CU_ASSERT(odp_packet_len(pkt) == len);
> -       odp_packet_free(pkt);
> -}
> -
> -static void packet_event_conversion(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       odp_packet_t tmp_pkt;
> -       odp_event_t ev;
> -
> -       ev = odp_packet_to_event(pkt);
> -       CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID);
> -       CU_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET);
> -
> -       tmp_pkt = odp_packet_from_event(ev);
> -       CU_ASSERT_FATAL(tmp_pkt != ODP_PACKET_INVALID);
> -       /** @todo: Need an API to compare packets */
> -}
> -
> -static void packet_basic_metadata(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       CU_ASSERT(odp_packet_head(pkt) != NULL);
> -       CU_ASSERT(odp_packet_data(pkt) != NULL);
> -
> -       CU_ASSERT(odp_packet_pool(pkt) != ODP_POOL_INVALID);
> -       /* Packet was allocated by application so shouldn't have valid
> pktio. */
> -       CU_ASSERT(odp_packet_input(pkt) == ODP_PKTIO_INVALID);
> -}
> -
> -static void packet_length(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       uint32_t buf_len, headroom, tailroom;
> -
> -       buf_len = odp_packet_buf_len(pkt);
> -       headroom = odp_packet_headroom(pkt);
> -       tailroom = odp_packet_tailroom(pkt);
> -
> -       CU_ASSERT(odp_packet_len(pkt) == packet_len);
> -#if ODP_CONFIG_PACKET_HEADROOM != 0 /* Avoid 'always true' warning */
> -       CU_ASSERT(headroom >= ODP_CONFIG_PACKET_HEADROOM);
> -#endif
> -#if ODP_CONFIG_PACKET_TAILROOM != 0 /* Avoid 'always true' warning */
> -       CU_ASSERT(tailroom >= ODP_CONFIG_PACKET_TAILROOM);
> -#endif
> -       CU_ASSERT(buf_len >= packet_len + headroom + tailroom);
> -}
> -
> -static void packet_debug(void)
> -{
> -       CU_ASSERT(odp_packet_is_valid(test_packet) == 1);
> -       odp_packet_print(test_packet);
> -}
> -
> -static void packet_context(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       char ptr_test_value = 2;
> -       uint64_t u64_test_value = 0x0123456789abcdf;
> -
> -       void *prev_ptr;
> -       uint64_t prev_u64;
> -
> -       prev_ptr = odp_packet_user_ptr(pkt);
> -       odp_packet_user_ptr_set(pkt, &ptr_test_value);
> -       CU_ASSERT(odp_packet_user_ptr(pkt) == &ptr_test_value);
> -       odp_packet_user_ptr_set(pkt, prev_ptr);
> -
> -       prev_u64 = odp_packet_user_u64(pkt);
> -       odp_packet_user_u64_set(pkt, u64_test_value);
> -       CU_ASSERT(odp_packet_user_u64(pkt) == u64_test_value);
> -       odp_packet_user_u64_set(pkt, prev_u64);
> -
> -       odp_packet_reset(pkt, packet_len);
> -}
> -
> -static void packet_layer_offsets(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       uint8_t *l2_addr, *l3_addr, *l4_addr;
> -       uint32_t seg_len;
> -       const uint32_t l2_off = 2;
> -       const uint32_t l3_off = l2_off + 14;
> -       const uint32_t l4_off = l3_off + 14;
> -       int ret;
> -
> -       /* Set offsets to the same value */
> -       ret = odp_packet_l2_offset_set(pkt, l2_off);
> -       CU_ASSERT(ret == 0);
> -       ret = odp_packet_l3_offset_set(pkt, l2_off);
> -       CU_ASSERT(ret == 0);
> -       ret = odp_packet_l4_offset_set(pkt, l2_off);
> -       CU_ASSERT(ret == 0);
> -
> -       /* Addresses should be the same */
> -       l2_addr = odp_packet_l2_ptr(pkt, &seg_len);
> -       CU_ASSERT(seg_len != 0);
> -       l3_addr = odp_packet_l3_ptr(pkt, &seg_len);
> -       CU_ASSERT(seg_len != 0);
> -       l4_addr = odp_packet_l4_ptr(pkt, &seg_len);
> -       CU_ASSERT(seg_len != 0);
> -       CU_ASSERT(l2_addr != NULL);
> -       CU_ASSERT(l2_addr == l3_addr);
> -       CU_ASSERT(l2_addr == l4_addr);
> -
> -       /* Set offsets to the different values */
> -       odp_packet_l2_offset_set(pkt, l2_off);
> -       CU_ASSERT(odp_packet_l2_offset(pkt) == l2_off);
> -       odp_packet_l3_offset_set(pkt, l3_off);
> -       CU_ASSERT(odp_packet_l3_offset(pkt) == l3_off);
> -       odp_packet_l4_offset_set(pkt, l4_off);
> -       CU_ASSERT(odp_packet_l4_offset(pkt) == l4_off);
> -
> -       /* Addresses should not be the same */
> -       l2_addr = odp_packet_l2_ptr(pkt, NULL);
> -       CU_ASSERT(l2_addr != NULL);
> -       l3_addr = odp_packet_l3_ptr(pkt, NULL);
> -       CU_ASSERT(l3_addr != NULL);
> -       l4_addr = odp_packet_l4_ptr(pkt, NULL);
> -       CU_ASSERT(l4_addr != NULL);
> -
> -       CU_ASSERT(l2_addr != l3_addr);
> -       CU_ASSERT(l2_addr != l4_addr);
> -       CU_ASSERT(l3_addr != l4_addr);
> -}
> -
> -static void _verify_headroom_shift(odp_packet_t packet,
> -                                  int shift)
> -{
> -       uint32_t room = odp_packet_headroom(packet);
> -       uint32_t seg_data_len = odp_packet_seg_len(packet);
> -       uint32_t pkt_data_len = odp_packet_len(packet);
> -       void *data;
> -       char *data_orig = odp_packet_data(packet);
> -       char *head_orig = odp_packet_head(packet);
> -
> -       if (shift >= 0)
> -               data = odp_packet_push_head(packet, shift);
> -       else
> -               data = odp_packet_pull_head(packet, -shift);
> -
> -       CU_ASSERT(data != NULL);
> -       CU_ASSERT(odp_packet_headroom(packet) == room - shift);
> -       CU_ASSERT(odp_packet_seg_len(packet) == seg_data_len + shift);
> -       CU_ASSERT(odp_packet_len(packet) == pkt_data_len + shift);
> -       CU_ASSERT(odp_packet_data(packet) == data);
> -       CU_ASSERT(odp_packet_head(packet) == head_orig);
> -       CU_ASSERT(data == data_orig - shift);
> -}
> -
> -static void packet_headroom(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       uint32_t room;
> -       uint32_t seg_data_len;
> -       uint32_t push_val, pull_val;
> -
> -       room = odp_packet_headroom(pkt);
> -
> -#if ODP_CONFIG_PACKET_HEADROOM != 0 /* Avoid 'always true' warning */
> -       CU_ASSERT(room >= ODP_CONFIG_PACKET_HEADROOM);
> -#endif
> -       seg_data_len = odp_packet_seg_len(pkt);
> -       CU_ASSERT(seg_data_len >= 1);
> -       /** @todo: should be len - 1 */
> -       pull_val = seg_data_len / 2;
> -       push_val = room;
> -
> -       _verify_headroom_shift(pkt, -pull_val);
> -       _verify_headroom_shift(pkt, push_val + pull_val);
> -       _verify_headroom_shift(pkt, -push_val);
> -       _verify_headroom_shift(pkt, 0);
> -}
> -
> -static void _verify_tailroom_shift(odp_packet_t pkt,
> -                                  int shift)
> -{
> -       odp_packet_seg_t seg;
> -       uint32_t room;
> -       uint32_t seg_data_len, pkt_data_len;
> -       void *tail;
> -       char *tail_orig;
> -
> -       room = odp_packet_tailroom(pkt);
> -       pkt_data_len = odp_packet_len(pkt);
> -       tail_orig = odp_packet_tail(pkt);
> -
> -       seg = odp_packet_last_seg(pkt);
> -       CU_ASSERT(seg != ODP_PACKET_SEG_INVALID);
> -       seg_data_len = odp_packet_seg_data_len(pkt, seg);
> -
> -       if (shift >= 0) {
> -               uint32_t l2_off, l3_off, l4_off;
> -               l2_off = odp_packet_l2_offset(pkt);
> -               l3_off = odp_packet_l3_offset(pkt);
> -               l4_off = odp_packet_l4_offset(pkt);
> -
> -               tail = odp_packet_push_tail(pkt, shift);
> -
> -               CU_ASSERT(l2_off == odp_packet_l2_offset(pkt));
> -               CU_ASSERT(l3_off == odp_packet_l3_offset(pkt));
> -               CU_ASSERT(l4_off == odp_packet_l4_offset(pkt));
> -       } else {
> -               tail = odp_packet_pull_tail(pkt, -shift);
> -       }
> -
> -       CU_ASSERT(tail != NULL);
> -       CU_ASSERT(odp_packet_seg_data_len(pkt, seg) == seg_data_len +
> shift);
> -       CU_ASSERT(odp_packet_len(pkt) == pkt_data_len + shift);
> -       CU_ASSERT(odp_packet_tailroom(pkt) == room - shift);
> -       if (room == 0 || (room - shift) == 0)
> -               return;
> -       if (shift >= 0) {
> -               CU_ASSERT(odp_packet_tail(pkt) == tail_orig + shift);
> -               CU_ASSERT(tail == tail_orig);
> -       } else {
> -               CU_ASSERT(odp_packet_tail(pkt) == tail);
> -               CU_ASSERT(tail == tail_orig + shift);
> -       }
> -}
> -
> -static void packet_tailroom(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       odp_packet_seg_t segment;
> -       uint32_t room;
> -       uint32_t seg_data_len;
> -       uint32_t push_val, pull_val;
> -
> -       segment = odp_packet_last_seg(pkt);
> -       CU_ASSERT(segment != ODP_PACKET_SEG_INVALID);
> -       room = odp_packet_tailroom(pkt);
> -#if ODP_CONFIG_PACKET_TAILROOM != 0 /* Avoid 'always true' warning */
> -       CU_ASSERT(room >= ODP_CONFIG_PACKET_TAILROOM);
> -#endif
> -       seg_data_len = odp_packet_seg_data_len(pkt, segment);
> -       CU_ASSERT(seg_data_len >= 1);
> -       /** @todo: should be len - 1 */
> -       pull_val = seg_data_len / 2;
> -       /* Leave one byte in a tailroom for odp_packet_tail() to succeed */
> -       push_val = (room > 0) ? room - 1 : room;
> -
> -       _verify_tailroom_shift(pkt, -pull_val);
> -       _verify_tailroom_shift(pkt, push_val + pull_val);
> -       _verify_tailroom_shift(pkt, -push_val);
> -       _verify_tailroom_shift(pkt, 0);
> -}
> -
> -static void packet_segments(void)
> -{
> -       int num_segs, seg_index;
> -       uint32_t data_len, buf_len;
> -       odp_packet_seg_t seg;
> -       odp_packet_t pkt = test_packet;
> -
> -       CU_ASSERT(odp_packet_is_valid(pkt) == 1);
> -
> -       num_segs = odp_packet_num_segs(pkt);
> -       CU_ASSERT(num_segs != 0);
> -
> -       if (odp_packet_is_segmented(pkt)) {
> -               CU_ASSERT(num_segs > 1);
> -       } else {
> -               CU_ASSERT(num_segs == 1);
> -       }
> -
> -
> -       seg = odp_packet_first_seg(pkt);
> -       buf_len = 0;
> -       data_len = 0;
> -       seg_index = 0;
> -       while (seg_index < num_segs && seg != ODP_PACKET_SEG_INVALID) {
> -               uint32_t seg_data_len, seg_buf_len;
> -               void *seg_buf_addr, *seg_data;
> -
> -               seg_buf_addr = odp_packet_seg_buf_addr(pkt, seg);
> -               seg_buf_len  = odp_packet_seg_buf_len(pkt, seg);
> -               seg_data_len = odp_packet_seg_data_len(pkt, seg);
> -               seg_data     = odp_packet_seg_data(pkt, seg);
> -
> -               CU_ASSERT(seg_buf_len > 0);
> -               CU_ASSERT(seg_data_len > 0);
> -               CU_ASSERT(seg_buf_len >= seg_data_len);
> -               CU_ASSERT(seg_data != NULL);
> -               CU_ASSERT(seg_buf_addr != NULL);
> -               CU_ASSERT(seg_data >= seg_buf_addr);
> -
> -               buf_len += seg_buf_len;
> -               data_len += seg_data_len;
> -
> -               /** @todo: touch memory in a segment */
> -               seg_index++;
> -               seg = odp_packet_next_seg(pkt, seg);
> -       }
> -
> -       CU_ASSERT(seg_index == num_segs);
> -       CU_ASSERT(buf_len == odp_packet_buf_len(pkt));
> -       CU_ASSERT(data_len == odp_packet_len(pkt));
> -
> -       if (seg_index == num_segs)
> -               CU_ASSERT(seg == ODP_PACKET_SEG_INVALID);
> -}
> -
> -static void packet_segment_last(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       odp_packet_seg_t seg;
> -
> -       seg = odp_packet_last_seg(pkt);
> -       CU_ASSERT_FATAL(seg != ODP_PACKET_SEG_INVALID);
> -
> -       seg = odp_packet_next_seg(pkt, seg);
> -       CU_ASSERT(seg == ODP_PACKET_SEG_INVALID);
> -}
> -
> -#define TEST_INFLAG(packet, flag) \
> -do { \
> -       odp_packet_has_##flag##_set(packet, 0);           \
> -       CU_ASSERT(odp_packet_has_##flag(packet) == 0);    \
> -       odp_packet_has_##flag##_set(packet, 1);           \
> -       CU_ASSERT(odp_packet_has_##flag(packet) == 1);    \
> -} while (0)
> -
> -static void packet_in_flags(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -
> -       TEST_INFLAG(pkt, l2);
> -       TEST_INFLAG(pkt, l3);
> -       TEST_INFLAG(pkt, l4);
> -       TEST_INFLAG(pkt, eth);
> -       TEST_INFLAG(pkt, jumbo);
> -       TEST_INFLAG(pkt, vlan);
> -       TEST_INFLAG(pkt, vlan_qinq);
> -       TEST_INFLAG(pkt, arp);
> -       TEST_INFLAG(pkt, ipv4);
> -       TEST_INFLAG(pkt, ipv6);
> -       TEST_INFLAG(pkt, ipfrag);
> -       TEST_INFLAG(pkt, ipopt);
> -       TEST_INFLAG(pkt, ipsec);
> -       TEST_INFLAG(pkt, udp);
> -       TEST_INFLAG(pkt, tcp);
> -       TEST_INFLAG(pkt, sctp);
> -       TEST_INFLAG(pkt, icmp);
> -}
> -
> -static void packet_error_flags(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       int err;
> -
> -       /**
> -        * The packet have not been classified so it doesn't have error
> flag
> -        * properly set. Just check that function return one of allowed
> values.
> -        * @todo: check classified packet when classifier is added in
> place.
> -        */
> -       err = odp_packet_has_error(pkt);
> -       CU_ASSERT(err == 0 || err == 1);
> -}
> -
> -struct packet_metadata {
> -       uint32_t l2_off;
> -       uint32_t l3_off;
> -       uint32_t l4_off;
> -       void *usr_ptr;
> -       uint64_t usr_u64;
> -};
> -
> -static void packet_add_rem_data(void)
> -{
> -       odp_packet_t pkt, new_pkt;
> -       uint32_t pkt_len, offset, add_len;
> -       void *usr_ptr;
> -       uint64_t usr_u64;
> -
> -       pkt = odp_packet_alloc(packet_pool, PACKET_BUF_LEN);
> -       CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
> -
> -       pkt_len = odp_packet_len(pkt);
> -       usr_ptr = odp_packet_user_ptr(pkt);
> -       usr_u64 = odp_packet_user_u64(pkt);
> -       /* Insert one more packet length in the middle of a packet */
> -       offset = pkt_len / 2;
> -       add_len = pkt_len;
> -
> -       new_pkt = odp_packet_add_data(pkt, offset, add_len);
> -       CU_ASSERT(new_pkt != ODP_PACKET_INVALID);
> -       if (new_pkt == ODP_PACKET_INVALID)
> -               goto free_packet;
> -       CU_ASSERT(odp_packet_len(new_pkt) == pkt_len + add_len);
> -       /* Verify that user metadata is preserved */
> -       CU_ASSERT(odp_packet_user_ptr(new_pkt) == usr_ptr);
> -       CU_ASSERT(odp_packet_user_u64(new_pkt) == usr_u64);
> -
> -       pkt = new_pkt;
> -
> -       pkt_len = odp_packet_len(pkt);
> -       usr_ptr = odp_packet_user_ptr(pkt);
> -       usr_u64 = odp_packet_user_u64(pkt);
> -       new_pkt = odp_packet_rem_data(pkt, offset, add_len);
> -       CU_ASSERT(new_pkt != ODP_PACKET_INVALID);
> -       if (new_pkt == ODP_PACKET_INVALID)
> -               goto free_packet;
> -       CU_ASSERT(odp_packet_len(new_pkt) == pkt_len - add_len);
> -       CU_ASSERT(odp_packet_user_ptr(new_pkt) == usr_ptr);
> -       CU_ASSERT(odp_packet_user_u64(new_pkt) == usr_u64);
> -       pkt = new_pkt;
> -
> -free_packet:
> -       odp_packet_free(pkt);
> -}
> -
> -
> -#define COMPARE_INFLAG(p1, p2, flag) \
> -       CU_ASSERT(odp_packet_has_##flag(p1) == odp_packet_has_##flag(p2))
> -
> -static void _packet_compare_inflags(odp_packet_t pkt1, odp_packet_t pkt2)
> -{
> -       COMPARE_INFLAG(pkt1, pkt2, l2);
> -       COMPARE_INFLAG(pkt1, pkt2, l3);
> -       COMPARE_INFLAG(pkt1, pkt2, l4);
> -       COMPARE_INFLAG(pkt1, pkt2, eth);
> -       COMPARE_INFLAG(pkt1, pkt2, jumbo);
> -       COMPARE_INFLAG(pkt1, pkt2, eth);
> -       COMPARE_INFLAG(pkt1, pkt2, vlan);
> -       COMPARE_INFLAG(pkt1, pkt2, vlan_qinq);
> -       COMPARE_INFLAG(pkt1, pkt2, arp);
> -       COMPARE_INFLAG(pkt1, pkt2, ipv4);
> -       COMPARE_INFLAG(pkt1, pkt2, ipv6);
> -       COMPARE_INFLAG(pkt1, pkt2, ipfrag);
> -       COMPARE_INFLAG(pkt1, pkt2, ipopt);
> -       COMPARE_INFLAG(pkt1, pkt2, ipsec);
> -       COMPARE_INFLAG(pkt1, pkt2, udp);
> -       COMPARE_INFLAG(pkt1, pkt2, tcp);
> -       COMPARE_INFLAG(pkt1, pkt2, sctp);
> -       COMPARE_INFLAG(pkt1, pkt2, icmp);
> -}
> -
> -static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2)
> -{
> -       uint32_t len = odp_packet_len(pkt1);
> -       uint32_t offset = 0;
> -       uint32_t seglen1, seglen2, cmplen;
> -
> -       CU_ASSERT_FATAL(len == odp_packet_len(pkt2));
> -
> -       while (len > 0) {
> -               void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1,
> NULL);
> -               void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2,
> NULL);
> -
> -               CU_ASSERT_FATAL(pkt1map != NULL);
> -               CU_ASSERT_FATAL(pkt2map != NULL);
> -               cmplen = seglen1 < seglen2 ? seglen1 : seglen2;
> -               CU_ASSERT(!memcmp(pkt1map, pkt2map, cmplen));
> -
> -               offset += cmplen;
> -               len    -= cmplen;
> -       }
> -}
> -
> -static void packet_copy(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       odp_packet_t pkt_copy;
> -       odp_pool_t pool;
> -
> -       /** @todo: fill original packet with some data */
> -       pool = odp_packet_pool(pkt);
> -       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> -       pkt_copy = odp_packet_copy(pkt, odp_packet_pool(pkt));
> -       CU_ASSERT_FATAL(pkt_copy != ODP_PACKET_INVALID);
> -
> -       CU_ASSERT(odp_packet_len(pkt) == odp_packet_len(pkt_copy));
> -
> -       _packet_compare_inflags(pkt, pkt_copy);
> -       _packet_compare_data(pkt, pkt_copy);
> -       odp_packet_free(pkt_copy);
> -}
> -
> -static void packet_copydata(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       uint32_t pkt_len = odp_packet_len(pkt);
> -       uint8_t *data_buf;
> -       uint32_t i;
> -       int correct_memory;
> -
> -       CU_ASSERT_FATAL(pkt_len > 0);
> -
> -       data_buf = malloc(pkt_len);
> -       CU_ASSERT_FATAL(data_buf != NULL);
> -
> -       for (i = 0; i < pkt_len; i++)
> -               data_buf[i] = (uint8_t)i;
> -
> -       CU_ASSERT(!odp_packet_copydata_in(pkt, 0, pkt_len, data_buf));
> -       memset(data_buf, 0, pkt_len);
> -       CU_ASSERT(!odp_packet_copydata_out(pkt, 0, pkt_len, data_buf));
> -
> -       correct_memory = 1;
> -       for (i = 0; i < pkt_len; i++)
> -               if (data_buf[i] != (uint8_t)i) {
> -                       correct_memory = 0;
> -                       break;
> -               }
> -       CU_ASSERT(correct_memory);
> -
> -       free(data_buf);
> -}
> -
> -static void packet_offset(void)
> -{
> -       odp_packet_t pkt = test_packet;
> -       uint32_t seg_len, full_seg_len;
> -       odp_packet_seg_t seg;
> -       uint8_t *ptr, *start_ptr;
> -       uint32_t offset;
> -
> -       ptr = odp_packet_offset(pkt, 0, &seg_len, &seg);
> -       CU_ASSERT(seg != ODP_PACKET_SEG_INVALID);
> -       CU_ASSERT(seg_len > 1);
> -       CU_ASSERT(seg_len == odp_packet_seg_len(pkt));
> -       CU_ASSERT(seg_len == odp_packet_seg_data_len(pkt, seg));
> -       CU_ASSERT(ptr != NULL);
> -       CU_ASSERT(ptr == odp_packet_data(pkt));
> -       CU_ASSERT(ptr == odp_packet_seg_data(pkt, seg));
> -
> -       /* Query a second byte */
> -       start_ptr = ptr;
> -       full_seg_len = seg_len;
> -       offset = 1;
> -
> -       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> -       CU_ASSERT(ptr != NULL);
> -       CU_ASSERT(ptr == start_ptr + offset);
> -       CU_ASSERT(seg_len == full_seg_len - offset);
> -
> -       /* Query the last byte in a segment */
> -       offset = full_seg_len - 1;
> -
> -       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> -       CU_ASSERT(ptr != NULL);
> -       CU_ASSERT(ptr == start_ptr + offset);
> -       CU_ASSERT(seg_len == full_seg_len - offset);
> -
> -       /* Query the last byte in a packet */
> -       offset = odp_packet_len(pkt) - 1;
> -       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> -       CU_ASSERT(ptr != NULL);
> -       CU_ASSERT(seg_len == 1);
> -
> -       /* Pass NULL to [out] arguments */
> -       ptr = odp_packet_offset(pkt, 0, NULL, NULL);
> -       CU_ASSERT(ptr != NULL);
> -}
> -
> -CU_TestInfo packet_tests[] = {
> -       _CU_TEST_INFO(packet_alloc_free),
> -       _CU_TEST_INFO(packet_alloc_segmented),
> -       _CU_TEST_INFO(packet_basic_metadata),
> -       _CU_TEST_INFO(packet_debug),
> -       _CU_TEST_INFO(packet_length),
> -       _CU_TEST_INFO(packet_headroom),
> -       _CU_TEST_INFO(packet_tailroom),
> -       _CU_TEST_INFO(packet_context),
> -       _CU_TEST_INFO(packet_event_conversion),
> -       _CU_TEST_INFO(packet_layer_offsets),
> -       _CU_TEST_INFO(packet_segments),
> -       _CU_TEST_INFO(packet_segment_last),
> -       _CU_TEST_INFO(packet_in_flags),
> -       _CU_TEST_INFO(packet_error_flags),
> -       _CU_TEST_INFO(packet_add_rem_data),
> -       _CU_TEST_INFO(packet_copy),
> -       _CU_TEST_INFO(packet_copydata),
> -       _CU_TEST_INFO(packet_offset),
> -       CU_TEST_INFO_NULL,
> -};
> diff --git a/test/validation/odp_buffer.c b/test/validation/odp_buffer.c
> index e2fa7aa..da1ef79 100644
> --- a/test/validation/odp_buffer.c
> +++ b/test/validation/odp_buffer.c
> @@ -4,21 +4,152 @@
>   * SPDX-License-Identifier:    BSD-3-Clause
>   */
>
> -#include "odp_buffer_tests.h"
> +#include <odp.h>
> +#include "odp_cunit_common.h"
> +
> +/* Helper macro for CU_TestInfo initialization */
> +#define _CU_TEST_INFO(test_func) {#test_func, test_func}
> +
> +static odp_pool_t raw_pool;
> +static odp_buffer_t raw_buffer = ODP_BUFFER_INVALID;
> +static const size_t raw_buffer_size = 1500;
> +
> +static int buffer_testsuite_init(void)
> +{
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = raw_buffer_size,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num   = 100,
> +                       },
> +                       .type  = ODP_POOL_BUFFER,
> +       };
> +
> +       raw_pool = odp_pool_create("raw_pool", ODP_SHM_INVALID, &params);
> +       if (raw_pool == ODP_POOL_INVALID)
> +               return -1;
> +       raw_buffer = odp_buffer_alloc(raw_pool);
> +       if (raw_buffer == ODP_BUFFER_INVALID)
> +               return -1;
> +       return 0;
> +}
> +
> +static int buffer_testsuite_finalize(void)
> +{
> +       odp_buffer_free(raw_buffer);
> +       if (odp_pool_destroy(raw_pool) != 0)
> +               return -1;
> +       return 0;
> +}
> +
> +static void buffer_pool_alloc(void)
> +{
> +       odp_pool_t pool;
> +       const int num = 3;
> +       const size_t size = 1500;
> +       odp_buffer_t buffer[num];
> +       odp_event_t ev;
> +       int index;
> +       char wrong_type = 0, wrong_size = 0;
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = size,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num   = num,
> +                       },
> +                       .type  = ODP_POOL_BUFFER,
> +       };
> +
> +       pool = odp_pool_create("buffer_pool_alloc", ODP_SHM_INVALID,
> &params);
> +       odp_pool_print(pool);
> +
> +       /* Try to allocate num items from the pool */
> +       for (index = 0; index < num; index++) {
> +               buffer[index] = odp_buffer_alloc(pool);
> +
> +               if (buffer[index] == ODP_BUFFER_INVALID)
> +                       break;
> +
> +               ev = odp_buffer_to_event(buffer[index]);
> +               if (odp_event_type(ev) != ODP_EVENT_BUFFER)
> +                       wrong_type = 1;
> +               if (odp_buffer_size(buffer[index]) < size)
> +                       wrong_size = 1;
> +               if (wrong_type || wrong_size)
> +                       odp_buffer_print(buffer[index]);
> +       }
> +
> +       /* Check that the pool had at least num items */
> +       CU_ASSERT(index == num);
> +       /* index points out of buffer[] or it point to an invalid buffer */
> +       index--;
> +
> +       /* Check that the pool had correct buffers */
> +       CU_ASSERT(wrong_type == 0);
> +       CU_ASSERT(wrong_size == 0);
> +
> +       for (; index >= 0; index--)
> +               odp_buffer_free(buffer[index]);
> +
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +static void buffer_pool_free(void)
> +{
> +       odp_pool_t pool;
> +       odp_buffer_t buffer;
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = 64,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num   = 1,
> +                       },
> +                       .type  = ODP_POOL_BUFFER,
> +       };
> +
> +       pool = odp_pool_create("buffer_pool_free", ODP_SHM_INVALID,
> &params);
> +
> +       /* Allocate the only buffer from the pool */
> +       buffer = odp_buffer_alloc(pool);
> +       CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID);
> +
> +       /** @todo: is it correct to assume the pool had only one buffer? */
> +       CU_ASSERT_FATAL(odp_buffer_alloc(pool) == ODP_BUFFER_INVALID)
> +
> +       odp_buffer_free(buffer);
> +
> +       /* Check that the buffer was returned back to the pool */
> +       buffer = odp_buffer_alloc(pool);
> +       CU_ASSERT_FATAL(buffer != ODP_BUFFER_INVALID);
> +
> +       odp_buffer_free(buffer);
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +static void buffer_management_basic(void)
> +{
> +       odp_event_t ev = odp_buffer_to_event(raw_buffer);
> +
> +       CU_ASSERT(odp_buffer_is_valid(raw_buffer) == 1);
> +       CU_ASSERT(odp_buffer_pool(raw_buffer) != ODP_POOL_INVALID);
> +       CU_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER);
> +       CU_ASSERT(odp_buffer_size(raw_buffer) >= raw_buffer_size);
> +       CU_ASSERT(odp_buffer_addr(raw_buffer) != NULL);
> +       odp_buffer_print(raw_buffer);
> +}
> +
> +static CU_TestInfo buffer_tests[] = {
> +       _CU_TEST_INFO(buffer_pool_alloc),
> +       _CU_TEST_INFO(buffer_pool_free),
> +       _CU_TEST_INFO(buffer_management_basic),
> +       CU_TEST_INFO_NULL,
> +};
>
>  CU_SuiteInfo odp_testsuites[] = {
> -       { .pName = "buffer Pool tests",
> -                       .pTests = buffer_pool_tests,
> -       },
>         { .pName = "buffer tests",
>                         .pTests = buffer_tests,
>                         .pInitFunc = buffer_testsuite_init,
>                         .pCleanupFunc = buffer_testsuite_finalize,
>         },
> -       { .pName = "packet tests",
> -                       .pTests = packet_tests,
> -                       .pInitFunc = packet_testsuite_init,
> -                       .pCleanupFunc = packet_testsuite_finalize,
> -       },
>         CU_SUITE_INFO_NULL,
>  };
> diff --git a/test/validation/odp_packet.c b/test/validation/odp_packet.c
> new file mode 100644
> index 0000000..ca01389
> --- /dev/null
> +++ b/test/validation/odp_packet.c
> @@ -0,0 +1,688 @@
> +/* Copyright (c) 2014, Linaro Limited
> + * All rights reserved.
> + *
> + * SPDX-License-Identifier:    BSD-3-Clause
> + */
> +
> +#include <stdlib.h>
> +
> +#include <odp.h>
> +#include "odp_cunit_common.h"
> +
> +/* Helper macro for CU_TestInfo initialization */
> +#define _CU_TEST_INFO(test_func) {#test_func, test_func}
> +
> +#define PACKET_BUF_LEN ODP_CONFIG_PACKET_BUF_LEN_MIN
> +/* Reserve some tailroom for tests */
> +#define PACKET_TAILROOM_RESERVE  4
> +
> +static odp_pool_t packet_pool;
> +static const uint32_t packet_len = PACKET_BUF_LEN -
> +                               ODP_CONFIG_PACKET_HEADROOM -
> +                               ODP_CONFIG_PACKET_TAILROOM -
> +                               PACKET_TAILROOM_RESERVE;
> +
> +odp_packet_t test_packet;
> +
> +static int packet_testsuite_init(void)
> +{
> +       odp_pool_param_t params = {
> +               .buf = {
> +                       .size  = PACKET_BUF_LEN,
> +                       .align = ODP_CACHE_LINE_SIZE,
> +                       .num  = 100,
> +               },
> +               .type  = ODP_POOL_PACKET,
> +       };
> +
> +       packet_pool = odp_pool_create("packet_pool", ODP_SHM_INVALID,
> &params);
> +       if (packet_pool == ODP_POOL_INVALID)
> +               return -1;
> +
> +       test_packet = odp_packet_alloc(packet_pool, packet_len);
> +       if (odp_packet_is_valid(test_packet) == 0)
> +               return -1;
> +
> +       return 0;
> +}
> +
> +static int packet_testsuite_finalize(void)
> +{
> +       odp_packet_free(test_packet);
> +       if (odp_pool_destroy(packet_pool) != 0)
> +               return -1;
> +       return 0;
> +}
> +
> +static void packet_alloc_free(void)
> +{
> +       odp_pool_t pool;
> +       odp_packet_t packet;
> +       odp_pool_param_t params = {
> +               .buf = {
> +                       .size  = PACKET_BUF_LEN,
> +                       .align = ODP_CACHE_LINE_SIZE,
> +                       .num  = 1,
> +               },
> +               .type  = ODP_POOL_PACKET,
> +       };
> +
> +       pool = odp_pool_create("packet_pool_alloc", ODP_SHM_INVALID,
> &params);
> +
> +       /* Allocate the only buffer from the pool */
> +       packet = odp_packet_alloc(pool, packet_len);
> +       CU_ASSERT_FATAL(packet != ODP_PACKET_INVALID);
> +       CU_ASSERT(odp_packet_len(packet) == packet_len);
> +       CU_ASSERT(odp_event_type(odp_packet_to_event(packet)) ==
> +                       ODP_EVENT_PACKET);
> +       /** @todo: is it correct to assume the pool had only one buffer? */
> +       CU_ASSERT_FATAL(odp_packet_alloc(pool, packet_len)
> +                       == ODP_PACKET_INVALID);
> +
> +       odp_packet_free(packet);
> +
> +       /* Check that the buffer was returned back to the pool */
> +       packet = odp_packet_alloc(pool, packet_len);
> +       CU_ASSERT_FATAL(packet != ODP_PACKET_INVALID);
> +       CU_ASSERT(odp_packet_len(packet) == packet_len);
> +
> +       odp_packet_free(packet);
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +static void packet_alloc_segmented(void)
> +{
> +       odp_packet_t pkt;
> +       const uint32_t len = ODP_CONFIG_PACKET_BUF_LEN_MAX -
> +                       ODP_CONFIG_PACKET_HEADROOM -
> +                       ODP_CONFIG_PACKET_TAILROOM;
> +
> +       pkt = odp_packet_alloc(packet_pool, len);
> +       CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
> +       CU_ASSERT(odp_packet_len(pkt) == len);
> +       odp_packet_free(pkt);
> +}
> +
> +static void packet_event_conversion(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       odp_packet_t tmp_pkt;
> +       odp_event_t ev;
> +
> +       ev = odp_packet_to_event(pkt);
> +       CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID);
> +       CU_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET);
> +
> +       tmp_pkt = odp_packet_from_event(ev);
> +       CU_ASSERT_FATAL(tmp_pkt != ODP_PACKET_INVALID);
> +       /** @todo: Need an API to compare packets */
> +}
> +
> +static void packet_basic_metadata(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       CU_ASSERT(odp_packet_head(pkt) != NULL);
> +       CU_ASSERT(odp_packet_data(pkt) != NULL);
> +
> +       CU_ASSERT(odp_packet_pool(pkt) != ODP_POOL_INVALID);
> +       /* Packet was allocated by application so shouldn't have valid
> pktio. */
> +       CU_ASSERT(odp_packet_input(pkt) == ODP_PKTIO_INVALID);
> +}
> +
> +static void packet_length(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       uint32_t buf_len, headroom, tailroom;
> +
> +       buf_len = odp_packet_buf_len(pkt);
> +       headroom = odp_packet_headroom(pkt);
> +       tailroom = odp_packet_tailroom(pkt);
> +
> +       CU_ASSERT(odp_packet_len(pkt) == packet_len);
> +#if ODP_CONFIG_PACKET_HEADROOM != 0 /* Avoid 'always true' warning */
> +       CU_ASSERT(headroom >= ODP_CONFIG_PACKET_HEADROOM);
> +#endif
> +#if ODP_CONFIG_PACKET_TAILROOM != 0 /* Avoid 'always true' warning */
> +       CU_ASSERT(tailroom >= ODP_CONFIG_PACKET_TAILROOM);
> +#endif
> +       CU_ASSERT(buf_len >= packet_len + headroom + tailroom);
> +}
> +
> +static void packet_debug(void)
> +{
> +       CU_ASSERT(odp_packet_is_valid(test_packet) == 1);
> +       odp_packet_print(test_packet);
> +}
> +
> +static void packet_context(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       char ptr_test_value = 2;
> +       uint64_t u64_test_value = 0x0123456789abcdf;
> +
> +       void *prev_ptr;
> +       uint64_t prev_u64;
> +
> +       prev_ptr = odp_packet_user_ptr(pkt);
> +       odp_packet_user_ptr_set(pkt, &ptr_test_value);
> +       CU_ASSERT(odp_packet_user_ptr(pkt) == &ptr_test_value);
> +       odp_packet_user_ptr_set(pkt, prev_ptr);
> +
> +       prev_u64 = odp_packet_user_u64(pkt);
> +       odp_packet_user_u64_set(pkt, u64_test_value);
> +       CU_ASSERT(odp_packet_user_u64(pkt) == u64_test_value);
> +       odp_packet_user_u64_set(pkt, prev_u64);
> +
> +       odp_packet_reset(pkt, packet_len);
> +}
> +
> +static void packet_layer_offsets(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       uint8_t *l2_addr, *l3_addr, *l4_addr;
> +       uint32_t seg_len;
> +       const uint32_t l2_off = 2;
> +       const uint32_t l3_off = l2_off + 14;
> +       const uint32_t l4_off = l3_off + 14;
> +       int ret;
> +
> +       /* Set offsets to the same value */
> +       ret = odp_packet_l2_offset_set(pkt, l2_off);
> +       CU_ASSERT(ret == 0);
> +       ret = odp_packet_l3_offset_set(pkt, l2_off);
> +       CU_ASSERT(ret == 0);
> +       ret = odp_packet_l4_offset_set(pkt, l2_off);
> +       CU_ASSERT(ret == 0);
> +
> +       /* Addresses should be the same */
> +       l2_addr = odp_packet_l2_ptr(pkt, &seg_len);
> +       CU_ASSERT(seg_len != 0);
> +       l3_addr = odp_packet_l3_ptr(pkt, &seg_len);
> +       CU_ASSERT(seg_len != 0);
> +       l4_addr = odp_packet_l4_ptr(pkt, &seg_len);
> +       CU_ASSERT(seg_len != 0);
> +       CU_ASSERT(l2_addr != NULL);
> +       CU_ASSERT(l2_addr == l3_addr);
> +       CU_ASSERT(l2_addr == l4_addr);
> +
> +       /* Set offsets to the different values */
> +       odp_packet_l2_offset_set(pkt, l2_off);
> +       CU_ASSERT(odp_packet_l2_offset(pkt) == l2_off);
> +       odp_packet_l3_offset_set(pkt, l3_off);
> +       CU_ASSERT(odp_packet_l3_offset(pkt) == l3_off);
> +       odp_packet_l4_offset_set(pkt, l4_off);
> +       CU_ASSERT(odp_packet_l4_offset(pkt) == l4_off);
> +
> +       /* Addresses should not be the same */
> +       l2_addr = odp_packet_l2_ptr(pkt, NULL);
> +       CU_ASSERT(l2_addr != NULL);
> +       l3_addr = odp_packet_l3_ptr(pkt, NULL);
> +       CU_ASSERT(l3_addr != NULL);
> +       l4_addr = odp_packet_l4_ptr(pkt, NULL);
> +       CU_ASSERT(l4_addr != NULL);
> +
> +       CU_ASSERT(l2_addr != l3_addr);
> +       CU_ASSERT(l2_addr != l4_addr);
> +       CU_ASSERT(l3_addr != l4_addr);
> +}
> +
> +static void _verify_headroom_shift(odp_packet_t packet,
> +                                  int shift)
> +{
> +       uint32_t room = odp_packet_headroom(packet);
> +       uint32_t seg_data_len = odp_packet_seg_len(packet);
> +       uint32_t pkt_data_len = odp_packet_len(packet);
> +       void *data;
> +       char *data_orig = odp_packet_data(packet);
> +       char *head_orig = odp_packet_head(packet);
> +
> +       if (shift >= 0)
> +               data = odp_packet_push_head(packet, shift);
> +       else
> +               data = odp_packet_pull_head(packet, -shift);
> +
> +       CU_ASSERT(data != NULL);
> +       CU_ASSERT(odp_packet_headroom(packet) == room - shift);
> +       CU_ASSERT(odp_packet_seg_len(packet) == seg_data_len + shift);
> +       CU_ASSERT(odp_packet_len(packet) == pkt_data_len + shift);
> +       CU_ASSERT(odp_packet_data(packet) == data);
> +       CU_ASSERT(odp_packet_head(packet) == head_orig);
> +       CU_ASSERT(data == data_orig - shift);
> +}
> +
> +static void packet_headroom(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       uint32_t room;
> +       uint32_t seg_data_len;
> +       uint32_t push_val, pull_val;
> +
> +       room = odp_packet_headroom(pkt);
> +
> +#if ODP_CONFIG_PACKET_HEADROOM != 0 /* Avoid 'always true' warning */
> +       CU_ASSERT(room >= ODP_CONFIG_PACKET_HEADROOM);
> +#endif
> +       seg_data_len = odp_packet_seg_len(pkt);
> +       CU_ASSERT(seg_data_len >= 1);
> +       /** @todo: should be len - 1 */
> +       pull_val = seg_data_len / 2;
> +       push_val = room;
> +
> +       _verify_headroom_shift(pkt, -pull_val);
> +       _verify_headroom_shift(pkt, push_val + pull_val);
> +       _verify_headroom_shift(pkt, -push_val);
> +       _verify_headroom_shift(pkt, 0);
> +}
> +
> +static void _verify_tailroom_shift(odp_packet_t pkt,
> +                                  int shift)
> +{
> +       odp_packet_seg_t seg;
> +       uint32_t room;
> +       uint32_t seg_data_len, pkt_data_len;
> +       void *tail;
> +       char *tail_orig;
> +
> +       room = odp_packet_tailroom(pkt);
> +       pkt_data_len = odp_packet_len(pkt);
> +       tail_orig = odp_packet_tail(pkt);
> +
> +       seg = odp_packet_last_seg(pkt);
> +       CU_ASSERT(seg != ODP_PACKET_SEG_INVALID);
> +       seg_data_len = odp_packet_seg_data_len(pkt, seg);
> +
> +       if (shift >= 0) {
> +               uint32_t l2_off, l3_off, l4_off;
> +               l2_off = odp_packet_l2_offset(pkt);
> +               l3_off = odp_packet_l3_offset(pkt);
> +               l4_off = odp_packet_l4_offset(pkt);
> +
> +               tail = odp_packet_push_tail(pkt, shift);
> +
> +               CU_ASSERT(l2_off == odp_packet_l2_offset(pkt));
> +               CU_ASSERT(l3_off == odp_packet_l3_offset(pkt));
> +               CU_ASSERT(l4_off == odp_packet_l4_offset(pkt));
> +       } else {
> +               tail = odp_packet_pull_tail(pkt, -shift);
> +       }
> +
> +       CU_ASSERT(tail != NULL);
> +       CU_ASSERT(odp_packet_seg_data_len(pkt, seg) == seg_data_len +
> shift);
> +       CU_ASSERT(odp_packet_len(pkt) == pkt_data_len + shift);
> +       CU_ASSERT(odp_packet_tailroom(pkt) == room - shift);
> +       if (room == 0 || (room - shift) == 0)
> +               return;
> +       if (shift >= 0) {
> +               CU_ASSERT(odp_packet_tail(pkt) == tail_orig + shift);
> +               CU_ASSERT(tail == tail_orig);
> +       } else {
> +               CU_ASSERT(odp_packet_tail(pkt) == tail);
> +               CU_ASSERT(tail == tail_orig + shift);
> +       }
> +}
> +
> +static void packet_tailroom(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       odp_packet_seg_t segment;
> +       uint32_t room;
> +       uint32_t seg_data_len;
> +       uint32_t push_val, pull_val;
> +
> +       segment = odp_packet_last_seg(pkt);
> +       CU_ASSERT(segment != ODP_PACKET_SEG_INVALID);
> +       room = odp_packet_tailroom(pkt);
> +#if ODP_CONFIG_PACKET_TAILROOM != 0 /* Avoid 'always true' warning */
> +       CU_ASSERT(room >= ODP_CONFIG_PACKET_TAILROOM);
> +#endif
> +       seg_data_len = odp_packet_seg_data_len(pkt, segment);
> +       CU_ASSERT(seg_data_len >= 1);
> +       /** @todo: should be len - 1 */
> +       pull_val = seg_data_len / 2;
> +       /* Leave one byte in a tailroom for odp_packet_tail() to succeed */
> +       push_val = (room > 0) ? room - 1 : room;
> +
> +       _verify_tailroom_shift(pkt, -pull_val);
> +       _verify_tailroom_shift(pkt, push_val + pull_val);
> +       _verify_tailroom_shift(pkt, -push_val);
> +       _verify_tailroom_shift(pkt, 0);
> +}
> +
> +static void packet_segments(void)
> +{
> +       int num_segs, seg_index;
> +       uint32_t data_len, buf_len;
> +       odp_packet_seg_t seg;
> +       odp_packet_t pkt = test_packet;
> +
> +       CU_ASSERT(odp_packet_is_valid(pkt) == 1);
> +
> +       num_segs = odp_packet_num_segs(pkt);
> +       CU_ASSERT(num_segs != 0);
> +
> +       if (odp_packet_is_segmented(pkt)) {
> +               CU_ASSERT(num_segs > 1);
> +       } else {
> +               CU_ASSERT(num_segs == 1);
> +       }
> +
> +
> +       seg = odp_packet_first_seg(pkt);
> +       buf_len = 0;
> +       data_len = 0;
> +       seg_index = 0;
> +       while (seg_index < num_segs && seg != ODP_PACKET_SEG_INVALID) {
> +               uint32_t seg_data_len, seg_buf_len;
> +               void *seg_buf_addr, *seg_data;
> +
> +               seg_buf_addr = odp_packet_seg_buf_addr(pkt, seg);
> +               seg_buf_len  = odp_packet_seg_buf_len(pkt, seg);
> +               seg_data_len = odp_packet_seg_data_len(pkt, seg);
> +               seg_data     = odp_packet_seg_data(pkt, seg);
> +
> +               CU_ASSERT(seg_buf_len > 0);
> +               CU_ASSERT(seg_data_len > 0);
> +               CU_ASSERT(seg_buf_len >= seg_data_len);
> +               CU_ASSERT(seg_data != NULL);
> +               CU_ASSERT(seg_buf_addr != NULL);
> +               CU_ASSERT(seg_data >= seg_buf_addr);
> +
> +               buf_len += seg_buf_len;
> +               data_len += seg_data_len;
> +
> +               /** @todo: touch memory in a segment */
> +               seg_index++;
> +               seg = odp_packet_next_seg(pkt, seg);
> +       }
> +
> +       CU_ASSERT(seg_index == num_segs);
> +       CU_ASSERT(buf_len == odp_packet_buf_len(pkt));
> +       CU_ASSERT(data_len == odp_packet_len(pkt));
> +
> +       if (seg_index == num_segs)
> +               CU_ASSERT(seg == ODP_PACKET_SEG_INVALID);
> +}
> +
> +static void packet_segment_last(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       odp_packet_seg_t seg;
> +
> +       seg = odp_packet_last_seg(pkt);
> +       CU_ASSERT_FATAL(seg != ODP_PACKET_SEG_INVALID);
> +
> +       seg = odp_packet_next_seg(pkt, seg);
> +       CU_ASSERT(seg == ODP_PACKET_SEG_INVALID);
> +}
> +
> +#define TEST_INFLAG(packet, flag) \
> +do { \
> +       odp_packet_has_##flag##_set(packet, 0);           \
> +       CU_ASSERT(odp_packet_has_##flag(packet) == 0);    \
> +       odp_packet_has_##flag##_set(packet, 1);           \
> +       CU_ASSERT(odp_packet_has_##flag(packet) == 1);    \
> +} while (0)
> +
> +static void packet_in_flags(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +
> +       TEST_INFLAG(pkt, l2);
> +       TEST_INFLAG(pkt, l3);
> +       TEST_INFLAG(pkt, l4);
> +       TEST_INFLAG(pkt, eth);
> +       TEST_INFLAG(pkt, jumbo);
> +       TEST_INFLAG(pkt, vlan);
> +       TEST_INFLAG(pkt, vlan_qinq);
> +       TEST_INFLAG(pkt, arp);
> +       TEST_INFLAG(pkt, ipv4);
> +       TEST_INFLAG(pkt, ipv6);
> +       TEST_INFLAG(pkt, ipfrag);
> +       TEST_INFLAG(pkt, ipopt);
> +       TEST_INFLAG(pkt, ipsec);
> +       TEST_INFLAG(pkt, udp);
> +       TEST_INFLAG(pkt, tcp);
> +       TEST_INFLAG(pkt, sctp);
> +       TEST_INFLAG(pkt, icmp);
> +}
> +
> +static void packet_error_flags(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       int err;
> +
> +       /**
> +        * The packet have not been classified so it doesn't have error
> flag
> +        * properly set. Just check that function return one of allowed
> values.
> +        * @todo: check classified packet when classifier is added in
> place.
> +        */
> +       err = odp_packet_has_error(pkt);
> +       CU_ASSERT(err == 0 || err == 1);
> +}
> +
> +struct packet_metadata {
> +       uint32_t l2_off;
> +       uint32_t l3_off;
> +       uint32_t l4_off;
> +       void *usr_ptr;
> +       uint64_t usr_u64;
> +};
> +
> +static void packet_add_rem_data(void)
> +{
> +       odp_packet_t pkt, new_pkt;
> +       uint32_t pkt_len, offset, add_len;
> +       void *usr_ptr;
> +       uint64_t usr_u64;
> +
> +       pkt = odp_packet_alloc(packet_pool, PACKET_BUF_LEN);
> +       CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
> +
> +       pkt_len = odp_packet_len(pkt);
> +       usr_ptr = odp_packet_user_ptr(pkt);
> +       usr_u64 = odp_packet_user_u64(pkt);
> +       /* Insert one more packet length in the middle of a packet */
> +       offset = pkt_len / 2;
> +       add_len = pkt_len;
> +
> +       new_pkt = odp_packet_add_data(pkt, offset, add_len);
> +       CU_ASSERT(new_pkt != ODP_PACKET_INVALID);
> +       if (new_pkt == ODP_PACKET_INVALID)
> +               goto free_packet;
> +       CU_ASSERT(odp_packet_len(new_pkt) == pkt_len + add_len);
> +       /* Verify that user metadata is preserved */
> +       CU_ASSERT(odp_packet_user_ptr(new_pkt) == usr_ptr);
> +       CU_ASSERT(odp_packet_user_u64(new_pkt) == usr_u64);
> +
> +       pkt = new_pkt;
> +
> +       pkt_len = odp_packet_len(pkt);
> +       usr_ptr = odp_packet_user_ptr(pkt);
> +       usr_u64 = odp_packet_user_u64(pkt);
> +       new_pkt = odp_packet_rem_data(pkt, offset, add_len);
> +       CU_ASSERT(new_pkt != ODP_PACKET_INVALID);
> +       if (new_pkt == ODP_PACKET_INVALID)
> +               goto free_packet;
> +       CU_ASSERT(odp_packet_len(new_pkt) == pkt_len - add_len);
> +       CU_ASSERT(odp_packet_user_ptr(new_pkt) == usr_ptr);
> +       CU_ASSERT(odp_packet_user_u64(new_pkt) == usr_u64);
> +       pkt = new_pkt;
> +
> +free_packet:
> +       odp_packet_free(pkt);
> +}
> +
> +
> +#define COMPARE_INFLAG(p1, p2, flag) \
> +       CU_ASSERT(odp_packet_has_##flag(p1) == odp_packet_has_##flag(p2))
> +
> +static void _packet_compare_inflags(odp_packet_t pkt1, odp_packet_t pkt2)
> +{
> +       COMPARE_INFLAG(pkt1, pkt2, l2);
> +       COMPARE_INFLAG(pkt1, pkt2, l3);
> +       COMPARE_INFLAG(pkt1, pkt2, l4);
> +       COMPARE_INFLAG(pkt1, pkt2, eth);
> +       COMPARE_INFLAG(pkt1, pkt2, jumbo);
> +       COMPARE_INFLAG(pkt1, pkt2, eth);
> +       COMPARE_INFLAG(pkt1, pkt2, vlan);
> +       COMPARE_INFLAG(pkt1, pkt2, vlan_qinq);
> +       COMPARE_INFLAG(pkt1, pkt2, arp);
> +       COMPARE_INFLAG(pkt1, pkt2, ipv4);
> +       COMPARE_INFLAG(pkt1, pkt2, ipv6);
> +       COMPARE_INFLAG(pkt1, pkt2, ipfrag);
> +       COMPARE_INFLAG(pkt1, pkt2, ipopt);
> +       COMPARE_INFLAG(pkt1, pkt2, ipsec);
> +       COMPARE_INFLAG(pkt1, pkt2, udp);
> +       COMPARE_INFLAG(pkt1, pkt2, tcp);
> +       COMPARE_INFLAG(pkt1, pkt2, sctp);
> +       COMPARE_INFLAG(pkt1, pkt2, icmp);
> +}
> +
> +static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2)
> +{
> +       uint32_t len = odp_packet_len(pkt1);
> +       uint32_t offset = 0;
> +       uint32_t seglen1, seglen2, cmplen;
> +
> +       CU_ASSERT_FATAL(len == odp_packet_len(pkt2));
> +
> +       while (len > 0) {
> +               void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1,
> NULL);
> +               void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2,
> NULL);
> +
> +               CU_ASSERT_FATAL(pkt1map != NULL);
> +               CU_ASSERT_FATAL(pkt2map != NULL);
> +               cmplen = seglen1 < seglen2 ? seglen1 : seglen2;
> +               CU_ASSERT(!memcmp(pkt1map, pkt2map, cmplen));
> +
> +               offset += cmplen;
> +               len    -= cmplen;
> +       }
> +}
> +
> +static void packet_copy(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       odp_packet_t pkt_copy;
> +       odp_pool_t pool;
> +
> +       /** @todo: fill original packet with some data */
> +       pool = odp_packet_pool(pkt);
> +       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> +       pkt_copy = odp_packet_copy(pkt, odp_packet_pool(pkt));
> +       CU_ASSERT_FATAL(pkt_copy != ODP_PACKET_INVALID);
> +
> +       CU_ASSERT(odp_packet_len(pkt) == odp_packet_len(pkt_copy));
> +
> +       _packet_compare_inflags(pkt, pkt_copy);
> +       _packet_compare_data(pkt, pkt_copy);
> +       odp_packet_free(pkt_copy);
> +}
> +
> +static void packet_copydata(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       uint32_t pkt_len = odp_packet_len(pkt);
> +       uint8_t *data_buf;
> +       uint32_t i;
> +       int correct_memory;
> +
> +       CU_ASSERT_FATAL(pkt_len > 0);
> +
> +       data_buf = malloc(pkt_len);
> +       CU_ASSERT_FATAL(data_buf != NULL);
> +
> +       for (i = 0; i < pkt_len; i++)
> +               data_buf[i] = (uint8_t)i;
> +
> +       CU_ASSERT(!odp_packet_copydata_in(pkt, 0, pkt_len, data_buf));
> +       memset(data_buf, 0, pkt_len);
> +       CU_ASSERT(!odp_packet_copydata_out(pkt, 0, pkt_len, data_buf));
> +
> +       correct_memory = 1;
> +       for (i = 0; i < pkt_len; i++)
> +               if (data_buf[i] != (uint8_t)i) {
> +                       correct_memory = 0;
> +                       break;
> +               }
> +       CU_ASSERT(correct_memory);
> +
> +       free(data_buf);
> +}
> +
> +static void packet_offset(void)
> +{
> +       odp_packet_t pkt = test_packet;
> +       uint32_t seg_len, full_seg_len;
> +       odp_packet_seg_t seg;
> +       uint8_t *ptr, *start_ptr;
> +       uint32_t offset;
> +
> +       ptr = odp_packet_offset(pkt, 0, &seg_len, &seg);
> +       CU_ASSERT(seg != ODP_PACKET_SEG_INVALID);
> +       CU_ASSERT(seg_len > 1);
> +       CU_ASSERT(seg_len == odp_packet_seg_len(pkt));
> +       CU_ASSERT(seg_len == odp_packet_seg_data_len(pkt, seg));
> +       CU_ASSERT(ptr != NULL);
> +       CU_ASSERT(ptr == odp_packet_data(pkt));
> +       CU_ASSERT(ptr == odp_packet_seg_data(pkt, seg));
> +
> +       /* Query a second byte */
> +       start_ptr = ptr;
> +       full_seg_len = seg_len;
> +       offset = 1;
> +
> +       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> +       CU_ASSERT(ptr != NULL);
> +       CU_ASSERT(ptr == start_ptr + offset);
> +       CU_ASSERT(seg_len == full_seg_len - offset);
> +
> +       /* Query the last byte in a segment */
> +       offset = full_seg_len - 1;
> +
> +       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> +       CU_ASSERT(ptr != NULL);
> +       CU_ASSERT(ptr == start_ptr + offset);
> +       CU_ASSERT(seg_len == full_seg_len - offset);
> +
> +       /* Query the last byte in a packet */
> +       offset = odp_packet_len(pkt) - 1;
> +       ptr = odp_packet_offset(pkt, offset, &seg_len, NULL);
> +       CU_ASSERT(ptr != NULL);
> +       CU_ASSERT(seg_len == 1);
> +
> +       /* Pass NULL to [out] arguments */
> +       ptr = odp_packet_offset(pkt, 0, NULL, NULL);
> +       CU_ASSERT(ptr != NULL);
> +}
> +
> +CU_TestInfo packet_tests[] = {
> +       _CU_TEST_INFO(packet_alloc_free),
> +       _CU_TEST_INFO(packet_alloc_segmented),
> +       _CU_TEST_INFO(packet_basic_metadata),
> +       _CU_TEST_INFO(packet_debug),
> +       _CU_TEST_INFO(packet_length),
> +       _CU_TEST_INFO(packet_headroom),
> +       _CU_TEST_INFO(packet_tailroom),
> +       _CU_TEST_INFO(packet_context),
> +       _CU_TEST_INFO(packet_event_conversion),
> +       _CU_TEST_INFO(packet_layer_offsets),
> +       _CU_TEST_INFO(packet_segments),
> +       _CU_TEST_INFO(packet_segment_last),
> +       _CU_TEST_INFO(packet_in_flags),
> +       _CU_TEST_INFO(packet_error_flags),
> +       _CU_TEST_INFO(packet_add_rem_data),
> +       _CU_TEST_INFO(packet_copy),
> +       _CU_TEST_INFO(packet_copydata),
> +       _CU_TEST_INFO(packet_offset),
> +       CU_TEST_INFO_NULL,
> +};
> +
> +CU_SuiteInfo odp_testsuites[] = {
> +       { .pName = "packet tests",
> +                       .pTests = packet_tests,
> +                       .pInitFunc = packet_testsuite_init,
> +                       .pCleanupFunc = packet_testsuite_finalize,
> +       },
> +       CU_SUITE_INFO_NULL,
> +};
> diff --git a/test/validation/odp_pool.c b/test/validation/odp_pool.c
> new file mode 100644
> index 0000000..263957c
> --- /dev/null
> +++ b/test/validation/odp_pool.c
> @@ -0,0 +1,134 @@
> +/* Copyright (c) 2014, Linaro Limited
> + * All rights reserved.
> + *
> + * SPDX-License-Identifier:    BSD-3-Clause
> + */
> +
> +#include <odp.h>
> +#include "odp_cunit_common.h"
> +
> +static int pool_name_number = 1;
> +static const int default_buffer_size = 1500;
> +static const int default_buffer_num = 1000;
> +
> +static odp_pool_t pool_create(int buf_num, int buf_size, int buf_type)
> +{
> +       odp_pool_t pool;
> +       char pool_name[ODP_POOL_NAME_LEN];
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = buf_size,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num   = buf_num,
> +                       },
> +                       .type = buf_type,
> +       };
> +
> +       snprintf(pool_name, sizeof(pool_name),
> +                "test_pool-%d", pool_name_number++);
> +
> +       pool = odp_pool_create(pool_name, ODP_SHM_INVALID, &params);
> +       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> +
> +       return pool;
> +}
> +
> +static void pool_create_destroy_type(int type)
> +{
> +       odp_pool_t pool;
> +       pool = pool_create(default_buffer_num, default_buffer_size, type);
> +
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +static void pool_create_destroy_raw(void)
> +{
> +       pool_create_destroy_type(ODP_POOL_BUFFER);
> +}
> +
> +static void pool_create_destroy_packet(void)
> +{
> +       pool_create_destroy_type(ODP_POOL_PACKET);
> +}
> +
> +static void pool_create_destroy_timeout(void)
> +{
> +       pool_create_destroy_type(ODP_POOL_TIMEOUT);
> +}
> +
> +static void pool_create_destroy_raw_shm(void)
> +{
> +       odp_pool_t pool;
> +       odp_shm_t test_shm;
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = 1500,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num   = 10,
> +                       },
> +                       .type  = ODP_POOL_BUFFER,
> +       };
> +
> +       test_shm = odp_shm_reserve("test_shm",
> +                                  params.buf.size * params.buf.num * 2,
> +                                  ODP_CACHE_LINE_SIZE,
> +                                  0);
> +       CU_ASSERT_FATAL(test_shm != ODP_SHM_INVALID);
> +
> +       pool = odp_pool_create("test_shm_pool", test_shm, &params);
> +       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> +
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +       CU_ASSERT(odp_shm_free(test_shm) == 0);
> +}
> +
> +static void pool_lookup_info_print(void)
> +{
> +       odp_pool_t pool;
> +       const char pool_name[] = "pool_for_lookup_test";
> +       odp_pool_info_t info;
> +       odp_pool_param_t params = {
> +                       .buf = {
> +                               .size  = default_buffer_size,
> +                               .align = ODP_CACHE_LINE_SIZE,
> +                               .num  = default_buffer_num,
> +                       },
> +                       .type  = ODP_POOL_BUFFER,
> +       };
> +
> +       pool = odp_pool_create(pool_name, ODP_SHM_INVALID, &params);
> +       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> +
> +       pool = odp_pool_lookup(pool_name);
> +       CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
> +
> +       CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0);
> +       CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0);
> +       CU_ASSERT(info.shm == ODP_SHM_INVALID);
> +       CU_ASSERT(params.buf.size <= info.params.buf.size);
> +       CU_ASSERT(params.buf.align <= info.params.buf.align);
> +       CU_ASSERT(params.buf.num <= info.params.buf.num);
> +       CU_ASSERT(params.type == info.params.type);
> +
> +       odp_pool_print(pool);
> +
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +#define _CU_TEST_INFO(test_func) {#test_func, test_func}
> +
> +CU_TestInfo pool_tests[] = {
> +       _CU_TEST_INFO(pool_create_destroy_raw),
> +       _CU_TEST_INFO(pool_create_destroy_packet),
> +       _CU_TEST_INFO(pool_create_destroy_timeout),
> +       _CU_TEST_INFO(pool_create_destroy_raw_shm),
> +       _CU_TEST_INFO(pool_lookup_info_print),
> +       CU_TEST_INFO_NULL,
> +};
> +
> +CU_SuiteInfo odp_testsuites[] = {
> +       { .pName = "Pool tests",
> +                       .pTests = pool_tests,
> +       },
> +       CU_SUITE_INFO_NULL,
> +};
> diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c
> index 57db959..72d35fb 100644
> --- a/test/validation/odp_timer.c
> +++ b/test/validation/odp_timer.c
> @@ -49,6 +49,81 @@ struct test_timer {
>
>  #define TICK_INVALID (~(uint64_t)0)
>
> +static void test_timeout_pool_alloc(void)
> +{
> +       odp_pool_t pool;
> +       const int num = 3;
> +       odp_timeout_t tmo[num];
> +       odp_event_t ev;
> +       int index;
> +       char wrong_type = 0;
> +       odp_pool_param_t params = {
> +                       .tmo = {
> +                               .num   = num,
> +                       },
> +                       .type  = ODP_POOL_TIMEOUT,
> +       };
> +
> +       pool = odp_pool_create("timeout_pool_alloc", ODP_SHM_INVALID,
> &params);
> +       odp_pool_print(pool);
> +
> +       /* Try to allocate num items from the pool */
> +       for (index = 0; index < num; index++) {
> +               tmo[index] = odp_timeout_alloc(pool);
> +
> +               if (tmo[index] == ODP_TIMEOUT_INVALID)
> +                       break;
> +
> +               ev = odp_timeout_to_event(tmo[index]);
> +               if (odp_event_type(ev) != ODP_EVENT_TIMEOUT)
> +                       wrong_type = 1;
> +       }
> +
> +       /* Check that the pool had at least num items */
> +       CU_ASSERT(index == num);
> +       /* index points out of buffer[] or it point to an invalid buffer */
> +       index--;
> +
> +       /* Check that the pool had correct buffers */
> +       CU_ASSERT(wrong_type == 0);
> +
> +       for (; index >= 0; index--)
> +               odp_timeout_free(tmo[index]);
> +
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
> +static void test_timeout_pool_free(void)
> +{
> +       odp_pool_t pool;
> +       odp_timeout_t tmo;
> +       odp_pool_param_t params = {
> +                       .tmo = {
> +                               .num   = 1,
> +                       },
> +                       .type  = ODP_POOL_TIMEOUT,
> +       };
> +
> +       pool = odp_pool_create("timeout_pool_free", ODP_SHM_INVALID,
> &params);
> +       odp_pool_print(pool);
> +
> +       /* Allocate the only timeout from the pool */
> +       tmo = odp_timeout_alloc(pool);
> +       CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID);
> +
> +       /** @todo: is it correct to assume the pool had only one timeout?
> */
> +       CU_ASSERT_FATAL(odp_timeout_alloc(pool) == ODP_TIMEOUT_INVALID)
> +
> +       odp_timeout_free(tmo);
> +
> +       /* Check that the timeout was returned back to the pool */
> +       tmo = odp_timeout_alloc(pool);
> +       CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID);
> +
> +       odp_timeout_free(tmo);
> +       CU_ASSERT(odp_pool_destroy(pool) == 0);
> +}
> +
>  /* @private Handle a received (timeout) event */
>  static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick)
>  {
> @@ -355,6 +430,8 @@ static void test_odp_timer_all(void)
>  }
>
>  CU_TestInfo test_odp_timer[] = {
> +       {"test_timeout_pool_alloc",  test_timeout_pool_alloc},
> +       {"test_timeout_pool_free",  test_timeout_pool_free},
>         {"test_odp_timer_all",  test_odp_timer_all},
>         CU_TEST_INFO_NULL,
>  };
> --
> 1.9.1
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>

On 02/13/2015 05:13 AM, Bill Fischofer wrote:
>
>
> On Fri, Feb 13, 2015 at 10:59 AM, Taras Kondratiuk
> <taras.kondratiuk@linaro.org <mailto:taras.kondratiuk@linaro.org>> wrote:
>
>     Split pools, buffers, packets tests into separate executables to make
>     them independent.
>
>     Alloc and free API functions are now part of corresponding event types:
>     buffers, packets, timeouts, etc. Hence remove them from pool tests.
>
>     Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org
>     <mailto:taras.kondratiuk@linaro.org>>
>
>
> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org
> <mailto:bill.fischofer@linaro.org>>
>

Maxim, could you please merge this patch?

On 02/19/2015 01:43 PM, Taras Kondratiuk wrote:
> On 02/13/2015 05:13 AM, Bill Fischofer wrote:
>>
>>
>> On Fri, Feb 13, 2015 at 10:59 AM, Taras Kondratiuk
>> <taras.kondratiuk@linaro.org <mailto:taras.kondratiuk@linaro.org>> 
>> wrote:
>>
>>     Split pools, buffers, packets tests into separate executables to 
>> make
>>     them independent.
>>
>>     Alloc and free API functions are now part of corresponding event 
>> types:
>>     buffers, packets, timeouts, etc. Hence remove them from pool tests.
>>
>>     Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org
>>     <mailto:taras.kondratiuk@linaro.org>>
>>
>>
>> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org
>> <mailto:bill.fischofer@linaro.org>>
>>
>
> Maxim, could you please merge this patch?

Taras I see that odp_timer test which called from make check begin to 
crash after that change.
#0  0x000000000040f1f7 in _odp_buffer_type (buf=0xffffffff) at 
odp_buffer.c:47
#1  0x0000000000405cc8 in odp_event_type (event=0xffffffff) at 
odp_event.c:18
#2  0x000000000040ecfb in odp_timeout_from_event (ev=0xffffffff) at 
odp_timer.c:802
#3  0x000000000040ee87 in odp_timeout_alloc (pool=0x1) at odp_timer.c:848
#4  0x000000000040212e in test_timeout_pool_free () at odp_timer.c:115

odp_timeout_t odp_timeout_alloc(odp_pool_t pool)
{
     odp_buffer_t buf = odp_buffer_alloc(pool); <- returned invalid buf here
     return odp_timeout_from_event(odp_buffer_to_event(buf));
}


Also change to .gitignore is missing.

Please send updated patch.

Maxim.

On 02/19/2015 01:23 PM, Maxim Uvarov wrote:
> On 02/19/2015 01:43 PM, Taras Kondratiuk wrote:
>> On 02/13/2015 05:13 AM, Bill Fischofer wrote:
>>>
>>>
>>> On Fri, Feb 13, 2015 at 10:59 AM, Taras Kondratiuk
>>> <taras.kondratiuk@linaro.org <mailto:taras.kondratiuk@linaro.org>>
>>> wrote:
>>>
>>>     Split pools, buffers, packets tests into separate executables to
>>> make
>>>     them independent.
>>>
>>>     Alloc and free API functions are now part of corresponding event
>>> types:
>>>     buffers, packets, timeouts, etc. Hence remove them from pool tests.
>>>
>>>     Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org
>>>     <mailto:taras.kondratiuk@linaro.org>>
>>>
>>>
>>> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org
>>> <mailto:bill.fischofer@linaro.org>>
>>>
>>
>> Maxim, could you please merge this patch?
>
> Taras I see that odp_timer test which called from make check begin to
> crash after that change.
> #0  0x000000000040f1f7 in _odp_buffer_type (buf=0xffffffff) at
> odp_buffer.c:47
> #1  0x0000000000405cc8 in odp_event_type (event=0xffffffff) at
> odp_event.c:18
> #2  0x000000000040ecfb in odp_timeout_from_event (ev=0xffffffff) at
> odp_timer.c:802
> #3  0x000000000040ee87 in odp_timeout_alloc (pool=0x1) at odp_timer.c:848
> #4  0x000000000040212e in test_timeout_pool_free () at odp_timer.c:115
>
> odp_timeout_t odp_timeout_alloc(odp_pool_t pool)
> {
>      odp_buffer_t buf = odp_buffer_alloc(pool); <- returned invalid buf
> here
>      return odp_timeout_from_event(odp_buffer_to_event(buf));
> }

Looks like a bug in linux-generic odp_buffer_alloc().

I believe these changes are dependent on the
http://patches.opendataplane.org/patch/619/ patch series that fully
implement's Petri's latest design changes.

On Thu, Feb 19, 2015 at 7:07 AM, Taras Kondratiuk <
taras.kondratiuk@linaro.org> wrote:

> On 02/19/2015 01:23 PM, Maxim Uvarov wrote:
>
>> On 02/19/2015 01:43 PM, Taras Kondratiuk wrote:
>>
>>> On 02/13/2015 05:13 AM, Bill Fischofer wrote:
>>>
>>>>
>>>>
>>>> On Fri, Feb 13, 2015 at 10:59 AM, Taras Kondratiuk
>>>> <taras.kondratiuk@linaro.org <mailto:taras.kondratiuk@linaro.org>>
>>>> wrote:
>>>>
>>>>     Split pools, buffers, packets tests into separate executables to
>>>> make
>>>>     them independent.
>>>>
>>>>     Alloc and free API functions are now part of corresponding event
>>>> types:
>>>>     buffers, packets, timeouts, etc. Hence remove them from pool tests.
>>>>
>>>>     Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org
>>>>     <mailto:taras.kondratiuk@linaro.org>>
>>>>
>>>>
>>>> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org
>>>> <mailto:bill.fischofer@linaro.org>>
>>>>
>>>>
>>> Maxim, could you please merge this patch?
>>>
>>
>> Taras I see that odp_timer test which called from make check begin to
>> crash after that change.
>> #0  0x000000000040f1f7 in _odp_buffer_type (buf=0xffffffff) at
>> odp_buffer.c:47
>> #1  0x0000000000405cc8 in odp_event_type (event=0xffffffff) at
>> odp_event.c:18
>> #2  0x000000000040ecfb in odp_timeout_from_event (ev=0xffffffff) at
>> odp_timer.c:802
>> #3  0x000000000040ee87 in odp_timeout_alloc (pool=0x1) at odp_timer.c:848
>> #4  0x000000000040212e in test_timeout_pool_free () at odp_timer.c:115
>>
>> odp_timeout_t odp_timeout_alloc(odp_pool_t pool)
>> {
>>      odp_buffer_t buf = odp_buffer_alloc(pool); <- returned invalid buf
>> here
>>      return odp_timeout_from_event(odp_buffer_to_event(buf));
>> }
>>
>
> Looks like a bug in linux-generic odp_buffer_alloc().
>