From b543b3b80d1f881f78001ea82669fac8b49f4a82 Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Mon, 14 Feb 2022 17:38:48 +0100 Subject: [PATCH] State commit --- Cargo.toml | 2 +- api/schema | 2 +- examples/users.toml | 14 ++++++++++++++ runtime/executor/src/lib.rs | 1 + runtime/executor/src/pool.rs | 3 ++- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 23bc316..f4085fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "diflouroborane" -version = "0.4.0" +version = "0.4." authors = [ "dequbed " , "Kai Jan Kriegel " , "Joseph Langosch " diff --git a/api/schema b/api/schema index d5ffd3c..5b88b64 160000 --- a/api/schema +++ b/api/schema @@ -1 +1 @@ -Subproject commit d5ffd3c2b36eecf250639d11c51045740504c2f0 +Subproject commit 5b88b6446c55833a1c1340cd5b7fe9fcb992b872 diff --git a/examples/users.toml b/examples/users.toml index 3c4aa37..d5bb824 100644 --- a/examples/users.toml +++ b/examples/users.toml @@ -11,3 +11,17 @@ passwd = "secret" # You can add whatever random data you want. # It will get stored in the `kv` field in UserData. noot = "noot!" + +[Differentuser] +# Define them in roles.toml as well +roles = ["somerole/internal", "testrole/internal"] + +# If two or more users want to use the same machine at once the higher prio +# wins +priority = 0 + +passwd = "secret" + +# You can add whatever random data you want. +# It will get stored in the `kv` field in UserData. +noot = "noot!" diff --git a/runtime/executor/src/lib.rs b/runtime/executor/src/lib.rs index dd851e4..98fcd04 100644 --- a/runtime/executor/src/lib.rs +++ b/runtime/executor/src/lib.rs @@ -31,6 +31,7 @@ pub mod load_balancer; pub mod placement; pub mod pool; pub mod run; +pub mod manage; mod thread_manager; mod worker; diff --git a/runtime/executor/src/pool.rs b/runtime/executor/src/pool.rs index e65a7ac..cc6015f 100644 --- a/runtime/executor/src/pool.rs +++ b/runtime/executor/src/pool.rs @@ -39,6 +39,7 @@ impl Spooler<'_> { } #[derive(Clone, Debug)] +/// Global executor pub struct Executor<'a> { spooler: Arc>, } @@ -220,4 +221,4 @@ fn schedule_local() -> impl Fn(LightProc) { // We have to unpark the worker thread for our task to be run. unparker.unpark(); } -} \ No newline at end of file +}