Merge branch 'master' into jvolivie/fused

Allow-unstable-test: true
Features: dfuse

ci/test_files_to_stash.txt

@@ -40,6 +40,8 @@ build/*/*/src/common/tests/umem_test,
 build/*/*/src/common/tests/umem_test_bmem,
 build/*/*/src/bio/smd/tests/smd_ut,
 build/*/*/src/tests/rpc/rpc_tests,
+build/*/*/src/engine/tests/abt_perf,
+build/*/*/src/engine/tests/abt_stack,
 src/common/tests/btree.sh,
 src/control/run_go_tests.sh,
 src/rdb/raft_tests/raft_tests.py,

site_scons/prereq_tools/base.py

@@ -461,7 +461,6 @@ def __init__(self, env, opts):
         opts.Add('USE_INSTALLED', 'Comma separated list of preinstalled dependencies', 'none')
         opts.Add(('MPI_PKG', 'Specifies name of pkg-config to load for MPI', None))
         opts.Add(BoolVariable('FIRMWARE_MGMT', 'Build in device firmware management.', False))
-        opts.Add(BoolVariable('STACK_MMAP', 'Allocate ABT ULTs stacks with mmap()', False))
         opts.Add(EnumVariable('BUILD_TYPE', "Set the build type", 'release',
                               ['dev', 'debug', 'release'], ignorecase=1))
         opts.Add(EnumVariable('TARGET_TYPE', "Set the prerequisite type", 'default',

src/common/SConscript

@@ -15,9 +15,9 @@ COMMON_FILES = ['debug.c', 'mem.c', 'fail_loc.c', 'lru.c',
 def build_daos_common(denv, client):
     """ Building non-pmem version for client's common lib"""
     benv = denv.Clone()
-    stack_mmap_files = []
     ad_mem_files = []
     dav_src = []
+    ult_files = []
 
     common_libs = ['isal', 'isal_crypto', 'cart', 'gurt', 'lz4', 'protobuf-c', 'uuid', 'pthread']
     if client:
@@ -30,18 +30,15 @@ def build_daos_common(denv, client):
                    'dav/ravl_interval.c', 'dav/recycler.c', 'dav/stats.c', 'dav/tx.c', 'dav/ulog.c',
                    'dav/util.c', 'dav/wal_tx.c']
         ad_mem_files = ['ad_mem.c', 'ad_tx.c']
+        ult_files = ['ult_errno.c']
         common_libs.extend(['pmemobj', 'abt', 'dav_v2'])
         benv.AppendUnique(RPATH_FULL=['$PREFIX/lib64/daos_srv'])
         benv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
         benv.Append(OBJPREFIX="v_")
         libname = 'daos_common_pmem'
         benv.require('pmdk', 'argobots')
 
-        if benv["STACK_MMAP"] == 1:
-            stack_mmap_files = ['stack_mmap.c']
-            benv.Append(CCFLAGS=['-DULT_MMAP_STACK'])
-
-    common = benv.d_library(libname, COMMON_FILES + dav_src + ad_mem_files + stack_mmap_files,
+    common = benv.d_library(libname, COMMON_FILES + dav_src + ad_mem_files + ult_files,
                             LIBS=common_libs)
     benv.Install('$PREFIX/lib64/', common)
     return common