[v4,1/2] linux-generic: implement of odp_term_global.

From: Yan Sonming <yan.songming@linaro.org>

Free global resource of odp which include share memory, queue and buffer pool.

Signed-off-by: Yan Songming <yan.songming@linaro.org>
---
 platform/linux-generic/include/odp_internal.h |  8 ++++++
 platform/linux-generic/odp_buffer_pool.c      | 31 ++++++++++++++++++++-
 platform/linux-generic/odp_classification.c   | 25 +++++++++++++++++
 platform/linux-generic/odp_crypto.c           | 13 +++++++++
 platform/linux-generic/odp_init.c             | 40 ++++++++++++++++++++++++++-
 platform/linux-generic/odp_packet_io.c        | 20 ++++++++++++++
 platform/linux-generic/odp_queue.c            | 25 +++++++++++++++++
 platform/linux-generic/odp_schedule.c         | 25 +++++++++++++++++
 platform/linux-generic/odp_shared_memory.c    |  8 ++++++
 platform/linux-generic/odp_thread.c           | 13 +++++++++
 10 files changed, 206 insertions(+), 2 deletions(-)

Yan, if you send patches with git send-email command you need to send 
all patches patches in one short.
Like git send-email 1.patch 2.patch
In that case email client will include such emails to email thread.

Some comment to that patch are bellow.

Maxim.

