aboutsummaryrefslogtreecommitdiff
path: root/test/validation
diff options
context:
space:
mode:
authorBill Fischofer <bill.fischofer@linaro.org>2015-07-09 16:46:24 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-07-21 18:02:36 +0300
commit5be42d9a8508a4e45786c59bd6bd0e058059540f (patch)
treece3c7d2a39a6887cb2355dced95e650896b3dc14 /test/validation
parent207142018cfd228f95bb5b124f9562ed3fa82312 (diff)
api: pool: remove shm paramter from odp_pool_create()
This patch removes the 2nd parameter to odp_pool_create() because it has two major issues: 1. Applications have no way to know how big a shm area is required for a given pool since that information is implementation specific. So there's no portable means of using this parameter. 2. Some implementations (e.g., odp-dpdk) cannot accept an external memory area for pool creation since they need to control the memory themselves. Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> Conflicts: test/validation/pktio/pktio.c test/validation/pool/pool.c helper/test/odp_chksum.c
Diffstat (limited to 'test/validation')
-rw-r--r--test/validation/buffer/buffer.c6
-rw-r--r--test/validation/classification/odp_classification_tests.c3
-rw-r--r--test/validation/crypto/crypto.c2
-rw-r--r--test/validation/packet/packet.c4
-rw-r--r--test/validation/pktio/pktio.c5
-rw-r--r--test/validation/pool/pool.c32
-rw-r--r--test/validation/queue/queue.c2
-rw-r--r--test/validation/scheduler/scheduler.c4
-rw-r--r--test/validation/timer/timer.c8
9 files changed, 18 insertions, 48 deletions
diff --git a/test/validation/buffer/buffer.c b/test/validation/buffer/buffer.c
index d0fd510f5..f67c55fc0 100644
--- a/test/validation/buffer/buffer.c
+++ b/test/validation/buffer/buffer.c
@@ -26,7 +26,7 @@ static int buffer_suite_init(void)
.type = ODP_POOL_BUFFER,
};
- raw_pool = odp_pool_create("raw_pool", ODP_SHM_INVALID, &params);
+ raw_pool = odp_pool_create("raw_pool", &params);
if (raw_pool == ODP_POOL_INVALID)
return -1;
raw_buffer = odp_buffer_alloc(raw_pool);
@@ -61,7 +61,7 @@ static void buffer_test_pool_alloc(void)
.type = ODP_POOL_BUFFER,
};
- pool = odp_pool_create("buffer_pool_alloc", ODP_SHM_INVALID, &params);
+ pool = odp_pool_create("buffer_pool_alloc", &params);
odp_pool_print(pool);
/* Try to allocate num items from the pool */
@@ -108,7 +108,7 @@ static void buffer_test_pool_free(void)
.type = ODP_POOL_BUFFER,
};
- pool = odp_pool_create("buffer_pool_free", ODP_SHM_INVALID, &params);
+ pool = odp_pool_create("buffer_pool_free", &params);
/* Allocate the only buffer from the pool */
buffer = odp_buffer_alloc(pool);
diff --git a/test/validation/classification/odp_classification_tests.c b/test/validation/classification/odp_classification_tests.c
index d618bf301..a4072c4bf 100644
--- a/test/validation/classification/odp_classification_tests.c
+++ b/test/validation/classification/odp_classification_tests.c
@@ -284,8 +284,7 @@ int classification_suite_init(void)
param.pkt.num = SHM_PKT_NUM_BUFS;
param.type = ODP_POOL_PACKET;
- pool = odp_pool_create("classification_pool",
- ODP_SHM_NULL, &param);
+ pool = odp_pool_create("classification_pool", &param);
if (ODP_POOL_INVALID == pool) {
fprintf(stderr, "Packet pool creation failed.\n");
return -1;
diff --git a/test/validation/crypto/crypto.c b/test/validation/crypto/crypto.c
index 5b06cdc09..ca7e74083 100644
--- a/test/validation/crypto/crypto.c
+++ b/test/validation/crypto/crypto.c
@@ -44,7 +44,7 @@ static int crypto_init(void)
params.pkt.num = SHM_PKT_POOL_SIZE / SHM_PKT_POOL_BUF_SIZE;
params.type = ODP_POOL_PACKET;
- pool = odp_pool_create("packet_pool", ODP_SHM_NULL, &params);
+ pool = odp_pool_create("packet_pool", &params);
if (ODP_POOL_INVALID == pool) {
fprintf(stderr, "Packet pool creation failed.\n");
diff --git a/test/validation/packet/packet.c b/test/validation/packet/packet.c
index 0bd166683..e6fb18ab7 100644
--- a/test/validation/packet/packet.c
+++ b/test/validation/packet/packet.c
@@ -53,7 +53,7 @@ static int packet_suite_init(void)
struct udata_struct *udat;
uint32_t udat_size;
- packet_pool = odp_pool_create("packet_pool", ODP_SHM_INVALID, &params);
+ packet_pool = odp_pool_create("packet_pool", &params);
if (packet_pool == ODP_POOL_INVALID)
return -1;
@@ -103,7 +103,7 @@ static void packet_test_alloc_free(void)
.type = ODP_POOL_PACKET,
};
- pool = odp_pool_create("packet_pool_alloc", ODP_SHM_INVALID, &params);
+ pool = odp_pool_create("packet_pool_alloc", &params);
/* Allocate the only buffer from the pool */
packet = odp_packet_alloc(pool, packet_len);
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index 665056863..bfdf52570 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -213,8 +213,7 @@ static int default_pool_create(void)
params.pkt.num = PKT_BUF_NUM;
params.type = ODP_POOL_PACKET;
- default_pkt_pool = odp_pool_create("pkt_pool_default",
- ODP_SHM_NULL, &params);
+ default_pkt_pool = odp_pool_create("pkt_pool_default", &params);
if (default_pkt_pool == ODP_POOL_INVALID)
return -1;
@@ -619,7 +618,7 @@ static int create_pool(const char *iface, int num)
snprintf(pool_name, sizeof(pool_name), "pkt_pool_%s", iface);
- pool[num] = odp_pool_create(pool_name, ODP_SHM_NULL, &params);
+ pool[num] = odp_pool_create(pool_name, &params);
if (ODP_POOL_INVALID == pool[num]) {
CU_FAIL("unable to create pool");
return -1;
diff --git a/test/validation/pool/pool.c b/test/validation/pool/pool.c
index 1b5403335..a888b6846 100644
--- a/test/validation/pool/pool.c
+++ b/test/validation/pool/pool.c
@@ -20,7 +20,7 @@ static void pool_create_destroy(odp_pool_param_t *params)
snprintf(pool_name, sizeof(pool_name),
"test_pool-%d", pool_name_number++);
- pool = odp_pool_create(pool_name, ODP_SHM_INVALID, params);
+ pool = odp_pool_create(pool_name, params);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
CU_ASSERT(odp_pool_to_u64(pool) !=
odp_pool_to_u64(ODP_POOL_INVALID));
@@ -67,32 +67,6 @@ static void pool_test_create_destroy_timeout(void)
pool_create_destroy(&params);
}
-static void pool_test_create_destroy_buffer_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_test_lookup_info_print(void)
{
odp_pool_t pool;
@@ -107,7 +81,7 @@ static void pool_test_lookup_info_print(void)
.type = ODP_POOL_BUFFER,
};
- pool = odp_pool_create(pool_name, ODP_SHM_INVALID, &params);
+ pool = odp_pool_create(pool_name, &params);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
pool = odp_pool_lookup(pool_name);
@@ -115,7 +89,6 @@ static void pool_test_lookup_info_print(void)
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);
@@ -132,7 +105,6 @@ static CU_TestInfo pool_suite[] = {
_CU_TEST_INFO(pool_test_create_destroy_buffer),
_CU_TEST_INFO(pool_test_create_destroy_packet),
_CU_TEST_INFO(pool_test_create_destroy_timeout),
- _CU_TEST_INFO(pool_test_create_destroy_buffer_shm),
_CU_TEST_INFO(pool_test_lookup_info_print),
CU_TEST_INFO_NULL,
};
diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c
index d598dbfac..ef7c8f24f 100644
--- a/test/validation/queue/queue.c
+++ b/test/validation/queue/queue.c
@@ -24,7 +24,7 @@ static int queue_suite_init(void)
params.buf.num = 1024 * 10;
params.type = ODP_POOL_BUFFER;
- pool = odp_pool_create("msg_pool", ODP_SHM_NULL, &params);
+ pool = odp_pool_create("msg_pool", &params);
if (ODP_POOL_INVALID == pool) {
printf("Pool create failed.\n");
diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c
index 37ff0faec..48522bbc6 100644
--- a/test/validation/scheduler/scheduler.c
+++ b/test/validation/scheduler/scheduler.c
@@ -120,7 +120,7 @@ static void scheduler_test_queue_destroy(void)
params.buf.num = 1;
params.type = ODP_POOL_BUFFER;
- p = odp_pool_create("sched_destroy_pool", ODP_SHM_NULL, &params);
+ p = odp_pool_create("sched_destroy_pool", &params);
CU_ASSERT_FATAL(p != ODP_POOL_INVALID);
@@ -680,7 +680,7 @@ static int scheduler_suite_init(void)
params.buf.num = MSG_POOL_SIZE / BUF_SIZE;
params.type = ODP_POOL_BUFFER;
- pool = odp_pool_create(MSG_POOL_NAME, ODP_SHM_NULL, &params);
+ pool = odp_pool_create(MSG_POOL_NAME, &params);
if (pool == ODP_POOL_INVALID) {
printf("Pool creation failed (msg).\n");
diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c
index 492d52fb4..ecca78564 100644
--- a/test/validation/timer/timer.c
+++ b/test/validation/timer/timer.c
@@ -65,7 +65,7 @@ static void timer_test_timeout_pool_alloc(void)
.type = ODP_POOL_TIMEOUT,
};
- pool = odp_pool_create("timeout_pool_alloc", ODP_SHM_NULL, &params);
+ pool = odp_pool_create("timeout_pool_alloc", &params);
odp_pool_print(pool);
/* Try to allocate num items from the pool */
@@ -105,7 +105,7 @@ static void timer_test_timeout_pool_free(void)
.type = ODP_POOL_TIMEOUT,
};
- pool = odp_pool_create("timeout_pool_free", ODP_SHM_NULL, &params);
+ pool = odp_pool_create("timeout_pool_free", &params);
odp_pool_print(pool);
/* Allocate the only timeout from the pool */
@@ -140,7 +140,7 @@ static void timer_test_odp_timer_cancel(void)
params.tmo.num = 1;
params.type = ODP_POOL_TIMEOUT;
- pool = odp_pool_create("tmo_pool_for_cancel", ODP_SHM_NULL, &params);
+ pool = odp_pool_create("tmo_pool_for_cancel", &params);
if (pool == ODP_POOL_INVALID)
CU_FAIL_FATAL("Timeout pool create failed");
@@ -452,7 +452,7 @@ static void timer_test_odp_timer_all(void)
/* Create timeout pools */
params.tmo.num = (NTIMERS + 1) * num_workers;
params.type = ODP_POOL_TIMEOUT;
- tbp = odp_pool_create("tmo_pool", ODP_SHM_NULL, &params);
+ tbp = odp_pool_create("tmo_pool", &params);
if (tbp == ODP_POOL_INVALID)
CU_FAIL_FATAL("Timeout pool create failed");