Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature #14713

Merged
merged 24 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c6077b9
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Jun 24, 2024
e8fda92
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Jun 24, 2024
fa47576
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Jul 24, 2024
146e05a
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Jun 24, 2024
7c42c9b
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Jul 26, 2024
47e7e61
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Aug 19, 2024
59bde4b
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Aug 22, 2024
a7144bf
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Aug 22, 2024
4417389
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Nov 18, 2024
f55cff9
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 4, 2024
f38dbff
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
99ccc47
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 6, 2024
064666b
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
9232779
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
b5b3c85
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
50b1b3a
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 6, 2024
3af7152
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
f2ec467
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 16, 2024
0b0b949
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
1a033cf
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
225d2c9
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 16, 2024
6429410
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
6f2a70d
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Dec 16, 2024
028cd28
DAOS-16073 iosrv: Invalid ULT stack size with MMAP_STACK feature
kanard38 Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci/test_files_to_stash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion site_scons/prereq_tools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(BoolVariable('STATIC_FUSE', "Build with static libfuse library", False))
opts.Add(EnumVariable('BUILD_TYPE', "Set the build type", 'release',
['dev', 'debug', 'release'], ignorecase=1))
Expand Down
9 changes: 3 additions & 6 deletions src/common/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
342 changes: 0 additions & 342 deletions src/common/stack_mmap.c

This file was deleted.

Loading
Loading