On 01/29/2015 04:10 PM, Yan Songming wrote:
> From: Yan Sonming <yan.songming@linaro.org>
>
> Free global resource of odp which include share memory, queue and buffer pool.
>
> Signed-off-by: Yan Songming <yan.songming@linaro.org>
> ---
>   platform/linux-generic/include/odp_internal.h |  8 ++++++
>   platform/linux-generic/odp_buffer_pool.c      | 31 ++++++++++++++++++++-
>   platform/linux-generic/odp_classification.c   | 25 +++++++++++++++++
>   platform/linux-generic/odp_crypto.c           | 13 +++++++++
>   platform/linux-generic/odp_init.c             | 40 ++++++++++++++++++++++++++-
>   platform/linux-generic/odp_packet_io.c        | 20 ++++++++++++++
>   platform/linux-generic/odp_queue.c            | 25 +++++++++++++++++
>   platform/linux-generic/odp_schedule.c         | 25 +++++++++++++++++
>   platform/linux-generic/odp_shared_memory.c    |  8 ++++++
>   platform/linux-generic/odp_thread.c           | 13 +++++++++
>   10 files changed, 206 insertions(+), 2 deletions(-)
>
> diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
> index 07c9f60..60d89b1 100644
> --- a/platform/linux-generic/include/odp_internal.h
> +++ b/platform/linux-generic/include/odp_internal.h
> @@ -29,22 +29,30 @@ int odp_system_info_init(void);
>   int odp_thread_init_global(void);
>   int odp_thread_init_local(void);
>   int odp_thread_term_local(void);
> +int odp_thread_term_global(void);
>   
>   int odp_shm_init_global(void);
> +int odp_shm_term_global(void);
>   int odp_shm_init_local(void);
>   
>   int odp_buffer_pool_init_global(void);
> +int odp_buffer_pool_term_global(void);
>   
>   int odp_pktio_init_global(void);
> +int odp_pktio_term_global(void);
>   int odp_pktio_init_local(void);
>   
>   int odp_classification_init_global(void);
> +int odp_classification_term_global(void);
>   
>   int odp_queue_init_global(void);
> +int odp_queue_term_global(void);
>   
>   int odp_crypto_init_global(void);
> +int odp_crypto_term_global(void);
>   
>   int odp_schedule_init_global(void);
> +int odp_schedule_term_global(void);
>   int odp_schedule_init_local(void);
>   
>   int odp_timer_init_global(void);
> diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c
> index ac12057..3f4a3e6 100644
> --- a/platform/linux-generic/odp_buffer_pool.c
> +++ b/platform/linux-generic/odp_buffer_pool.c
> @@ -55,6 +55,7 @@ typedef struct pool_table_t {
>   
>   /* The pool table */
>   static pool_table_t *pool_tbl;
> +static const char shm_name[] = "odp_buffer_pools";
>   
>   /* Pool entry pointers (for inlining) */
>   void *pool_entry_ptr[ODP_CONFIG_POOLS];
> @@ -67,7 +68,7 @@ int odp_buffer_pool_init_global(void)
>   	uint32_t i;
>   	odp_shm_t shm;
>   
> -	shm = odp_shm_reserve("odp_buffer_pools",
> +	shm = odp_shm_reserve(shm_name,
>   			      sizeof(pool_table_t),
>   			      sizeof(pool_entry_t), 0);
>   
> @@ -95,6 +96,34 @@ int odp_buffer_pool_init_global(void)
>   	return 0;
>   }
>   
> +int odp_buffer_pool_term_global(void)
> +{
> +	odp_shm_t shm;
> +	int i;
> +	pool_entry_t *pool;
> +	int ret = 0;
> +
> +	for (i = 0; i < ODP_CONFIG_POOLS; i++) {
> +		pool = get_pool_entry(i);
> +
> +		POOL_LOCK(&pool->s.lock);
> +		if (pool->s.pool_shm != ODP_SHM_INVALID) {
> +			ODP_ERR("Not destroyed pool: %s\n", pool->s.name);
> +			ret = -1;
> +		}
> +		POOL_UNLOCK(&pool->s.lock);
> +	}
> +	if (ret)
> +		return ret;
> +
> +	shm = odp_shm_lookup(shm_name);
> +	if (shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}

I think that above logic is not correct. Lest say pools 1,2 are busy, 3 
- is free, 4,6 are busy. So you need to walk over all
list and call odp_shm_free() for all busy pools and skip already freed.

Maxim.

> +
>   /**
>    * Pool creation
>    */
> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
> index 0f58836..56447fd 100644
> --- a/platform/linux-generic/odp_classification.c
> +++ b/platform/linux-generic/odp_classification.c
> @@ -124,6 +124,31 @@ error:
>   	return -1;
>   }
>   
> +int odp_classification_term_global(void)
> +{
> +	odp_shm_t cos_shm;
> +	odp_shm_t pmr_shm;
> +	odp_shm_t pmr_set_shm;
> +	int ret = 0;
> +
> +	cos_shm = odp_shm_lookup("shm_odp_cos_tbl");
> +	if (cos_shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(cos_shm);
> +
> +	pmr_shm = odp_shm_lookup("shm_odp_pmr_tbl");
> +	if (pmr_shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(pmr_shm);
> +
> +	pmr_set_shm = odp_shm_lookup("shm_odp_pmr_set_tbl");
> +	if (pmr_set_shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(pmr_set_shm);
> +
> +	return ret;
> +}
> +
>   odp_cos_t odp_cos_create(const char *name)
>   {
>   	int i;
> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
> index 4436a0c..4b9ab76 100644
> --- a/platform/linux-generic/odp_crypto.c
> +++ b/platform/linux-generic/odp_crypto.c
> @@ -428,6 +428,19 @@ odp_crypto_init_global(void)
>   	return 0;
>   }
>   
> +int odp_crypto_term_global(void)
> +{
> +	odp_shm_t shm;
> +	int ret = 0;
> +
> +	shm = odp_shm_lookup("crypto_pool");
> +	if (shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}
> +
>   int
>   odp_hw_random_get(uint8_t *buf, size_t *len, bool use_entropy ODP_UNUSED)
>   {
> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
> index 9815ecf..1351b31 100644
> --- a/platform/linux-generic/odp_init.c
> +++ b/platform/linux-generic/odp_init.c
> @@ -72,7 +72,45 @@ int odp_init_global(odp_init_t *params  ODP_UNUSED,
>   
>   int odp_term_global(void)
>   {
> -	ODP_UNIMPLEMENTED();
> +	if (odp_classification_term_global()) {
> +		ODP_ERR("ODP classificatio term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_crypto_term_global()) {
> +		ODP_ERR("ODP crypto term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_pktio_term_global()) {
> +		ODP_ERR("ODP pktio term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_schedule_term_global()) {
> +		ODP_ERR("ODP schedule term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_queue_term_global()) {
> +		ODP_ERR("ODP queue term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_buffer_pool_term_global()) {
> +		ODP_ERR("ODP buffer pool term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_thread_term_global()) {
> +		ODP_ERR("ODP thread term failed.\n");
> +		return -1;
> +	}
> +
> +	if (odp_shm_term_global()) {
> +		ODP_ERR("ODP shm term failed.\n");
> +		return -1;
> +	}
>   	return 0;
>   }
>   
> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
> index 52125fc..3bfa03f 100644
> --- a/platform/linux-generic/odp_packet_io.c
> +++ b/platform/linux-generic/odp_packet_io.c
> @@ -79,6 +79,26 @@ int odp_pktio_init_global(void)
>   	return 0;
>   }
>   
> +int odp_pktio_term_global(void)
> +{
> +	odp_shm_t shm;
> +	pktio_entry_t *pktio_entry;
> +	int ret = 0;
> +	int id;
> +
> +	for (id = 1; id <= ODP_CONFIG_PKTIO_ENTRIES; ++id) {
> +		pktio_entry = &pktio_tbl->entries[id - 1];
> +		odp_queue_destroy(pktio_entry->s.outq_default);
Same thing for incomming queue?
odp_pktio_inq_remdef()  ?

> +	}
> +
> +	shm = odp_shm_lookup("odp_pktio_entries");
> +	if (shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}
> +
>   int odp_pktio_init_local(void)
>   {
>   	return 0;
> diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
> index 17ff7c1..58db0bc 100644
> --- a/platform/linux-generic/odp_queue.c
> +++ b/platform/linux-generic/odp_queue.c
> @@ -128,6 +128,31 @@ int odp_queue_init_global(void)
>   	return 0;
>   }
>   
> +int odp_queue_term_global(void)
> +{
> +	odp_shm_t shm;
> +	int ret = 0;
> +	queue_entry_t *queue;
> +	int i;
> +
> +	for (i = 0; i < ODP_CONFIG_QUEUES; i++) {
> +		queue = &queue_tbl->queue[i];
> +		LOCK(&queue->s.lock);
> +		if (queue->s.status != QUEUE_STATUS_FREE) {
> +			ODP_ERR("Not destroyed queue: %s\n", queue->s.name);
> +			ret = -1;
> +		}
> +		UNLOCK(&queue->s.lock);
> +	}
> +
> +	shm = odp_shm_lookup("odp_queues");
> +	if (shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}
> +
>   odp_queue_type_t odp_queue_type(odp_queue_t handle)
>   {
>   	queue_entry_t *queue;
> diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
> index 58561a9..bff28d9 100644
> --- a/platform/linux-generic/odp_schedule.c
> +++ b/platform/linux-generic/odp_schedule.c
> @@ -144,6 +144,31 @@ int odp_schedule_init_global(void)
>   	return 0;
>   }
>   
> +int odp_schedule_term_global(void)
> +{
> +	odp_shm_t shm;
> +	int ret = 0;
> +	int i, j;
> +
> +	for (i = 0; i < ODP_CONFIG_SCHED_PRIOS; i++) {
> +		for (j = 0; j < QUEUES_PER_PRIO; j++)
> +			odp_queue_destroy(sched->pri_queue[i][j]);
> +	}
> +
> +	if (odp_pool_destroy(sched->pool) != 0) {
> +		ODP_ERR("Sched term: Pool destroy fail.\n");
> +		return -1;
> +	}
> +
> +	shm = odp_shm_lookup("odp_scheduler");
> +	if (shm == ODP_SHM_INVALID) {
> +		ODP_ERR("Sched term: Shm lookup fail.\n");
> +		return -1;
> +	}
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}
>   
>   int odp_schedule_init_local(void)
>   {
> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
> index 515a26f..9ba0dc9 100644
> --- a/platform/linux-generic/odp_shared_memory.c
> +++ b/platform/linux-generic/odp_shared_memory.c
> @@ -96,6 +96,14 @@ int odp_shm_init_global(void)
>   	return 0;
>   }
>   
> +int odp_shm_term_global(void)
> +{
> +	int ret = 0;

set to 0 is not needed.

> +
> +	ret = munmap(odp_shm_tbl, sizeof(odp_shm_table_t));
> +	return ret;
> +}
> +
>   
>   int odp_shm_init_local(void)
>   {
> diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
> index ccbd068..933e920 100644
> --- a/platform/linux-generic/odp_thread.c
> +++ b/platform/linux-generic/odp_thread.c
> @@ -64,6 +64,19 @@ int odp_thread_init_global(void)
>   	return 0;
>   }
>   
> +int odp_thread_term_global(void)
> +{
> +	odp_shm_t shm;
> +	int ret = 0;
set to 0 is not needed

> +
> +	shm = odp_shm_lookup("odp_thread_globals");
> +	if (shm == ODP_SHM_INVALID)
> +		return -1;
> +	ret = odp_shm_free(shm);
> +
> +	return ret;
> +}
> +
>   
>   static int thread_id(void)
>   {