Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,14 @@ add_custom_target(generate_flatbuffers_schema DEPENDS "${GENERATED_HEADER}")

# Temporary migration-only build graph.
add_library(clice-core STATIC
"${PROJECT_SOURCE_DIR}/src/server/server.cpp"
"${PROJECT_SOURCE_DIR}/src/server/worker.cpp"
"${PROJECT_SOURCE_DIR}/src/server/config.cpp"
"${PROJECT_SOURCE_DIR}/src/server/compilation_service.cpp"
"${PROJECT_SOURCE_DIR}/src/server/worker_pool.cpp"
"${PROJECT_SOURCE_DIR}/src/server/master_server.cpp"
"${PROJECT_SOURCE_DIR}/src/server/runtimer.cpp"
"${PROJECT_SOURCE_DIR}/src/server/worker_runtime.cpp"
"${PROJECT_SOURCE_DIR}/src/server/worker_stateful.cpp"
"${PROJECT_SOURCE_DIR}/src/server/worker_stateless.cpp"
"${PROJECT_SOURCE_DIR}/src/compile/command.cpp"
"${PROJECT_SOURCE_DIR}/src/compile/toolchain.cpp"
"${PROJECT_SOURCE_DIR}/src/compile/compilation.cpp"
Expand Down Expand Up @@ -178,6 +184,7 @@ target_link_libraries(clice-core PUBLIC
clice_options
llvm-libs
spdlog::spdlog
tomlplusplus::tomlplusplus
roaring::roaring
flatbuffers
eventide::async
Expand Down
41 changes: 41 additions & 0 deletions src/clice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
#include "eventide/serde/config.h"
#include "server/protocol.h"
#include "server/runtime.h"
#include "support/logging.h"

namespace {

using clice::server::Mode;
using clice::server::Options;
using clice::server::WorkerRole;

struct ModeOption {
Mode value = Mode::Pipe;
Expand All @@ -38,6 +40,22 @@ struct ModeOption {
}
};

struct WorkerRoleOption {
WorkerRole value = WorkerRole::Stateful;

auto into(std::string_view text) -> std::optional<std::string_view> {
if(text == "stateful") {
value = WorkerRole::Stateful;
return std::nullopt;
}
if(text == "stateless") {
value = WorkerRole::Stateless;
return std::nullopt;
}
return "invalid --worker-role, expected: stateful|stateless";
}
};

struct CliOptions {
DECO_CFG_START(required = false;);

Expand Down Expand Up @@ -70,6 +88,13 @@ struct CliOptions {
required = false)
<std::size_t> worker_count;

DecoKVStyled(deco::decl::KVStyle::Joined,
names = {"--stateless-worker-count=", "--stateless-worker-count"};
meta_var = "N";
help = "Stateless worker process count (default: 2)";
required = false)
<std::size_t> stateless_worker_count;

DecoKVStyled(deco::decl::KVStyle::Joined,
names = {"--worker-doc-capacity=", "--worker-doc-capacity"};
meta_var = "N";
Expand All @@ -84,6 +109,12 @@ struct CliOptions {
required = false;)
<std::size_t> master_document_capacity;

DecoKVStyled(deco::decl::KVStyle::Joined, names = {"--worker-role=", "--worker-role"};
meta_var = "ROLE";
help = "Worker role: stateful|stateless";
required = false;)
<WorkerRoleOption> worker_role;

DECO_CFG_END();
};

Expand Down Expand Up @@ -126,6 +157,12 @@ auto build_options(const CliOptions& cli_options, int argc, const char** argv)
}
options.worker_count = *cli_options.worker_count;
}
if(cli_options.stateless_worker_count.value.has_value()) {
if(*cli_options.stateless_worker_count == 0) {
return std::unexpected("--stateless-worker-count must be a positive integer");
}
options.stateless_worker_count = *cli_options.stateless_worker_count;
}
if(cli_options.worker_document_capacity.value.has_value()) {
if(*cli_options.worker_document_capacity == 0) {
return std::unexpected("--worker-doc-capacity must be a positive integer");
Expand All @@ -138,6 +175,9 @@ auto build_options(const CliOptions& cli_options, int argc, const char** argv)
}
options.master_document_capacity = *cli_options.master_document_capacity;
}
if(cli_options.worker_role.value.has_value()) {
options.worker_role = cli_options.worker_role->value;
}

return options;
}
Expand All @@ -160,6 +200,7 @@ auto run_with_options(const Options& options) -> int {

int main(int argc, const char** argv) {
eventide::serde::config::set_field_rename_policy<eventide::serde::rename_policy::lower_camel>();
clice::logging::stderr_logger("clice", clice::logging::options);

auto args = deco::util::argvify(argc, argv);
auto parsed = deco::cli::parse<CliOptions>(args);
Expand Down
Loading