examples/l2fwd-keepalive: clean up shared mem on exit
This patch adds the unlinking/unmapping of shared host memory on termination of l2fwd-keepalive. Previously it was only cleaned on re-running of the example application. Fixes: e64833f2273a ("examples/l2fwd-keepalive: add sample application") Signed-off-by: Remy Horton <remy.horton@intel.com> Tested-by: Roman Korynkevych <romanx.korynkevych@intel.com>
This commit is contained in:
parent
91e89e477e
commit
935439234b
@ -567,6 +567,7 @@ main(int argc, char **argv)
|
|||||||
unsigned lcore_id, rx_lcore_id;
|
unsigned lcore_id, rx_lcore_id;
|
||||||
unsigned nb_ports_in_mask = 0;
|
unsigned nb_ports_in_mask = 0;
|
||||||
struct sigaction signal_handler;
|
struct sigaction signal_handler;
|
||||||
|
struct rte_keepalive_shm *ka_shm;
|
||||||
|
|
||||||
memset(&signal_handler, 0, sizeof(signal_handler));
|
memset(&signal_handler, 0, sizeof(signal_handler));
|
||||||
terminate_signal_received = 0;
|
terminate_signal_received = 0;
|
||||||
@ -751,9 +752,8 @@ main(int argc, char **argv)
|
|||||||
rte_timer_subsystem_init();
|
rte_timer_subsystem_init();
|
||||||
rte_timer_init(&stats_timer);
|
rte_timer_init(&stats_timer);
|
||||||
|
|
||||||
|
ka_shm = NULL;
|
||||||
if (check_period > 0) {
|
if (check_period > 0) {
|
||||||
struct rte_keepalive_shm *ka_shm;
|
|
||||||
|
|
||||||
ka_shm = rte_keepalive_shm_create();
|
ka_shm = rte_keepalive_shm_create();
|
||||||
if (ka_shm == NULL)
|
if (ka_shm == NULL)
|
||||||
rte_exit(EXIT_FAILURE,
|
rte_exit(EXIT_FAILURE,
|
||||||
@ -813,5 +813,7 @@ main(int argc, char **argv)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ka_shm != NULL)
|
||||||
|
rte_keepalive_shm_cleanup(ka_shm);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -129,3 +129,13 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm *shm,
|
|||||||
strerror(errno));
|
strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void rte_keepalive_shm_cleanup(struct rte_keepalive_shm *ka_shm)
|
||||||
|
{
|
||||||
|
if (shm_unlink(RTE_KEEPALIVE_SHM_NAME) == -1 && errno != ENOENT)
|
||||||
|
printf("Warning: Error unlinking %s (%s)\n",
|
||||||
|
RTE_KEEPALIVE_SHM_NAME, strerror(errno));
|
||||||
|
|
||||||
|
if (ka_shm && munmap(ka_shm, sizeof(struct rte_keepalive_shm)) != 0)
|
||||||
|
printf("Warning: munmap() failed\n");
|
||||||
|
}
|
||||||
|
@ -87,3 +87,12 @@ struct rte_keepalive_shm *rte_keepalive_shm_create(void);
|
|||||||
void rte_keepalive_relayed_state(struct rte_keepalive_shm *shm,
|
void rte_keepalive_relayed_state(struct rte_keepalive_shm *shm,
|
||||||
const int id_core, const enum rte_keepalive_state core_state,
|
const int id_core, const enum rte_keepalive_state core_state,
|
||||||
uint64_t last_alive);
|
uint64_t last_alive);
|
||||||
|
|
||||||
|
/** Shutdown cleanup of shared host memory keepalive object.
|
||||||
|
* @param *shm
|
||||||
|
* Pointer to SHM keepalive structure. May be NULL.
|
||||||
|
*
|
||||||
|
* If *shm is NULL, this function will only attempt to remove the
|
||||||
|
* shared host memory handle and not unmap the underlying memory.
|
||||||
|
*/
|
||||||
|
void rte_keepalive_shm_cleanup(struct rte_keepalive_shm *ka_shm);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user