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 'xacrimon/remove-heaptrack' into 'master'

Browse Source 
Remove heaptrack as it is now deprecated.

See merge request veloren/veloren!636
This commit is contained in:
Acrimon 2019-10-29 06:55:45 +00:00
commit f724e80f2b
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server-cli/Cargo.toml
View File

@ -8,6 +8,5 @@ edition = "2018"
server = { package = "veloren-server", path = "../server" } server = { package = "veloren-server", path = "../server" }
common = { package = "veloren-common", path = "../common" } common = { package = "veloren-common", path = "../common" }
heaptrack = "0.3.0"
log = "0.4.8" log = "0.4.8"
pretty_env_logger = "0.3.0" pretty_env_logger = "0.3.0"

3
server-cli/src/main.rs
View File

@ -1,13 +1,10 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
use common::clock::Clock; use common::clock::Clock;
use heaptrack::track_mem;
use log::info; use log::info;
use server::{Event, Input, Server, ServerSettings}; use server::{Event, Input, Server, ServerSettings};
use std::time::Duration; use std::time::Duration;
track_mem!();
const TPS: u64 = 30; const TPS: u64 = 30;
fn main() { fn main() {

3
voxygen/Cargo.toml
View File

@ -10,7 +10,7 @@ gl = ["gfx_device_gl"]
discord = ["discord-rpc-sdk", "lazy_static"] discord = ["discord-rpc-sdk", "lazy_static"]
singleplayer = ["server"] singleplayer = ["server"]
default = ["gl", "singleplayer", "msgbox", "heaptrack"] default = ["gl", "singleplayer", "msgbox"]
[dependencies] [dependencies]
common = { package = "veloren-common", path = "../common" } common = { package = "veloren-common", path = "../common" }
@ -60,7 +60,6 @@ frustum_query = "0.1.2"
rodio = { git = "https://github.com/RustAudio/rodio", rev = "e5474a2"} rodio = { git = "https://github.com/RustAudio/rodio", rev = "e5474a2"}
cpal = "0.10" cpal = "0.10"
crossbeam = "0.7.2" crossbeam = "0.7.2"
heaptrack = { version = "0.3.0", optional = true }
hashbrown = { version = "0.5.0", features = ["serde", "nightly"] } hashbrown = { version = "0.5.0", features = ["serde", "nightly"] }
chrono = "0.4.7" chrono = "0.4.7"
rust-argon2 = "0.5" rust-argon2 = "0.5"

5
voxygen/src/main.rs
View File

@ -38,11 +38,6 @@ use log::{self, debug, error, info};
use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger}; use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
use std::{fs::File, mem, panic, str::FromStr}; use std::{fs::File, mem, panic, str::FromStr};
#[cfg(feature = "heaptrack")]
use heaptrack::track_mem;
#[cfg(feature = "heaptrack")]
track_mem!();
/// A type used to store state that is shared between all play states. /// A type used to store state that is shared between all play states.
pub struct GlobalState { pub struct GlobalState {
settings: Settings, settings: Settings,