mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'xMAC94x/dependencies' into 'master'
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) See merge request veloren/veloren!1641
This commit is contained in:
Marcel
commit
24a840bc6b
396
Cargo.lock
generated
396
Cargo.lock
generated
@ -99,10 +99,11 @@ checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
|
||||
|
||||
[[package]]
|
||||
name = "ansi-parser"
|
||||
version = "0.6.5"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "761ac675f1638a6a49e26f6ac3a4067ca3fefa8029816ae4ef8d3fa3d06a5194"
|
||||
checksum = "01aa95c33b750236bd69526dd773d618c5c8ad5e156daad1fc760dfd4be8def3"
|
||||
dependencies = [
|
||||
"heapless",
|
||||
"nom 4.2.3",
|
||||
]
|
||||
|
||||
@ -136,7 +137,7 @@ version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -145,7 +146,7 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -193,21 +194,24 @@ version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
|
||||
dependencies = [
|
||||
"nodrop",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
|
||||
|
||||
[[package]]
|
||||
name = "as-slice"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6"
|
||||
dependencies = [
|
||||
"generic-array 0.12.3",
|
||||
"generic-array 0.13.2",
|
||||
"generic-array 0.14.4",
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ascii"
|
||||
version = "0.9.3"
|
||||
@ -388,12 +392,14 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "bitvec"
|
||||
version = "0.17.4"
|
||||
version = "0.19.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
|
||||
checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
|
||||
dependencies = [
|
||||
"either",
|
||||
"funty",
|
||||
"radium",
|
||||
"tap",
|
||||
"wyz",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -403,7 +409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec 0.5.1",
|
||||
"arrayvec",
|
||||
"constant_time_eq",
|
||||
]
|
||||
|
||||
@ -414,7 +420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec 0.5.1",
|
||||
"arrayvec",
|
||||
"cc",
|
||||
"cfg-if 0.1.10",
|
||||
"constant_time_eq",
|
||||
@ -567,7 +573,7 @@ checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"time",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
@ -1074,7 +1080,7 @@ dependencies = [
|
||||
"csv",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"oorandom",
|
||||
"plotters",
|
||||
"rayon",
|
||||
@ -1099,16 +1105,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam"
|
||||
version = "0.7.2"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c"
|
||||
checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"crossbeam-channel 0.3.9",
|
||||
"crossbeam-deque 0.7.3",
|
||||
"crossbeam-epoch 0.7.2",
|
||||
"crossbeam-queue 0.1.2",
|
||||
"crossbeam-utils 0.6.6",
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-channel 0.5.0",
|
||||
"crossbeam-deque 0.8.0",
|
||||
"crossbeam-epoch 0.9.0",
|
||||
"crossbeam-queue 0.3.1",
|
||||
"crossbeam-utils 0.8.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1137,7 +1143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-utils 0.8.0",
|
||||
"crossbeam-utils 0.8.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1159,21 +1165,7 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-epoch 0.9.0",
|
||||
"crossbeam-utils 0.8.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
|
||||
dependencies = [
|
||||
"arrayvec 0.4.12",
|
||||
"cfg-if 0.1.10",
|
||||
"crossbeam-utils 0.6.6",
|
||||
"lazy_static",
|
||||
"memoffset",
|
||||
"scopeguard",
|
||||
"crossbeam-utils 0.8.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1199,21 +1191,12 @@ checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"const_fn",
|
||||
"crossbeam-utils 0.8.0",
|
||||
"crossbeam-utils 0.8.1",
|
||||
"lazy_static",
|
||||
"memoffset",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-queue"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
|
||||
dependencies = [
|
||||
"crossbeam-utils 0.6.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-queue"
|
||||
version = "0.2.3"
|
||||
@ -1225,6 +1208,16 @@ dependencies = [
|
||||
"maybe-uninit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-queue"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-utils 0.8.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.6.6"
|
||||
@ -1248,13 +1241,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.0"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
|
||||
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"cfg-if 1.0.0",
|
||||
"const_fn",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
@ -1270,15 +1262,31 @@ dependencies = [
|
||||
"libc",
|
||||
"mio 0.7.0",
|
||||
"parking_lot 0.10.2",
|
||||
"signal-hook",
|
||||
"signal-hook 0.1.16",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossterm"
|
||||
version = "0.18.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"crossterm_winapi",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"mio 0.7.0",
|
||||
"parking_lot 0.11.0",
|
||||
"signal-hook 0.1.16",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossterm_winapi"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c"
|
||||
checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db"
|
||||
dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
@ -1646,7 +1654,7 @@ version = "0.20.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1766,6 +1774,12 @@ version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||
|
||||
[[package]]
|
||||
name = "funty"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
|
||||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.1.29"
|
||||
@ -1916,6 +1930,15 @@ dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
|
||||
dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.4"
|
||||
@ -2222,6 +2245,15 @@ version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
|
||||
|
||||
[[package]]
|
||||
name = "hash32"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.7.2"
|
||||
@ -2240,6 +2272,18 @@ version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
|
||||
|
||||
[[package]]
|
||||
name = "heapless"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
|
||||
dependencies = [
|
||||
"as-slice",
|
||||
"generic-array 0.13.2",
|
||||
"hash32",
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.3.1"
|
||||
@ -2411,7 +2455,7 @@ source = "git+https://github.com/hecrj/iced?rev=f464316#f46431600cb61d4e83e0ded1
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"twox-hash",
|
||||
"unicode-segmentation",
|
||||
]
|
||||
@ -2476,8 +2520,8 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder",
|
||||
"num-iter",
|
||||
"num-rational 0.3.0",
|
||||
"num-traits 0.2.12",
|
||||
"num-rational 0.3.2",
|
||||
"num-traits 0.2.14",
|
||||
"png",
|
||||
]
|
||||
|
||||
@ -2932,17 +2976,21 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
|
||||
|
||||
[[package]]
|
||||
name = "minifb"
|
||||
version = "0.14.0"
|
||||
version = "0.19.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
|
||||
checksum = "2eb411a297b8f714800f085846cbda55fbd2ae17ecd381f1b4652af0e5bebe63"
|
||||
dependencies = [
|
||||
"cast",
|
||||
"cc",
|
||||
"orbclient",
|
||||
"raw-window-handle",
|
||||
"time",
|
||||
"tempfile",
|
||||
"wayland-client 0.27.0",
|
||||
"wayland-cursor 0.27.0",
|
||||
"wayland-protocols 0.27.0",
|
||||
"winapi 0.3.9",
|
||||
"x11-dl",
|
||||
"xkb",
|
||||
"xkbcommon-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3156,12 +3204,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nodrop"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
|
||||
|
||||
[[package]]
|
||||
name = "noise"
|
||||
version = "0.6.0"
|
||||
@ -3228,7 +3270,7 @@ checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3237,12 +3279,26 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-complex",
|
||||
"num-bigint 0.2.6",
|
||||
"num-complex 0.2.4",
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-rational 0.2.4",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
|
||||
dependencies = [
|
||||
"num-bigint 0.3.1",
|
||||
"num-complex 0.3.1",
|
||||
"num-integer",
|
||||
"num-iter",
|
||||
"num-rational 0.3.2",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3253,7 +3309,18 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-integer",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3263,7 +3330,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
|
||||
dependencies = [
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3279,23 +3355,23 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.43"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
|
||||
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-iter"
|
||||
version = "0.1.41"
|
||||
version = "0.1.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
|
||||
checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3305,20 +3381,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-bigint",
|
||||
"num-bigint 0.2.6",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-rational"
|
||||
version = "0.3.0"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138"
|
||||
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"num-bigint 0.3.1",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3327,14 +3404,14 @@ version = "0.1.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.12"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
|
||||
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
]
|
||||
@ -3416,7 +3493,7 @@ dependencies = [
|
||||
"ndk",
|
||||
"ndk-glue",
|
||||
"num-derive",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"oboe-sys",
|
||||
]
|
||||
|
||||
@ -3496,7 +3573,7 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3505,7 +3582,7 @@ version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fe9037165d7023b1228bc4ae9a2fa1a2b0095eca6c2998c624723dfd01314a5"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3741,7 +3818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
]
|
||||
@ -3837,11 +3914,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "prometheus"
|
||||
version = "0.10.0"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
|
||||
checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"cfg-if 1.0.0",
|
||||
"fnv",
|
||||
"lazy_static",
|
||||
"parking_lot 0.11.0",
|
||||
@ -3878,9 +3955,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "radium"
|
||||
version = "0.3.0"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
|
||||
checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
@ -4151,6 +4228,15 @@ version = "0.6.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||
dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
version = "0.16.15"
|
||||
@ -4524,7 +4610,7 @@ version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c5f08237e667ac94ad20f8878b5943d91a93ccb231428446c57c21c57779016d"
|
||||
dependencies = [
|
||||
"arrayvec 0.5.1",
|
||||
"arrayvec",
|
||||
"hashbrown 0.7.2",
|
||||
"mopa",
|
||||
"rayon",
|
||||
@ -4561,6 +4647,16 @@ dependencies = [
|
||||
"signal-hook-registry",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8133fd06d2c721d4168f9b76a9a7fd3a0bfc96df58cf7316c7fb9f23bd677f4e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"signal-hook-registry",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.2.1"
|
||||
@ -4711,6 +4807,12 @@ dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
@ -4880,6 +4982,12 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
|
||||
|
||||
[[package]]
|
||||
name = "tap"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
|
||||
|
||||
[[package]]
|
||||
name = "tar"
|
||||
version = "0.4.30"
|
||||
@ -4898,6 +5006,20 @@ version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"libc",
|
||||
"rand 0.7.3",
|
||||
"redox_syscall",
|
||||
"remove_dir_all",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.1.2"
|
||||
@ -5231,9 +5353,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tracing-tracy"
|
||||
version = "0.3.0"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f70411ba0d11c4aee042b1c73e68086322a293f8038c53ac95d36319c91ec19"
|
||||
checksum = "b668a0e08f29842a38973cc33317dba03a3062538c762df7425aa6397bce480a"
|
||||
dependencies = [
|
||||
"tracing-core",
|
||||
"tracing-subscriber",
|
||||
@ -5242,18 +5364,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tracy-client"
|
||||
version = "0.9.0"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb214203bffe8cefe9bc0dfc12140f85e8d59b42e1f52f696071fdf8595e066a"
|
||||
checksum = "9e8ccdb37ca05e354a50011b8a195f115215e46324f65be92495859882cea453"
|
||||
dependencies = [
|
||||
"tracy-client-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracy-client-sys"
|
||||
version = "0.10.0"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b1b6565366c88aa66599426f400751c5cd7a315f6493b3578da309ae686aaf1"
|
||||
checksum = "1ee6f0f7878155b6102ab5aba86a92ec4357702ad44683df68ab5493ba3c86a2"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
@ -5264,7 +5386,7 @@ version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa14b9f5cd7d513bab5accebe8f403df8b1ac22302cac549a6ac99c0a007c84a"
|
||||
dependencies = [
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"vek 0.11.2",
|
||||
]
|
||||
|
||||
@ -5293,7 +5415,7 @@ source = "git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll#54b84
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cassowary",
|
||||
"crossterm",
|
||||
"crossterm 0.17.7",
|
||||
"unicode-segmentation",
|
||||
"unicode-width",
|
||||
]
|
||||
@ -5492,7 +5614,7 @@ checksum = "2657d8704e5e0be82b60157c8dbc71a269273ad766984508fdc54030a0690c4d"
|
||||
dependencies = [
|
||||
"approx 0.3.2",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"rustc_version",
|
||||
"serde",
|
||||
"static_assertions",
|
||||
@ -5505,7 +5627,7 @@ source = "git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics#237a78528
|
||||
dependencies = [
|
||||
"approx 0.3.2",
|
||||
"num-integer",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"rustc_version",
|
||||
"serde",
|
||||
"static_assertions",
|
||||
@ -5522,7 +5644,7 @@ dependencies = [
|
||||
"futures-util",
|
||||
"hashbrown 0.7.2",
|
||||
"image",
|
||||
"num 0.2.1",
|
||||
"num 0.3.1",
|
||||
"num_cpus",
|
||||
"rayon",
|
||||
"specs",
|
||||
@ -5542,7 +5664,8 @@ version = "0.8.0"
|
||||
dependencies = [
|
||||
"arraygen",
|
||||
"criterion",
|
||||
"crossbeam",
|
||||
"crossbeam-channel 0.5.0",
|
||||
"crossbeam-utils 0.8.1",
|
||||
"csv",
|
||||
"directories-next",
|
||||
"dot_vox",
|
||||
@ -5553,7 +5676,7 @@ dependencies = [
|
||||
"lazy_static",
|
||||
"notify",
|
||||
"num-derive",
|
||||
"num-traits 0.2.12",
|
||||
"num-traits 0.2.14",
|
||||
"ordered-float 2.0.0",
|
||||
"rand 0.7.3",
|
||||
"rayon",
|
||||
@ -5645,7 +5768,7 @@ version = "0.8.0"
|
||||
dependencies = [
|
||||
"authc",
|
||||
"chrono",
|
||||
"crossbeam",
|
||||
"crossbeam-channel 0.5.0",
|
||||
"diesel",
|
||||
"diesel_migrations",
|
||||
"dotenv",
|
||||
@ -5685,11 +5808,11 @@ version = "0.8.0"
|
||||
dependencies = [
|
||||
"ansi-parser",
|
||||
"clap",
|
||||
"crossterm",
|
||||
"crossterm 0.18.2",
|
||||
"lazy_static",
|
||||
"ron",
|
||||
"serde",
|
||||
"signal-hook",
|
||||
"signal-hook 0.2.2",
|
||||
"termcolor",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
@ -5736,7 +5859,7 @@ dependencies = [
|
||||
"inline_tweak",
|
||||
"itertools",
|
||||
"native-dialog",
|
||||
"num 0.2.1",
|
||||
"num 0.3.1",
|
||||
"old_school_gfx_glutin_ext",
|
||||
"ordered-float 2.0.0",
|
||||
"rand 0.7.3",
|
||||
@ -5795,7 +5918,7 @@ dependencies = [
|
||||
"lazy_static",
|
||||
"minifb",
|
||||
"noise",
|
||||
"num 0.2.1",
|
||||
"num 0.3.1",
|
||||
"ordered-float 2.0.0",
|
||||
"packed_simd_2",
|
||||
"rand 0.7.3",
|
||||
@ -5818,7 +5941,7 @@ dependencies = [
|
||||
"bincode",
|
||||
"bitflags",
|
||||
"clap",
|
||||
"crossbeam-channel 0.4.4",
|
||||
"crossbeam-channel 0.5.0",
|
||||
"futures 0.3.5",
|
||||
"lazy_static",
|
||||
"lz-fear",
|
||||
@ -6394,6 +6517,12 @@ dependencies = [
|
||||
"winapi-build",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wyz"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
|
||||
|
||||
[[package]]
|
||||
name = "x11-clipboard"
|
||||
version = "0.5.1"
|
||||
@ -6455,6 +6584,27 @@ version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
|
||||
|
||||
[[package]]
|
||||
name = "xkb"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
"xkbcommon-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xkbcommon-sys"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa434980dca02ebf28795d71e570dbb78316d095a228707efd6117bf8246d78b"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xml-rs"
|
||||
version = "0.8.3"
|
||||
|
||||
@ -22,7 +22,7 @@ futures-util = "0.3"
|
||||
futures-executor = "0.3"
|
||||
futures-timer = "3.0"
|
||||
image = { version = "0.23.8", default-features = false, features = ["png"] }
|
||||
num = "0.2.0"
|
||||
num = "0.3.1"
|
||||
num_cpus = "1.10.1"
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
rayon = "^1.3.0"
|
||||
|
||||
@ -14,7 +14,8 @@ default = ["simd"]
|
||||
|
||||
[dependencies]
|
||||
arraygen = "0.1.13"
|
||||
crossbeam = "0.7"
|
||||
crossbeam-utils = "0.8.1"
|
||||
crossbeam-channel = "0.5"
|
||||
enum-iterator = "0.6"
|
||||
lazy_static = "1.4.0"
|
||||
num-derive = "0.3"
|
||||
@ -55,7 +56,7 @@ csv = { version = "1.1.3", optional = true }
|
||||
structopt = { version = "0.3.13", optional = true }
|
||||
|
||||
# Tracy
|
||||
tracy-client = { version = "0.9.0", optional = true }
|
||||
tracy-client = { version = "0.10.0", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
#bench
|
||||
|
||||
@ -30,4 +30,4 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "s
|
||||
serde = { version = "1.0.110", features = ["derive"] }
|
||||
|
||||
# Tracy
|
||||
tracy-client = { version = "0.9.0", optional = true }
|
||||
tracy-client = { version = "0.10.0", optional = true }
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
use crossbeam::channel::{select, unbounded, Receiver, Sender};
|
||||
use crossbeam_channel::{select, unbounded, Receiver, Sender};
|
||||
use lazy_static::lazy_static;
|
||||
use notify::{Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher as _};
|
||||
use std::{
|
||||
|
||||
@ -10,7 +10,7 @@ use crate::{
|
||||
lottery::Lottery,
|
||||
terrain::{Block, SpriteKind},
|
||||
};
|
||||
use crossbeam::atomic::AtomicCell;
|
||||
use crossbeam_utils::atomic::AtomicCell;
|
||||
use rand::prelude::*;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specs::{Component, FlaggedStorage};
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
use std::sync::atomic::AtomicI64;
|
||||
use std::sync::atomic::AtomicU64;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct SysMetrics {
|
||||
pub agent_ns: AtomicI64,
|
||||
pub mount_ns: AtomicI64,
|
||||
pub controller_ns: AtomicI64,
|
||||
pub character_behavior_ns: AtomicI64,
|
||||
pub stats_ns: AtomicI64,
|
||||
pub phys_ns: AtomicI64,
|
||||
pub projectile_ns: AtomicI64,
|
||||
pub melee_ns: AtomicI64,
|
||||
pub agent_ns: AtomicU64,
|
||||
pub mount_ns: AtomicU64,
|
||||
pub controller_ns: AtomicU64,
|
||||
pub character_behavior_ns: AtomicU64,
|
||||
pub stats_ns: AtomicU64,
|
||||
pub phys_ns: AtomicU64,
|
||||
pub projectile_ns: AtomicU64,
|
||||
pub melee_ns: AtomicU64,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct PhysicsMetrics {
|
||||
pub entity_entity_collision_checks: i64,
|
||||
pub entity_entity_collisions: i64,
|
||||
pub entity_entity_collision_checks: u64,
|
||||
pub entity_entity_collisions: u64,
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "s
|
||||
serde = { version = "1.0.110", features = ["derive"] }
|
||||
|
||||
# Tracy
|
||||
tracy-client = { version = "0.9.0", optional = true }
|
||||
tracy-client = { version = "0.10.0", optional = true }
|
||||
|
||||
# Plugins
|
||||
toml = { version = "0.5.7", optional = true }
|
||||
|
||||
@ -1488,7 +1488,7 @@ impl<'a> System<'a> for Sys {
|
||||
}
|
||||
}
|
||||
sys_metrics.agent_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -206,7 +206,7 @@ impl<'a> System<'a> for Sys {
|
||||
incorporate_update(&mut tuple, state_update);
|
||||
}
|
||||
sys_metrics.character_behavior_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -121,7 +121,7 @@ impl<'a> System<'a> for Sys {
|
||||
}
|
||||
}
|
||||
sys_metrics.controller_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -157,7 +157,7 @@ impl<'a> System<'a> for Sys {
|
||||
}
|
||||
}
|
||||
sys_metrics.melee_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ impl<'a> System<'a> for Sys {
|
||||
mountings.remove(entity);
|
||||
}
|
||||
sys_metrics.mount_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -761,7 +761,7 @@ impl<'a> System<'a> for Sys {
|
||||
event_emitter.emit(ServerEvent::LandOnGround { entity, vel: vel.0 });
|
||||
});
|
||||
sys_metrics.phys_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -233,7 +233,7 @@ impl<'a> System<'a> for Sys {
|
||||
.unwrap_or_default();
|
||||
}
|
||||
sys_metrics.projectile_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -160,7 +160,7 @@ impl<'a> System<'a> for Sys {
|
||||
}
|
||||
}
|
||||
sys_metrics.stats_ns.store(
|
||||
start_time.elapsed().as_nanos() as i64,
|
||||
start_time.elapsed().as_nanos() as u64,
|
||||
std::sync::atomic::Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
@ -18,13 +18,13 @@ default = ["metrics","compression"]
|
||||
bincode = "1.2"
|
||||
serde = { version = "1.0" }
|
||||
#sending
|
||||
crossbeam-channel = "0.4.2"
|
||||
crossbeam-channel = "0.5"
|
||||
# NOTE: Upgrading async-std can trigger spontanious crashes for `network`ing. Consider elaborate tests before upgrading
|
||||
async-std = { version = "~1.5", default-features = false, features = ["std", "async-task", "default"] }
|
||||
#tracing and metrics
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-futures = "0.2"
|
||||
prometheus = { version = "0.10", default-features = false, optional = true }
|
||||
prometheus = { version = "0.11", default-features = false, optional = true }
|
||||
#async
|
||||
futures = { version = "0.3", features = ["thread-pool"] }
|
||||
#mpsc channel registry
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
use crate::types::{Cid, Frame, Pid};
|
||||
use prometheus::{
|
||||
core::{AtomicI64, GenericCounter},
|
||||
core::{AtomicU64, GenericCounter},
|
||||
IntCounter, IntCounterVec, IntGauge, IntGaugeVec, Opts, Registry,
|
||||
};
|
||||
use std::error::Error;
|
||||
@ -281,7 +281,7 @@ pub(crate) struct PidCidFrameCache<T: MetricVecBuilder> {
|
||||
|
||||
pub(crate) struct MultiCidFrameCache {
|
||||
metric: IntCounterVec,
|
||||
cache: Vec<[Option<GenericCounter<AtomicI64>>; Frame::FRAMES_LEN as usize]>,
|
||||
cache: Vec<[Option<GenericCounter<AtomicU64>>; Frame::FRAMES_LEN as usize]>,
|
||||
}
|
||||
|
||||
impl MultiCidFrameCache {
|
||||
@ -307,7 +307,7 @@ impl MultiCidFrameCache {
|
||||
]);
|
||||
}
|
||||
|
||||
pub fn with_label_values(&mut self, cid: Cid, frame: &Frame) -> &GenericCounter<AtomicI64> {
|
||||
pub fn with_label_values(&mut self, cid: Cid, frame: &Frame) -> &GenericCounter<AtomicU64> {
|
||||
self.populate(cid);
|
||||
let frame_int = frame.get_int() as usize;
|
||||
let r = &mut self.cache[cid as usize][frame_int];
|
||||
@ -322,7 +322,7 @@ impl MultiCidFrameCache {
|
||||
}
|
||||
|
||||
pub(crate) struct CidFrameCache {
|
||||
cache: [GenericCounter<AtomicI64>; Frame::FRAMES_LEN as usize],
|
||||
cache: [GenericCounter<AtomicU64>; Frame::FRAMES_LEN as usize],
|
||||
}
|
||||
|
||||
impl CidFrameCache {
|
||||
@ -341,7 +341,7 @@ impl CidFrameCache {
|
||||
Self { cache }
|
||||
}
|
||||
|
||||
pub fn with_label_values(&mut self, frame: &Frame) -> &GenericCounter<AtomicI64> {
|
||||
pub fn with_label_values(&mut self, frame: &Frame) -> &GenericCounter<AtomicU64> {
|
||||
&self.cache[frame.get_int() as usize]
|
||||
}
|
||||
}
|
||||
|
||||
@ -158,7 +158,7 @@ impl PrioManager {
|
||||
self.metrics
|
||||
.message_out_throughput
|
||||
.with_label_values(&[&self.pid, &sid_string])
|
||||
.inc_by(msg.buffer.data.len() as i64);
|
||||
.inc_by(msg.buffer.data.len() as u64);
|
||||
}
|
||||
|
||||
//trace!(?prio, ?sid_string, "tick");
|
||||
|
||||
@ -182,7 +182,7 @@ impl TcpProtocol {
|
||||
ref data,
|
||||
} = frame
|
||||
{
|
||||
throughput_cache.inc_by(data.len() as i64);
|
||||
throughput_cache.inc_by(data.len() as u64);
|
||||
}
|
||||
}
|
||||
w2c_cid_frame_s
|
||||
@ -291,7 +291,7 @@ impl TcpProtocol {
|
||||
ref data,
|
||||
} = frame
|
||||
{
|
||||
throughput_cache.inc_by(data.len() as i64);
|
||||
throughput_cache.inc_by(data.len() as u64);
|
||||
}
|
||||
}
|
||||
if let Err(e) = Self::write_frame(&mut stream, frame).await {
|
||||
@ -372,7 +372,7 @@ impl UdpProtocol {
|
||||
Frame::gen_data(*<&[u8; 18]>::try_from(&bytes[1..19]).unwrap());
|
||||
let mut data = vec![0; length as usize];
|
||||
#[cfg(feature = "metrics")]
|
||||
throughput_cache.inc_by(length as i64);
|
||||
throughput_cache.inc_by(length as u64);
|
||||
data.copy_from_slice(&bytes[19..]);
|
||||
Frame::Data { mid, start, data }
|
||||
},
|
||||
@ -459,7 +459,7 @@ impl UdpProtocol {
|
||||
buffer[17..19].copy_from_slice(&(data.len() as u16).to_le_bytes());
|
||||
buffer[19..(data.len() + 19)].clone_from_slice(&data[..]);
|
||||
#[cfg(feature = "metrics")]
|
||||
throughput_cache.inc_by(data.len() as i64);
|
||||
throughput_cache.inc_by(data.len() as u64);
|
||||
19 + data.len()
|
||||
},
|
||||
Frame::Raw(data) => {
|
||||
|
||||
@ -15,11 +15,11 @@ server = { package = "veloren-server", path = "../server", default-features = fa
|
||||
common = { package = "veloren-common", path = "../common" }
|
||||
common-net = { package = "veloren-common-net", path = "../common/net" }
|
||||
|
||||
ansi-parser = "0.6"
|
||||
ansi-parser = "0.7"
|
||||
clap = "2.33"
|
||||
crossterm = "0.17"
|
||||
crossterm = "0.18"
|
||||
lazy_static = "1"
|
||||
signal-hook = "0.1.16"
|
||||
signal-hook = "0.2.2"
|
||||
termcolor = "1.1"
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] }
|
||||
@ -27,7 +27,7 @@ ron = {version = "0.6", default-features = false}
|
||||
serde = {version = "1.0", features = [ "rc", "derive" ]}
|
||||
|
||||
# Tracy
|
||||
tracing-tracy = { version = "0.3.0", optional = true }
|
||||
tracing-tracy = { version = "0.4.0", optional = true }
|
||||
|
||||
[dependencies.tui]
|
||||
git = "https://github.com/fdehau/tui-rs.git"
|
||||
|
||||
@ -37,8 +37,8 @@ serde_json = "1.0.50"
|
||||
rand = { version = "0.7", features = ["small_rng"] }
|
||||
chrono = "0.4.9"
|
||||
hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] }
|
||||
crossbeam = "0.7.2"
|
||||
prometheus = { version = "0.10", default-features = false}
|
||||
crossbeam-channel = "0.5"
|
||||
prometheus = { version = "0.11", default-features = false}
|
||||
tiny_http = "0.7.0"
|
||||
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs" }
|
||||
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "b943c85e4a38f5ec60cd18c34c73097640162bfe" }
|
||||
|
||||
@ -2,7 +2,6 @@ use crate::metrics::ChunkGenMetrics;
|
||||
#[cfg(not(feature = "worldgen"))]
|
||||
use crate::test_world::{IndexOwned, World};
|
||||
use common::{generation::ChunkSupplement, terrain::TerrainChunk};
|
||||
use crossbeam::channel;
|
||||
use hashbrown::{hash_map::Entry, HashMap};
|
||||
use specs::Entity as EcsEntity;
|
||||
use std::sync::{
|
||||
@ -19,15 +18,15 @@ type ChunkGenResult = (
|
||||
);
|
||||
|
||||
pub struct ChunkGenerator {
|
||||
chunk_tx: channel::Sender<ChunkGenResult>,
|
||||
chunk_rx: channel::Receiver<ChunkGenResult>,
|
||||
chunk_tx: crossbeam_channel::Sender<ChunkGenResult>,
|
||||
chunk_rx: crossbeam_channel::Receiver<ChunkGenResult>,
|
||||
pending_chunks: HashMap<Vec2<i32>, Arc<AtomicBool>>,
|
||||
metrics: Arc<ChunkGenMetrics>,
|
||||
}
|
||||
impl ChunkGenerator {
|
||||
#[allow(clippy::new_without_default)] // TODO: Pending review in #587
|
||||
pub fn new(metrics: ChunkGenMetrics) -> Self {
|
||||
let (chunk_tx, chunk_rx) = channel::unbounded();
|
||||
let (chunk_tx, chunk_rx) = crossbeam_channel::unbounded();
|
||||
Self {
|
||||
chunk_tx,
|
||||
chunk_rx,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
use crate::{Client, ClientType, ServerInfo};
|
||||
use crossbeam::{bounded, unbounded, Receiver, Sender};
|
||||
use crossbeam_channel::{bounded, unbounded, Receiver, Sender};
|
||||
use futures_channel::oneshot;
|
||||
use futures_executor::block_on;
|
||||
use futures_timer::Delay;
|
||||
|
||||
@ -7,7 +7,7 @@ use common::{
|
||||
character::{CharacterId, CharacterItem},
|
||||
comp::item::tool::AbilityMap,
|
||||
};
|
||||
use crossbeam::{channel, channel::TryIter};
|
||||
use crossbeam_channel::{self, TryIter};
|
||||
use std::path::Path;
|
||||
use tracing::error;
|
||||
|
||||
@ -65,14 +65,14 @@ pub struct CharacterLoaderResponse {
|
||||
/// Responses are polled on each server tick in the format
|
||||
/// [`CharacterLoaderResponse`]
|
||||
pub struct CharacterLoader {
|
||||
update_rx: channel::Receiver<CharacterLoaderResponse>,
|
||||
update_tx: channel::Sender<CharacterLoaderRequest>,
|
||||
update_rx: crossbeam_channel::Receiver<CharacterLoaderResponse>,
|
||||
update_tx: crossbeam_channel::Sender<CharacterLoaderRequest>,
|
||||
}
|
||||
|
||||
impl CharacterLoader {
|
||||
pub fn new(db_dir: &Path, map: &AbilityMap) -> diesel::QueryResult<Self> {
|
||||
let (update_tx, internal_rx) = channel::unbounded::<CharacterLoaderRequest>();
|
||||
let (internal_tx, update_rx) = channel::unbounded::<CharacterLoaderResponse>();
|
||||
let (update_tx, internal_rx) = crossbeam_channel::unbounded::<CharacterLoaderRequest>();
|
||||
let (internal_tx, update_rx) = crossbeam_channel::unbounded::<CharacterLoaderResponse>();
|
||||
|
||||
let mut conn = establish_connection(db_dir)?;
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@ use crate::comp;
|
||||
use common::{character::CharacterId, comp::item::ItemId};
|
||||
|
||||
use crate::persistence::{establish_connection, VelorenConnection};
|
||||
use crossbeam::channel;
|
||||
use std::{path::Path, sync::Arc};
|
||||
use tracing::{error, trace};
|
||||
|
||||
@ -19,14 +18,14 @@ pub type CharacterUpdateData = (
|
||||
/// This is used to make updates to a character and their persisted components,
|
||||
/// such as inventory, loadout, etc...
|
||||
pub struct CharacterUpdater {
|
||||
update_tx: Option<channel::Sender<Vec<(CharacterId, CharacterUpdateData)>>>,
|
||||
update_tx: Option<crossbeam_channel::Sender<Vec<(CharacterId, CharacterUpdateData)>>>,
|
||||
handle: Option<std::thread::JoinHandle<()>>,
|
||||
}
|
||||
|
||||
impl CharacterUpdater {
|
||||
pub fn new(db_dir: &Path) -> diesel::QueryResult<Self> {
|
||||
let (update_tx, update_rx) =
|
||||
channel::unbounded::<Vec<(CharacterId, CharacterUpdateData)>>();
|
||||
crossbeam_channel::unbounded::<Vec<(CharacterId, CharacterUpdateData)>>();
|
||||
|
||||
let mut conn = establish_connection(db_dir)?;
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ bincode = "1.2"
|
||||
chrono = "0.4.9"
|
||||
cpal = "0.13"
|
||||
copy_dir = "0.1.2"
|
||||
crossbeam = "=0.7.2"
|
||||
crossbeam = "0.8.0"
|
||||
deunicode = "1.0"
|
||||
# TODO: remove
|
||||
directories-next = "2.0"
|
||||
@ -74,7 +74,7 @@ guillotiere = "0.5.2"
|
||||
hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]}
|
||||
image = {version = "0.23.8", default-features = false, features = ["ico", "png"]}
|
||||
native-dialog = { version = "0.4.2", default-features = false, optional = true }
|
||||
num = "0.2"
|
||||
num = "0.3.1"
|
||||
ordered-float = { version = "2.0.0", default-features = false }
|
||||
rand = "0.7"
|
||||
rodio = {version = "0.13", default-features = false, features = ["wav", "vorbis"]}
|
||||
@ -88,7 +88,7 @@ inline_tweak = "1.0.2"
|
||||
itertools = "0.9.0"
|
||||
|
||||
# Tracy
|
||||
tracing-tracy = { version = "0.3.0", optional = true }
|
||||
tracing-tracy = { version = "0.4.0", optional = true }
|
||||
|
||||
# Logging
|
||||
termcolor = "1.1"
|
||||
|
||||
@ -13,13 +13,13 @@ default = ["simd"]
|
||||
common = { package = "veloren-common", path = "../common" }
|
||||
common-net = { package = "veloren-common-net", path = "../common/net" }
|
||||
bincode = "1.2.0"
|
||||
bitvec = "0.17.4"
|
||||
bitvec = "0.19.4"
|
||||
fxhash = "0.2.1"
|
||||
image = { version = "0.23.8", default-features = false, features = ["png"] }
|
||||
itertools = "0.9"
|
||||
vek = { version = "0.12.0", features = ["serde"] }
|
||||
noise = { version = "0.6.0", default-features = false }
|
||||
num = "0.2"
|
||||
num = "0.3.1"
|
||||
ordered-float = "2.0"
|
||||
hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] }
|
||||
lazy_static = "1.4.0"
|
||||
@ -35,4 +35,4 @@ ron = { version = "0.6", default-features = false }
|
||||
[dev-dependencies]
|
||||
criterion = "0.3"
|
||||
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec"] }
|
||||
minifb = "0.14.0"
|
||||
minifb = "0.19.1"
|
||||
|
||||
@ -57,6 +57,6 @@ fn main() {
|
||||
zoom /= 1.05;
|
||||
}
|
||||
|
||||
win.update_with_buffer_size(&buf, W, H).unwrap();
|
||||
win.update_with_buffer(&buf, W, H).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ fn main() {
|
||||
}
|
||||
}
|
||||
|
||||
win.update_with_buffer_size(&buf, W, H).unwrap();
|
||||
win.update_with_buffer(&buf, W, H).unwrap();
|
||||
|
||||
_time += 1.0 / 60.0;
|
||||
}
|
||||
|
||||
@ -73,6 +73,6 @@ fn main() {
|
||||
scale -= 6;
|
||||
}
|
||||
|
||||
win.update_with_buffer_size(&buf, W, H).unwrap();
|
||||
win.update_with_buffer(&buf, W, H).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
@ -392,6 +392,6 @@ fn main() {
|
||||
}
|
||||
}
|
||||
|
||||
win.update_with_buffer_size(&buf, W, H).unwrap();
|
||||
win.update_with_buffer(&buf, W, H).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user