Skip to content

DAOS-16311 control: Add C bindings for control API #17550

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.

Sign up for GitHub

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

Draft
mjmac wants to merge 1 commit into
base: master
Choose a base branch
from
+5,085 −1,974
Draft

DAOS-16311 control: Add C bindings for control API #17550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion site_scons/site_tools/go_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
if dep[-1] == '"':
includes.append(File(os.path.join(src_dir, header)))
else:
includes.append(f'../../../include/{header}')
# For angle-bracket includes, only track DAOS headers (in src/include/).
# Skip system headers like <stdlib.h>, <stdint.h>, etc.

Check warning on line 47 in site_scons/site_tools/go_builder.py

View workflow job for this annotation

GitHub Actions / Pylint check 

wrong-spelling-in-comment, Wrong spelling of a word 'stdint' in a comment:

Check warning on line 47 in site_scons/site_tools/go_builder.py

View workflow job for this annotation

GitHub Actions / Pylint check 

wrong-spelling-in-comment, Wrong spelling of a word 'stdlib' in a comment:
daos_hdr = os.path.join(Dir('#').abspath, 'src', 'include', header)
if os.path.exists(daos_hdr):
includes.append(daos_hdr)

return includes

Expand Down
2 changes: 2 additions & 0 deletions src/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def scons():
env.Install(os.path.join('$PREFIX', 'include/daos'), 'include/daos/profile.h')
env.Install(os.path.join('$PREFIX', 'include/daos'), 'include/daos/dtx.h')
env.Install(os.path.join('$PREFIX', 'include/daos'), 'include/daos/cmd_parser.h')
env.Install(os.path.join('$PREFIX', 'include/daos'), 'include/daos/control_types.h')

# Generic DAOS includes
env.AppendUnique(CPPPATH=[Dir('include').srcnode()])
Expand Down Expand Up @@ -104,6 +105,7 @@ def scons():
# Generate common libraries used by multiple components
SConscript('gurt/SConscript')
SConscript('cart/SConscript')
SConscript('control/lib/control/c/SConscript')
SConscript('common/SConscript')
SConscript('bio/SConscript')
SConscript('vea/SConscript')
Expand Down
6 changes: 5 additions & 1 deletion src/common/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,15 @@
if not prereqs.test_requested():
return

Import('daos_control_tgts')

tlibenv = env.Clone(LIBS=[])
tlibenv.require('argobots', 'isal', 'isal_crypto', 'protobufc')
tlibenv.AppendUnique(LIBS=['cart', 'gurt', 'lz4', 'json-c'])
tlibenv.AppendUnique(LIBS=['cart', 'gurt', 'lz4', 'json-c', 'daos_control'])
tlibenv.AppendUnique(RPATH_FULL=['$PREFIX/lib64'])

tests_lib = tlibenv.d_library('daos_tests', ['tests_lib.c', 'tests_dmg_helpers.c'])
tlibenv.Requires(tests_lib, daos_control_tgts)

Check failure on line 86 in src/common/SConscript

View workflow job for this annotation

GitHub Actions / Pylint check 

no-member, Instance of 'DefaultEnvironment' has no 'Requires' member

tlibenv.Install('$PREFIX/lib64/', tests_lib)
tenv = denv.Clone()
Expand Down
Loading
Loading