From: Petri Savolainen <[email protected]> Flags default value is zero (share memory within ODP, include HW accelerators).
Signed-off-by: Petri Savolainen <[email protected]> Signed-off-by: Maxim Uvarov <[email protected]> --- example/generator/odp_generator.c | 5 +++-- example/ipsec/odp_ipsec.c | 12 ++++++++---- example/ipsec/odp_ipsec_cache.c | 3 ++- example/ipsec/odp_ipsec_fwd_db.c | 3 ++- example/ipsec/odp_ipsec_loop_db.c | 3 ++- example/ipsec/odp_ipsec_sa_db.c | 3 ++- example/ipsec/odp_ipsec_sp_db.c | 3 ++- example/ipsec/odp_ipsec_stream.c | 3 ++- example/l2fwd/odp_l2fwd.c | 5 +++-- example/odp_example/odp_example.c | 2 +- example/packet/odp_pktio.c | 5 +++-- example/timer/odp_timer_test.c | 2 +- platform/linux-generic/odp_buffer_pool.c | 2 +- platform/linux-generic/odp_crypto.c | 3 ++- platform/linux-generic/odp_packet_io.c | 2 +- platform/linux-generic/odp_queue.c | 2 +- platform/linux-generic/odp_ring.c | 2 +- platform/linux-generic/odp_schedule.c | 10 +++++++--- test/api_test/odp_shm_test.c | 2 +- test/api_test/odp_timer_ping.c | 2 +- 20 files changed, 46 insertions(+), 28 deletions(-) diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 65c2034..10c7b31 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -537,7 +537,8 @@ int main(int argc, char *argv[]) odp_atomic_init_u64(&counters.icmp); /* Reserve memory for args from shared mem */ - args = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE); + args = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); if (args == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); @@ -582,7 +583,7 @@ int main(int argc, char *argv[]) /* Create packet pool */ pool_base = odp_shm_reserve("shm_packet_pool", - SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); if (pool_base == NULL) { ODP_ERR("Error: packet pool mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 1f42fe6..5b7abf6 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -401,7 +401,8 @@ void ipsec_init_pre(void) /* Create output buffer pool */ pool_base = odp_shm_reserve("shm_out_pool", - SHM_OUT_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_OUT_POOL_SIZE, ODP_CACHE_LINE_SIZE, + 0); out_pool = odp_buffer_pool_create("out_pool", pool_base, SHM_OUT_POOL_SIZE, @@ -1190,7 +1191,8 @@ main(int argc, char *argv[]) odp_init_local(thr_id); /* Reserve memory for args from shared mem */ - args = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE); + args = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, + 0); if (NULL == args) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); @@ -1232,7 +1234,8 @@ main(int argc, char *argv[]) /* Create packet buffer pool */ pool_base = odp_shm_reserve("shm_packet_pool", - SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE, + 0); if (NULL == pool_base) { ODP_ERR("Error: packet pool mem alloc failed.\n"); exit(EXIT_FAILURE); @@ -1250,7 +1253,8 @@ main(int argc, char *argv[]) /* Create context buffer pool */ pool_base = odp_shm_reserve("shm_ctx_pool", - SHM_CTX_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_CTX_POOL_SIZE, ODP_CACHE_LINE_SIZE, + 0); if (NULL == pool_base) { ODP_ERR("Error: context pool mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index fe0618c..1b99218 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -21,7 +21,8 @@ void init_ipsec_cache(void) { ipsec_cache = odp_shm_reserve("shm_ipsec_cache", sizeof(ipsec_cache_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (ipsec_cache == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c index beb2d9e..de2e43e 100644 --- a/example/ipsec/odp_ipsec_fwd_db.c +++ b/example/ipsec/odp_ipsec_fwd_db.c @@ -20,7 +20,8 @@ void init_fwd_db(void) { fwd_db = odp_shm_reserve("shm_fwd_db", sizeof(fwd_db_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (fwd_db == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_loop_db.c b/example/ipsec/odp_ipsec_loop_db.c index 889b24f..222ccb9 100644 --- a/example/ipsec/odp_ipsec_loop_db.c +++ b/example/ipsec/odp_ipsec_loop_db.c @@ -21,7 +21,8 @@ void init_loopback_db(void) loopback_db = odp_shm_reserve("loopback_db", sizeof(loopback_db_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (loopback_db == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index c2e9e19..612da86 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -20,7 +20,8 @@ void init_sa_db(void) { sa_db = odp_shm_reserve("shm_sa_db", sizeof(sa_db_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (sa_db == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c index d498be5..7d9bba1 100644 --- a/example/ipsec/odp_ipsec_sp_db.c +++ b/example/ipsec/odp_ipsec_sp_db.c @@ -20,7 +20,8 @@ void init_sp_db(void) { sp_db = odp_shm_reserve("shm_sp_db", sizeof(sp_db_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (sp_db == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index e1fb27e..ced055a 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -50,7 +50,8 @@ void init_stream_db(void) { stream_db = odp_shm_reserve("stream_db", sizeof(stream_db_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, + 0); if (stream_db == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/l2fwd/odp_l2fwd.c b/example/l2fwd/odp_l2fwd.c index 6a38c1b..e19aa94 100644 --- a/example/l2fwd/odp_l2fwd.c +++ b/example/l2fwd/odp_l2fwd.c @@ -329,7 +329,8 @@ int main(int argc, char *argv[]) } /* Reserve memory for args from shared mem */ - gbl_args = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE); + gbl_args = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); if (gbl_args == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); @@ -380,7 +381,7 @@ int main(int argc, char *argv[]) /* Create packet pool */ pool_base = odp_shm_reserve("shm_packet_pool", - SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); if (pool_base == NULL) { ODP_ERR("Error: packet pool mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/odp_example/odp_example.c b/example/odp_example/odp_example.c index 40d237b..e99df85 100644 --- a/example/odp_example/odp_example.c +++ b/example/odp_example/odp_example.c @@ -1004,7 +1004,7 @@ int main(int argc, char *argv[]) * Create message pool */ pool_base = odp_shm_reserve("msg_pool", - MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE); + MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, sizeof(test_message_t), diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 88ce575..7f2d43f 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -317,7 +317,8 @@ int main(int argc, char *argv[]) } /* Reserve memory for args from shared mem */ - args = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE); + args = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); if (args == NULL) { ODP_ERR("Error: shared mem alloc failed.\n"); exit(EXIT_FAILURE); @@ -358,7 +359,7 @@ int main(int argc, char *argv[]) /* Create packet pool */ pool_base = odp_shm_reserve("shm_packet_pool", - SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SHM_PKT_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); if (pool_base == NULL) { ODP_ERR("Error: packet pool mem alloc failed.\n"); exit(EXIT_FAILURE); diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 1061190..fd46f16 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) * Create message pool */ pool_base = odp_shm_reserve("msg_pool", - MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE); + MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, 0, diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c index e538f04..f54a0c4 100644 --- a/platform/linux-generic/odp_buffer_pool.c +++ b/platform/linux-generic/odp_buffer_pool.c @@ -117,7 +117,7 @@ int odp_buffer_pool_init_global(void) pool_tbl = odp_shm_reserve("odp_buffer_pools", sizeof(pool_table_t), - sizeof(pool_entry_t)); + sizeof(pool_entry_t), 0); if (pool_tbl == NULL) return -1; diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index fae546c..2942a84 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -409,7 +409,8 @@ odp_crypto_init_global(void) mem_size += (MAX_SESSIONS * sizeof(odp_crypto_generic_session_t)); /* Allocate our globally shared memory */ - global = odp_shm_reserve("crypto_pool", mem_size, ODP_CACHE_LINE_SIZE); + global = odp_shm_reserve("crypto_pool", mem_size, + ODP_CACHE_LINE_SIZE, 0); /* Clear it out */ memset(global, 0, mem_size); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 33ade10..944c1d4 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -55,7 +55,7 @@ int odp_pktio_init_global(void) pktio_tbl = odp_shm_reserve("odp_pktio_entries", sizeof(pktio_table_t), - sizeof(pktio_entry_t)); + sizeof(pktio_entry_t), 0); if (pktio_tbl == NULL) return -1; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index c637bdf..9852598 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -99,7 +99,7 @@ int odp_queue_init_global(void) queue_tbl = odp_shm_reserve("odp_queues", sizeof(queue_table_t), - sizeof(queue_entry_t)); + sizeof(queue_entry_t), 0); if (queue_tbl == NULL) return -1; diff --git a/platform/linux-generic/odp_ring.c b/platform/linux-generic/odp_ring.c index 720d8db..3e72952 100644 --- a/platform/linux-generic/odp_ring.c +++ b/platform/linux-generic/odp_ring.c @@ -171,7 +171,7 @@ odph_ring_create(const char *name, unsigned count, unsigned flags) odp_rwlock_write_lock(&qlock); /* reserve a memory zone for this ring.*/ - r = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE); + r = odp_shm_reserve(ring_name, ring_size, ODP_CACHE_LINE_SIZE, 0); if (r != NULL) { /* init the ring structure */ diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 9e399f1..16ae4af 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -89,16 +89,20 @@ int odp_schedule_init_global(void) sched = odp_shm_reserve("odp_scheduler", sizeof(sched_t), - ODP_CACHE_LINE_SIZE); + ODP_CACHE_LINE_SIZE, 0); if (sched == NULL) { ODP_ERR("Schedule init: Shm reserve failed.\n"); return -1; } - pool_base = odp_shm_reserve("odp_sched_pool", - SCHED_POOL_SIZE, ODP_CACHE_LINE_SIZE); + SCHED_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); + + if (pool_base == NULL) { + ODP_ERR("Schedule init: Shm reserve failed.\n"); + return -1; + } pool = odp_buffer_pool_create("odp_sched_pool", pool_base, SCHED_POOL_SIZE, sizeof(queue_desc_t), diff --git a/test/api_test/odp_shm_test.c b/test/api_test/odp_shm_test.c index 318d662..376b06f 100644 --- a/test/api_test/odp_shm_test.c +++ b/test/api_test/odp_shm_test.c @@ -47,7 +47,7 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) odp_print_system_info(); test_shared_data = odp_shm_reserve("test_shared_data", - sizeof(test_shared_data_t), 128); + sizeof(test_shared_data_t), 128, 0); memset(test_shared_data, 0, sizeof(test_shared_data_t)); printf("test shared data at %p\n\n", test_shared_data); diff --git a/test/api_test/odp_timer_ping.c b/test/api_test/odp_timer_ping.c index 6ba30d3..a31567a 100644 --- a/test/api_test/odp_timer_ping.c +++ b/test/api_test/odp_timer_ping.c @@ -328,7 +328,7 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) * Create message pool */ pool_base = odp_shm_reserve("msg_pool", - MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE); + MSG_POOL_SIZE, ODP_CACHE_LINE_SIZE, 0); pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, BUF_SIZE, -- 1.8.5.1.163.gd7aced9 _______________________________________________ lng-odp mailing list [email protected] http://lists.linaro.org/mailman/listinfo/lng-odp
