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

store plugin data in memory

Browse Source
This commit is contained in:
Isse 2024-02-27 13:44:14 +01:00 committed by Christof Petig
parent 029f3e2a1f
commit ed25ea98ce
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/state/src/plugin/mod.rs
View File

@ -76,6 +76,8 @@ pub struct Plugin {
hash: PluginHash,
#[allow(dead_code)]
path: PathBuf,
#[allow(dead_code)]
data_buf: Vec<u8>,
}
impl Plugin {
@ -120,11 +122,14 @@ impl Plugin {
})
.collect::<Result<_, _>>()?;
let data_buf = fs::read(&path_buf).map_err(PluginError::Io)?;
Ok(Plugin {
data,
modules,
hash: shasum,
path: path_buf,
data_buf,
})
}
@ -161,7 +166,10 @@ impl Plugin {
}
/// get the path to the plugin file
pub fn path(&self) -> &Path { return self.path.as_path() }
pub fn path(&self) -> &Path { self.path.as_path() }
/// Get the data of this plugin
pub fn data_buf(&self) -> &[u8] { &self.data_buf }
}
#[derive(Default)]

51
server/src/events/information.rs
View File

@ -1,16 +1,17 @@
use crate::{client::Client, events::DispatcherBuilder};
use crate::client::Client;
use common::event::{RequestPluginsEvent, RequestSiteInfoEvent};
use common_net::msg::{world_msg::EconomyInfo, ServerGeneral};
#[cfg(feature = "plugins")]
use common_state::plugin::PluginMgr;
use specs::{DispatcherBuilder, ReadExpect, ReadStorage};
use std::collections::HashMap;
use world::IndexOwned;
#[cfg(feature = "plugins")]
use {common_state::plugin::PluginMgr, std::io::Read};
use super::{event_dispatch, ServerEvent};
pub(super) fn register_event_systems(builder: &mut DispatcherBuilder) {
event_dispatch::<RequestSiteInfoEvent>(builder);
#[cfg(feature = "plugins")]
event_dispatch::<RequestPluginsEvent>(builder);
}
@ -78,42 +79,22 @@ impl ServerEvent for RequestPluginsEvent {
(plugin_mgr, clients): Self::SystemData<'_>,
) {
for mut ev in events {
let Some(client) = clients.get(ev.entity) else {
continue;
};
for hash in ev.plugins.drain(..) {
if let Some(plugin) = plugin_mgr.find(&hash) {
match std::fs::File::open(plugin.path()) {
Ok(mut reader) => {
let mut buf = Vec::new();
match reader.read_to_end(&mut buf) {
Ok(_) => {
clients.get(ev.entity).map(|c| {
c.send(ServerGeneral::PluginData(buf)).unwrap_or_else(|e| {
tracing::warn!(
"Error {e} sending plugin {hash:?} to client"
)
})
});
},
Err(e) => {
tracing::warn!(
"Error {e} reading plugin file {:?}",
plugin.path()
);
},
}
},
Err(e) => {
tracing::warn!("Error {e} opening plugin file {:?}", plugin.path());
},
}
let buf = Vec::from(plugin.data_buf());
// TODO: @perf We could possibly make this more performant by caching prepared
// messages for each plugin.
client
.send(ServerGeneral::PluginData(buf))
.unwrap_or_else(|e| {
tracing::warn!("Error {e} sending plugin {hash:?} to client")
});
}
}
}
}
}
#[cfg(not(feature = "plugins"))]
impl ServerEvent for RequestPluginsEvent {
type SystemData<'a> = ();
fn handle(_events: impl ExactSizeIterator<Item = Self>, _: Self::SystemData<'_>) {}
}