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

Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master'

Browse Source 
fix compiling without metrics

See merge request veloren/veloren!1338
This commit is contained in:
Marcel 2020-08-27 08:19:52 +00:00
commit 1aec2ac6ef
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/src/channel.rs
View File

@ -319,11 +319,7 @@ impl Handshake {
.unwrap(); .unwrap();
} }
async fn send_init( async fn send_init(&self, c2w_frame_s: &mut mpsc::UnboundedSender<Frame>) {
&self,
c2w_frame_s: &mut mpsc::UnboundedSender<Frame>,
#[cfg(not(feature = "metrics"))] _pid_string: &str,
) {
#[cfg(feature = "metrics")] #[cfg(feature = "metrics")]
self.metrics self.metrics
.frames_out_total .frames_out_total

3
network/src/participant.rs
View File

@ -490,7 +490,10 @@ impl BParticipant {
async move { async move {
let (channel, b2w_frame_s, b2r_read_shutdown) = Channel::new(cid); let (channel, b2w_frame_s, b2r_read_shutdown) = Channel::new(cid);
let mut lock = channels.write().await; let mut lock = channels.write().await;
#[cfg(feature = "metrics")]
let mut channel_no = lock.len(); let mut channel_no = lock.len();
#[cfg(not(feature = "metrics"))]
let channel_no = lock.len();
lock.insert( lock.insert(
cid, cid,
Mutex::new(ChannelInfo { Mutex::new(ChannelInfo {