mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Use std::time for server ping, getting closer to eliminating use of 'time' crate, https://github.com/iceiix/steven/issues/3

This commit is contained in:
ice_iix 2018-09-29 22:57:55 -07:00
parent 04ca22729e
commit ecbc7abc58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/src/protocol/mod.rs
View File

@ -31,7 +31,7 @@ use std::convert;
use byteorder::{BigEndian, WriteBytesExt, ReadBytesExt}; use byteorder::{BigEndian, WriteBytesExt, ReadBytesExt};
use flate2::read::{ZlibDecoder, ZlibEncoder}; use flate2::read::{ZlibDecoder, ZlibEncoder};
use flate2; use flate2;
use time; use std::time::{Instant, Duration};
use shared::Position; use shared::Position;
pub const SUPPORTED_PROTOCOL: i32 = 315; pub const SUPPORTED_PROTOCOL: i32 = 315;
@ -866,7 +866,7 @@ impl Conn {
self.compression_threshold = threshold; self.compression_threshold = threshold;
} }
pub fn do_status(mut self) -> Result<(Status, time::Duration), Error> { pub fn do_status(mut self) -> Result<(Status, Duration), Error> {
use serde_json::Value; use serde_json::Value;
use self::packet::status::serverbound::*; use self::packet::status::serverbound::*;
use self::packet::handshake::serverbound::Handshake; use self::packet::handshake::serverbound::Handshake;
@ -889,7 +889,7 @@ impl Conn {
return Err(Error::Err("Wrong packet".to_owned())); return Err(Error::Err("Wrong packet".to_owned()));
}; };
let start = time::now(); let start = Instant::now();
try!(self.write_packet(StatusPing { ping: 42 })); try!(self.write_packet(StatusPing { ping: 42 }));
if let Packet::StatusPong(_) = try!(self.read_packet()) { if let Packet::StatusPong(_) = try!(self.read_packet()) {
@ -897,7 +897,7 @@ impl Conn {
return Err(Error::Err("Wrong packet".to_owned())); return Err(Error::Err("Wrong packet".to_owned()));
}; };
let ping = time::now() - start; let ping = start.elapsed();
let val: Value = match serde_json::from_str(&status) { let val: Value = match serde_json::from_str(&status) {
Ok(val) => val, Ok(val) => val,