UCS/TEST: Remove entry from configuration list when library is unloaded

 When UCT is loaded, the static initializer adds it's configuration
tables to the global list in UCS. When UCT is unloaded, need to remove
them from that list, otherwise the list will point to invalid memory.

contrib/test_jenkins.sh

@@ -702,6 +702,15 @@ test_dlopen() {
 	! grep '^socket' strace.log
 }
 
+test_dlopen_cfg_print() {
+	../contrib/configure-devel --prefix=$ucx_inst
+	$MAKE clean
+	$MAKE
+
+	echo "==== Running test_dlopen_cfg_print ===="
+	./test/apps/test_dlopen_cfg_print
+}
+
 test_memtrack() {
 	../contrib/configure-devel --prefix=$ucx_inst
 	$MAKE clean
@@ -930,6 +939,7 @@ run_tests() {
 	do_distributed_task 1 4 run_ucp_client_server
 	do_distributed_task 3 4 test_profiling
 	do_distributed_task 3 4 test_dlopen
+	do_distributed_task 2 4 test_dlopen_cfg_print
 	do_distributed_task 3 4 test_memtrack
 	do_distributed_task 0 4 test_unused_env_var
 	do_distributed_task 1 3 test_malloc_hook

src/ucs/config/parser.h

@@ -82,14 +82,19 @@ typedef struct ucs_config_global_list_entry {
 
 
 #define UCS_CONFIG_REGISTER_TABLE(_fields, _name, _prefix, _type) \
+    static ucs_config_global_list_entry_t _fields##_config_entry; \
     UCS_STATIC_INIT { \
+        ucs_config_global_list_entry_t *entry = &_fields##_config_entry; \
         extern ucs_list_link_t ucs_config_global_list; \
-        static ucs_config_global_list_entry_t entry; \
-        entry.fields = _fields; \
-        entry.name   = _name; \
-        entry.prefix = _prefix; \
-        entry.size   = sizeof(_type); \
-        ucs_list_add_tail(&ucs_config_global_list, &entry.list); \
+        entry->fields = _fields; \
+        entry->name   = _name; \
+        entry->prefix = _prefix; \
+        entry->size   = sizeof(_type); \
+        ucs_list_add_tail(&ucs_config_global_list, &entry->list); \
+    } \
+    \
+    UCS_STATIC_CLEANUP { \
+        ucs_list_del(&_fields##_config_entry.list); \
     }
 
 

test/apps/Makefile.am

@@ -11,8 +11,8 @@ SUBDIRS = sockaddr
 endif
 
 noinst_PROGRAMS = \
-	test_dlopen
-
+	test_dlopen \
+	test_dlopen_cfg_print
 
 objdir = $(shell sed -n -e 's/^objdir=\(.*\)$$/\1/p' $(LIBTOOL))
 
@@ -21,6 +21,13 @@ test_dlopen_CPPFLAGS = $(BASE_CPPFLAGS) -g -DUCP_LIB_PATH=$(abs_top_builddir)/sr
 test_dlopen_CFLAGS   = $(BASE_CFLAGS)
 test_dlopen_LDADD    = -ldl
 
+test_dlopen_cfg_print_SOURCES  = test_dlopen_cfg_print.c
+test_dlopen_cfg_print_CPPFLAGS = $(BASE_CPPFLAGS) -g \
+	-DUCS_LIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir)/libucs.so \
+	-DUCT_LIB_PATH=$(abs_top_builddir)/src/uct/$(objdir)/libuct.so
+test_dlopen_cfg_print_CFLAGS   = $(BASE_CFLAGS)
+test_dlopen_cfg_print_LDADD    = -ldl
+
 if HAVE_TCMALLOC
 noinst_PROGRAMS       += test_tcmalloc
 test_tcmalloc_SOURCES  = test_tcmalloc.c