syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Remove actor next_task_id field

This commit is contained in:
Tony Garnock-Jones 2021-08-26 12:39:08 +02:00
parent 87338ce47a
commit ce6c46f1ae
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
syndicate/src/actor.rs
View File

@ -291,7 +291,6 @@ pub struct RunningActor {
tx: UnboundedSender<SystemMessage>, tx: UnboundedSender<SystemMessage>,
mailbox: Weak<Mailbox>, mailbox: Weak<Mailbox>,
cleanup_actions: CleanupActions, cleanup_actions: CleanupActions,
next_task_id: u64,
linked_tasks: Map<u64, CancellationToken>, linked_tasks: Map<u64, CancellationToken>,
exit_hooks: Vec<Box<dyn Send + FnOnce(&mut Activation, &Arc<ActorResult>) -> ActorResult>>, exit_hooks: Vec<Box<dyn Send + FnOnce(&mut Activation, &Arc<ActorResult>) -> ActorResult>>,
} }
@ -353,13 +352,15 @@ pub fn next_actor_id() -> ActorId {
NEXT_ACTOR_ID.fetch_add(BUMP_AMOUNT.into(), Ordering::Relaxed) NEXT_ACTOR_ID.fetch_add(BUMP_AMOUNT.into(), Ordering::Relaxed)
} }
static NEXT_HANDLE: AtomicU64 = AtomicU64::new(3); static NEXT_HANDLE: AtomicU64 = AtomicU64::new(2);
/// Allocate a process-unique `Handle`. /// Allocate a process-unique `Handle`.
pub fn next_handle() -> Handle { pub fn next_handle() -> Handle {
NEXT_HANDLE.fetch_add(BUMP_AMOUNT.into(), Ordering::Relaxed) NEXT_HANDLE.fetch_add(BUMP_AMOUNT.into(), Ordering::Relaxed)
} }
static NEXT_ACCOUNT_ID: AtomicU64 = AtomicU64::new(4); static NEXT_ACCOUNT_ID: AtomicU64 = AtomicU64::new(3);
static NEXT_TASK_ID: AtomicU64 = AtomicU64::new(4);
preserves_schema::support::lazy_static! { preserves_schema::support::lazy_static! {
#[doc(hidden)] #[doc(hidden)]
@ -778,7 +779,6 @@ impl Actor {
tx, tx,
mailbox: Weak::new(), mailbox: Weak::new(),
cleanup_actions: Map::new(), cleanup_actions: Map::new(),
next_task_id: 0,
linked_tasks: Map::new(), linked_tasks: Map::new(),
exit_hooks: Vec::new(), exit_hooks: Vec::new(),
}))), }))),
@ -988,8 +988,7 @@ impl RunningActor {
) { ) {
let mailbox = self.mailbox(); let mailbox = self.mailbox();
let token = CancellationToken::new(); let token = CancellationToken::new();
let task_id = self.next_task_id; let task_id = NEXT_TASK_ID.fetch_add(1, Ordering::Relaxed);
self.next_task_id += 1;
name.record("task_id", &task_id); name.record("task_id", &task_id);
{ {
let token = token.clone(); let token = token.clone();