Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to optimize a bit

Browse Source
This commit is contained in:
Isse 2024-01-06 21:11:42 +01:00
parent 7f01928aae
commit e94c21daa6
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/src/events/mod.rs
View File

@ -6,8 +6,10 @@ use common::event::{
EventBus, ExitIngameEvent, EventBus, ExitIngameEvent,
}; };
use common_base::span; use common_base::span;
use common_ecs::{dispatch, System}; use specs::{
use specs::{shred::SendDispatcher, DispatcherBuilder, Entity as EcsEntity, ReadExpect, WorldExt}; shred::SendDispatcher, DispatcherBuilder, Entity as EcsEntity, ReadExpect, WorldExt,
WriteExpect,
};
pub use group_manip::update_map_markers; pub use group_manip::update_map_markers;
pub(crate) use trade::cancel_trades_for; pub(crate) use trade::cancel_trades_for;
@ -50,32 +52,36 @@ impl<T> Default for EventHandler<T> {
fn default() -> Self { Self(PhantomData) } fn default() -> Self { Self(PhantomData) }
} }
impl<'a, T: ServerEvent> System<'a> for EventHandler<T> { impl<'a, T: ServerEvent> specs::System<'a> for EventHandler<T> {
type SystemData = ( type SystemData = (
ReadExpect<'a, crate::metrics::ServerEventMetrics>, ReadExpect<'a, crate::metrics::ServerEventMetrics>,
ReadExpect<'a, EventBus<T>>, WriteExpect<'a, EventBus<T>>,
T::SystemData<'a>, T::SystemData<'a>,
); );
const NAME: &'static str = T::NAME; fn run(&mut self, (metrics, mut ev, data): Self::SystemData) {
const ORIGIN: common_ecs::Origin = common_ecs::Origin::Server; span!(_guard, "Run event system {}", T::NAME);
// TODO: Maybe do another phase here? span!(guard, "Recv events");
const PHASE: common_ecs::Phase = common_ecs::Phase::Apply; let events = ev.recv_all_mut();
drop(guard);
fn run(_job: &mut common_ecs::Job<Self>, (metrics, ev, data): Self::SystemData) { span!(guard, "Add metrics for event");
let events = ev.recv_all();
metrics metrics
.event_count .event_count
.with_label_values(&[Self::NAME]) .with_label_values(&[T::NAME])
.inc_by(events.len() as u64); .inc_by(events.len() as u64);
T::handle(events, data) drop(guard);
span!(guard, "Handle events");
T::handle(events, data);
drop(guard);
} }
} }
fn event_dispatch<T: ServerEvent>(builder: &mut DispatcherBuilder) { fn event_dispatch<T: ServerEvent>(builder: &mut DispatcherBuilder) {
// TODO: We currently don't consider the order of these event. But as // TODO: We currently don't consider the order of these event. But as
// some events produce other events that might be worth doing. // some events produce other events that might be worth doing.
dispatch::<EventHandler<T>>(builder, &[]) builder.add(EventHandler::<T>::default(), T::NAME, &[]);
} }
pub fn register_event_systems(builder: &mut DispatcherBuilder) { pub fn register_event_systems(builder: &mut DispatcherBuilder) {