mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Remove heaptrack
This commit is contained in:
parent
8899c0aadd
commit
34975879ad
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -1518,11 +1518,6 @@ dependencies = [
|
|||||||
"serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "heaptrack"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hibitset"
|
name = "hibitset"
|
||||||
version = "0.5.4"
|
version = "0.5.4"
|
||||||
@ -3655,7 +3650,6 @@ dependencies = [
|
|||||||
name = "veloren-server-cli"
|
name = "veloren-server-cli"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heaptrack 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"veloren-common 0.3.0",
|
"veloren-common 0.3.0",
|
||||||
@ -3684,7 +3678,6 @@ dependencies = [
|
|||||||
"glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"guillotiere 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"guillotiere 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"heaptrack 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -4075,7 +4068,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
"checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
|
"checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
|
||||||
"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
|
"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
|
||||||
"checksum hashbrown 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bcea5b597dd98e6d1f1ec171744cc5dee1a30d1c23c5b98e3cf9d4fbdf8a526"
|
"checksum hashbrown 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bcea5b597dd98e6d1f1ec171744cc5dee1a30d1c23c5b98e3cf9d4fbdf8a526"
|
||||||
"checksum heaptrack 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a5f3c2341045ae29cc6d1004caf4c043addd7b658f9d11464fd6914dff6609b"
|
|
||||||
"checksum hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6527bc88f32e0d3926c7572874b2bf17a19b36978aacd0aacf75f7d27a5992d0"
|
"checksum hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6527bc88f32e0d3926c7572874b2bf17a19b36978aacd0aacf75f7d27a5992d0"
|
||||||
"checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
|
"checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
|
||||||
"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
|
"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
|
||||||
|
@ -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"
|
||||||
|
@ -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() {
|
||||||
|
@ -10,7 +10,7 @@ gl = ["gfx_device_gl"]
|
|||||||
discord = ["discord-rpc-sdk", "lazy_static"]
|
discord = ["discord-rpc-sdk", "lazy_static"]
|
||||||
singleplayer = ["server", "portpicker"]
|
singleplayer = ["server", "portpicker"]
|
||||||
|
|
||||||
default = ["gl", "singleplayer", "msgbox", "heaptrack"]
|
default = ["gl", "singleplayer", "msgbox"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
common = { package = "veloren-common", path = "../common" }
|
common = { package = "veloren-common", path = "../common" }
|
||||||
@ -59,7 +59,6 @@ rand = "0.7.0"
|
|||||||
frustum_query = "0.1.2"
|
frustum_query = "0.1.2"
|
||||||
rodio = "0.9.0"
|
rodio = "0.9.0"
|
||||||
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"
|
||||||
|
@ -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,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user