lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-03-04 11:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use real thread ids instead of randomized ones

Browse source
This commit is contained in:
Filip Tibell 2023-08-20 14:22:27 -05:00
parent 7e7cfd7cd0
commit 98bb475afe
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/lune/scheduler/thread.rs
View file

@ -1,7 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use mlua::prelude::*; use mlua::prelude::*;
use rand::Rng;
use tokio::sync::broadcast::Sender; use tokio::sync::broadcast::Sender;
/** /**
@ -18,12 +17,23 @@ pub type SchedulerThreadSender = Sender<LuaResult<Arc<LuaRegistryKey>>>;
Unique, randomly generated id for a scheduler thread. Unique, randomly generated id for a scheduler thread.
*/ */
#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)] #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
pub struct SchedulerThreadId(u128); pub struct SchedulerThreadId(usize);
impl SchedulerThreadId { impl From<&LuaOwnedThread> for SchedulerThreadId {
fn gen() -> Self { fn from(value: &LuaOwnedThread) -> Self {
// FUTURE: Use a faster rng here? // HACK: We rely on the debug format of owned
Self(rand::thread_rng().gen()) // thread refs here, but currently this is the
// only way to get a proper unique id using mlua
let addr_string = format!("{value:?}");
let addr = addr_string
.strip_prefix("OwnedThread(OwnedRef(0x")
.expect("Invalid thread address format - unknown prefix")
.split_once(')')
.map(|(s, _)| s)
.expect("Invalid thread address format - missing ')'");
let id = usize::from_str_radix(addr, 16)
.expect("Failed to parse thread address as hexadecimal into usize");
Self(id)
} }
} }
@ -32,7 +42,7 @@ impl SchedulerThreadId {
*/ */
#[derive(Debug)] #[derive(Debug)]
pub(super) struct SchedulerThread { pub(super) struct SchedulerThread {
scheduler_id: SchedulerThreadId, thread_id: SchedulerThreadId,
thread: LuaOwnedThread, thread: LuaOwnedThread,
args: LuaRegistryKey, args: LuaRegistryKey,
} }
@ -55,7 +65,7 @@ impl SchedulerThread {
.context("Failed to store value in registry")?; .context("Failed to store value in registry")?;
Ok(Self { Ok(Self {
scheduler_id: SchedulerThreadId::gen(), thread_id: SchedulerThreadId::from(&thread),
thread, thread,
args, args,
}) })
@ -81,6 +91,6 @@ impl SchedulerThread {
Retrieves the unique, randomly generated id for this scheduler thread. Retrieves the unique, randomly generated id for this scheduler thread.
*/ */
pub(super) fn id(&self) -> SchedulerThreadId { pub(super) fn id(&self) -> SchedulerThreadId {
self.scheduler_id self.thread_id
} }
} }