Skip to content

Integrate seastar-rs #1

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

Open
patjed41 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Integrate seastar-rs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a4885b
rust: integrate seastar-rs
patjed41 Apr 26, 2023
54ec9ca
rust: allow exposing async functions by integrating cxx-async
patjed41 May 9, 2023
3b2f054
rust: Use seastar-rs without hardcoded headers
Lorak-mmk Jun 9, 2023
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
3 changes: 2 additions & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,7 @@ def find_headers(repodir, excluded_dirs):
'service/broadcast_tables/experimental/lang.cc',
'tasks/task_manager.cc',
'rust/wasmtime_bindings/src/lib.rs',
'rust/test_seastar_rs/src/lib.rs',
'utils/to_string.cc',
'service/topology_state_machine.cc',
] + [Antlr3Grammar('cql3/Cql.g')] + [Thrift('interface/cassandra.thrift', 'Cassandra')] \
Expand Down Expand Up @@ -1905,7 +1906,7 @@ def query_seastar_flags(pc_file, link_static_cxx=False):
pool = console
description = TEST {mode}
rule rust_lib.{mode}
command = CARGO_BUILD_DEP_INFO_BASEDIR='.' cargo build --locked --manifest-path=rust/Cargo.toml --target-dir=$builddir/{mode} --profile=rust-{mode} $
command = PKG_CONFIG_PATH=`pwd`/$builddir/{mode}/seastar CARGO_BUILD_DEP_INFO_BASEDIR='.' cargo build --locked --manifest-path=rust/Cargo.toml --target-dir=$builddir/{mode} --profile=rust-{mode} $
&& touch $out
description = RUST_LIB $out
''').format(mode=mode, antlr3_exec=antlr3_exec, fmt_lib=fmt_lib, test_repeat=test_repeat, test_timeout=test_timeout, **modeval))
Expand Down
7 changes: 7 additions & 0 deletions main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@

#include <boost/algorithm/string/join.hpp>

#include "rust/test_seastar_rs.hh"
#include <seastar/core/coroutine.hh>

namespace fs = std::filesystem;

seastar::metrics::metric_groups app_metrics;
Expand Down Expand Up @@ -625,6 +628,10 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl
sharded<locator::snitch_ptr> snitch;

return app.run(ac, av, [&] () -> future<int> {
(void)seastar::smp::submit_to(0, [] () -> future<> {
co_await test_seastar_rs::sleep(40);
});
test_seastar_rs::spawn_sleep(40);

auto&& opts = app.configuration();

Expand Down
Loading