1
1

Fix finalize of flux component

Per patches from @SteVwonder and @garlick

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit d4070d5f58)
Этот коммит содержится в:
Ralph Castain 2019-06-18 21:14:04 -07:00
родитель 73c4aac12d
Коммит 05fa5845bc
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B63B630167D26BB5

Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
@ -373,6 +373,7 @@ static int flux_init(opal_list_t *ilist)
char *str; char *str;
if (0 < pmix_init_count) { if (0 < pmix_init_count) {
pmix_init_count++;
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
@ -585,11 +586,10 @@ static int flux_fini(void) {
if (0 == --pmix_init_count) { if (0 == --pmix_init_count) {
PMI_Finalize (); PMI_Finalize ();
// teardown hash table
opal_pmix_base_hash_finalize();
} }
// teardown hash table
opal_pmix_base_hash_finalize();
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }