Skip to content
Merged
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
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/kyron/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
//! where it was originally spawned, providing strong execution locality guarantees when needed.

use ::core::future::Future;
use core::types::{box_future, FutureBox};
use common::types::{box_future, FutureBox};

use crate::core::types::UniqueWorkerId;
use crate::common::types::UniqueWorkerId;
use futures::reusable_box_future::ReusableBoxFuture;
use kyron_foundation::{not_recoverable_error, prelude::*};
use scheduler::{
Expand All @@ -53,7 +53,7 @@ use scheduler::{
};

pub mod channels;
pub mod core;
pub mod common;
pub mod futures;
pub mod io;
pub mod ipc;
Expand Down
2 changes: 1 addition & 1 deletion src/kyron/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
// SPDX-License-Identifier: Apache-2.0
// *******************************************************************************

pub use crate::core::types::UniqueWorkerId;
pub use crate::common::types::UniqueWorkerId;
pub use crate::runtime::*;
pub use crate::scheduler::workers::ThreadParameters;
2 changes: 1 addition & 1 deletion src/kyron/src/safety.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// *******************************************************************************

use crate::{
core::types::{box_future, FutureBox, UniqueWorkerId},
common::types::{box_future, FutureBox, UniqueWorkerId},
ctx_get_handler,
futures::reusable_box_future::ReusableBoxFuture,
scheduler::{context::ctx_get_worker_id, join_handle::JoinHandle},
Expand Down
8 changes: 4 additions & 4 deletions src/kyron/src/scheduler/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
// SPDX-License-Identifier: Apache-2.0
// *******************************************************************************

use crate::core::types::BoxCustom;
use crate::core::types::FutureBox;
use crate::common::types::BoxCustom;
use crate::common::types::FutureBox;
use crate::futures::reusable_box_future::ReusableBoxFuture;
use crate::safety::SafetyResult;
use crate::scheduler::driver::Drivers;
Expand All @@ -26,7 +26,7 @@ use kyron_foundation::prelude::error;
use ::core::pin::Pin;
use std::{rc::Rc, sync::Arc};

use crate::core::types::TaskId;
use crate::common::types::TaskId;
use crate::AsyncTask;
use crate::JoinHandle;

Expand All @@ -35,7 +35,7 @@ use super::scheduler_mt::DedicatedSchedulerLocal;

use super::workers::worker_types::WorkerId;
use super::{scheduler_mt::AsyncScheduler, task::async_task::TaskRef};
use crate::core::types::UniqueWorkerId;
use crate::common::types::UniqueWorkerId;

enum HandlerImpl {
Async(AsyncInnerHandler),
Expand Down
2 changes: 1 addition & 1 deletion src/kyron/src/scheduler/execution_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use super::workers::worker_types::*;
use crate::scheduler::driver::Drivers;
use crate::{
box_future,
core::types::UniqueWorkerId,
common::types::UniqueWorkerId,
scheduler::{workers::ThreadParameters, SchedulerType},
AsyncTask, Future,
};
Expand Down
4 changes: 2 additions & 2 deletions src/kyron/src/scheduler/join_handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ mod tests {
use ::core::task::Context;

use crate::{
core::types::{box_future, ArcInternal},
common::types::{box_future, ArcInternal},
AsyncTask,
};

Expand Down Expand Up @@ -301,7 +301,7 @@ mod tests {
use ::core::task::Context;

use crate::{
core::types::{box_future, ArcInternal},
common::types::{box_future, ArcInternal},
scheduler::workers::worker_types::{WorkerId, WorkerType},
AsyncTask,
};
Expand Down
4 changes: 2 additions & 2 deletions src/kyron/src/scheduler/scheduler_mt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// *******************************************************************************

use super::workers::worker_types::*;
use crate::core::types::BoxInternal;
use crate::core::types::UniqueWorkerId;
use crate::common::types::BoxInternal;
use crate::common::types::UniqueWorkerId;
use crate::ctx_get_handler;
use crate::io::driver::IoDriverUnparker;
use crate::{scheduler::context::ctx_get_worker_id, TaskRef};
Expand Down
6 changes: 3 additions & 3 deletions src/kyron/src/scheduler/task/async_task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// *******************************************************************************

use super::task_state::*;
use crate::core::types::*;
use crate::common::types::*;
use crate::scheduler::safety_waker::create_safety_waker;
use crate::scheduler::scheduler_mt::SchedulerTrait;
use crate::scheduler::workers::worker_types::WorkerId;
Expand Down Expand Up @@ -647,7 +647,7 @@ mod tests {
};

use crate::{
core::types::{box_future, ArcInternal},
common::types::{box_future, ArcInternal},
safety::SafetyResult,
scheduler::{
scheduler_mt::SchedulerTrait,
Expand Down Expand Up @@ -918,7 +918,7 @@ mod tests {
use kyron_testing::prelude::*;
use loom::model::Builder;

use crate::core::types::{box_future, ArcInternal};
use crate::common::types::{box_future, ArcInternal};

async fn dummy() -> u32 {
0
Expand Down
2 changes: 1 addition & 1 deletion src/kyron/src/scheduler/task/task_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// *******************************************************************************

use crate::{
core::types::TaskId,
common::types::TaskId,
scheduler::{
context::{ctx_get_running_task_id, ctx_get_worker_id, ctx_set_running_task, ctx_unset_running_task},
workers::worker_types::WorkerId,
Expand Down
2 changes: 1 addition & 1 deletion src/kyron/src/scheduler/workers/worker_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// SPDX-License-Identifier: Apache-2.0
// *******************************************************************************

use crate::core::types::UniqueWorkerId;
use crate::common::types::UniqueWorkerId;
use crate::io::driver::{IoDriver, IoDriverUnparker};
use crate::scheduler::scheduler_mt::AsyncScheduler;
use crate::scheduler::task::async_task::TaskRef;
Expand Down
4 changes: 2 additions & 2 deletions src/kyron/src/testing/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#![allow(dead_code)]

use crate::{
core::types::{box_future, FutureBox, UniqueWorkerId},
common::types::{box_future, FutureBox, UniqueWorkerId},
futures::reusable_box_future::ReusableBoxFuture,
scheduler::{join_handle::JoinHandle, task::async_task::TaskRef, waker::create_waker},
testing::*,
Expand Down Expand Up @@ -298,7 +298,7 @@ pub mod safety {
use ::core::future::Future;

use crate::{
core::types::{box_future, FutureBox},
common::types::{box_future, FutureBox},
futures::reusable_box_future::ReusableBoxFuture,
scheduler::join_handle::JoinHandle,
};
Expand Down
2 changes: 1 addition & 1 deletion src/kyron/src/testing/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use kyron_foundation::prelude::FoundationAtomicU16;
use kyron_testing::prelude::MockFn;

use crate::{
core::types::{box_future, ArcInternal},
common::types::{box_future, ArcInternal},
scheduler::{
scheduler_mt::SchedulerTrait,
waker::create_waker,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_scenarios/rust/src/internals/runtime_helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
// SPDX-License-Identifier: Apache-2.0
// *******************************************************************************
use kyron::core::types::UniqueWorkerId;
use kyron::common::types::UniqueWorkerId;
use kyron::prelude::ThreadParameters as AsyncRtThreadParameters;
use kyron::runtime::*;
use kyron::scheduler::SchedulerType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use crate::internals::execution_barrier::RuntimeJoiner;
use crate::internals::runtime_helper::Runtime;
use crate::internals::thread_params::{current_thread_priority_params, ThreadPriorityParams};
use kyron::core::types::UniqueWorkerId;
use kyron::common::types::UniqueWorkerId;
use kyron::futures::reusable_box_future::ReusableBoxFuturePool;
use kyron::{safety, spawn};
use serde::Deserialize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// *******************************************************************************
use crate::internals::execution_barrier::RuntimeJoiner;
use crate::internals::runtime_helper::Runtime;
use kyron::core::types::UniqueWorkerId;
use kyron::common::types::UniqueWorkerId;
use kyron::futures::reusable_box_future::ReusableBoxFuturePool;
use kyron::{core::types::box_future, *};
use kyron::{common::types::box_future, *};
use kyron_foundation::prelude::CommonErrors;
use test_scenarios_rust::scenario::{Scenario, ScenarioGroup, ScenarioGroupImpl};

Expand Down
Loading