From 5f7d4a85ae884fa5d56876d2545989cdbfa7dd4f Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Tue, 15 Dec 2020 18:34:45 -0800 Subject: deps: Update to heim 0.1 (#354) (cherry picked from commit 49cfc75aca75ccda53f1dd40be584f82094389fb) --- Cargo.lock | 473 ++++++++++++++++++++-------------- Cargo.toml | 2 +- src/app/data_harvester.rs | 10 +- src/app/data_harvester/disks.rs | 18 +- src/app/data_harvester/network.rs | 19 +- src/app/data_harvester/temperature.rs | 4 +- 6 files changed, 310 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3893643e..0a1dda28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,6 +52,111 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "async-channel" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "once_cell", + "vec-arena", +] + +[[package]] +name = "async-fs" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3ca4f8ff117c37c278a2f7415ce9be55560b846b5bc4412aaa5d29c1c3dae2" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd" +dependencies = [ + "concurrent-queue", + "fastrand", + "futures-lite", + "libc", + "log", + "nb-connect", + "once_cell", + "parking", + "polling", + "vec-arena", + "waker-fn", + "winapi", +] + +[[package]] +name = "async-lock" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-net" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06de475c85affe184648202401d7622afb32f0f74e02192857d0201a16defbe5" +dependencies = [ + "async-io", + "blocking", + "fastrand", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda" +dependencies = [ + "async-io", + "blocking", + "cfg-if 0.1.10", + "event-listener", + "futures-lite", + "once_cell", + "signal-hook", + "winapi", +] + +[[package]] +name = "async-task" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" + +[[package]] +name = "atomic-waker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" + [[package]] name = "atty" version = "0.2.14" @@ -90,7 +195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" dependencies = [ "cfg-if 1.0.0", - "core-foundation", + "core-foundation 0.7.0", "lazycell", "libc", "mach", @@ -112,6 +217,20 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "blocking" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +dependencies = [ + "async-channel", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "once_cell", +] + [[package]] name = "bottom" version = "0.5.5" @@ -149,6 +268,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" + [[package]] name = "cargo-husky" version = "1.5.0" @@ -216,6 +341,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "concurrent-queue" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +dependencies = [ + "cache-padded", +] + [[package]] name = "const_fn" version = "0.4.3" @@ -228,7 +362,17 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys 0.8.2", "libc", ] @@ -238,6 +382,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + [[package]] name = "crossbeam-channel" version = "0.5.0" @@ -320,26 +470,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darwin-libproc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" -dependencies = [ - "darwin-libproc-sys", - "libc", - "memchr", -] - -[[package]] -name = "darwin-libproc-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" -dependencies = [ - "libc", -] - [[package]] name = "difference" version = "2.0.0" @@ -379,6 +509,21 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "event-listener" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" + +[[package]] +name = "fastrand" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" +dependencies = [ + "instant", +] + [[package]] name = "fern" version = "0.6.0" @@ -451,6 +596,21 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" +[[package]] +name = "futures-lite" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.8" @@ -478,6 +638,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.8" @@ -523,65 +689,46 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "heim" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da6d047f03312960babf4d2032a6551bd14b4293b9cba61c17e33e1ef4b652d" +checksum = "b8a653442b9bdd11a77d3753a60443c60c4437d3acac8e6c3d4a6a9acd7cceed" dependencies = [ "heim-common", - "heim-cpu", "heim-disk", - "heim-host", "heim-memory", "heim-net", - "heim-process", "heim-runtime", "heim-sensors", - "heim-virt", ] [[package]] name = "heim-common" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5a8c66797cb950fdbf6ea1d750f5ffe687e4cb13713fe1f3214d693ffd72a4" +checksum = "d767e6e47cf88abe7c9a5ebb4df82f180d30d9c0ba0269b6d166482461765834" dependencies = [ - "cfg-if 0.1.10", - "core-foundation", + "cfg-if 1.0.0", + "core-foundation 0.9.1", "futures-core", "futures-util", "lazy_static", "libc", "mach", - "nix 0.17.0", + "nix 0.19.0", "pin-utils", "uom", "winapi", ] -[[package]] -name = "heim-cpu" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc191b97ede884083df6d4c0ac47246b86782a0d253d001d7b4610f6ec9cb21f" -dependencies = [ - "cfg-if 0.1.10", - "heim-common", - "heim-runtime", - "lazy_static", - "libc", - "mach", - "winapi", -] - [[package]] name = "heim-disk" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876034f2b6a4360668fded6bb1d787a76acd5d896998a035466c301f0bc98299" +checksum = "75603ff3868851c04954ee86bf610a6bd45be2732a0e81c35fd72b2b90fa4718" dependencies = [ "bitflags", - "cfg-if 0.1.10", - "core-foundation", + "cfg-if 1.0.0", + "core-foundation 0.9.1", "heim-common", "heim-runtime", "libc", @@ -590,29 +737,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "heim-host" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e323e5563d38acfba5400a5b6fea252d40fb03c0318844f9c37501d2eda9564" -dependencies = [ - "cfg-if 0.1.10", - "heim-common", - "heim-runtime", - "lazy_static", - "libc", - "mach", - "platforms", - "winapi", -] - [[package]] name = "heim-memory" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679781f53236883fe4f26c29c7973cf30fdd1812de7fd15f673dd84027bfe4a3" +checksum = "6fa81bccc5e81ab0c68f520ecba5cb42817bacabfc6120160de886754ad0e3e1" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "heim-common", "heim-runtime", "lazy_static", @@ -623,76 +754,40 @@ dependencies = [ [[package]] name = "heim-net" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfb3cdf09eee9abe0f01360e3270a45829851c9266dd99ee511b4c621840ea" +checksum = "d13afa5e9b71c813c1e087bb27f51ae87d3a6d68a2bdd045bae4322dfae4948b" dependencies = [ "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "heim-common", "heim-runtime", - "hex", "libc", "macaddr", - "nix 0.17.0", -] - -[[package]] -name = "heim-process" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc17fe0cb77010de2a2d82f98af1e6be6bcd28ea1f5b10e57658630f6ce77c" -dependencies = [ - "cfg-if 0.1.10", - "darwin-libproc", - "heim-common", - "heim-cpu", - "heim-host", - "heim-net", - "heim-runtime", - "lazy_static", - "libc", - "mach", - "memchr", - "ntapi", - "ordered-float", - "winapi", + "nix 0.19.0", ] [[package]] name = "heim-runtime" -version = "0.0.7" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1504955d04ec7cf8df8bbe541a8636f619450af6f618a6a6111dfecc79743ee5" +checksum = "54ec7e5238c8f0dd0cc60914d31a5a7aadd4cde74c966a76c1caed1f5224e9b8" dependencies = [ - "cfg-if 0.1.10", - "futures-channel", - "heim-common", - "lazy_static", - "threadpool", + "futures", + "futures-timer", + "once_cell", + "smol", ] [[package]] name = "heim-sensors" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397b856317d361806d1428cabb261188d71d02faaf01463f12637b56ce0c7961" -dependencies = [ - "cfg-if 0.1.10", - "heim-common", - "heim-runtime", -] - -[[package]] -name = "heim-virt" -version = "0.0.11" +version = "0.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e1d9cb9d87a4f8bc8721ae86c00eb2a232853bca969e63ff8f62660493c477" +checksum = "82de7f0784d3b0c53f2e8875c63f430bf6718b03ec8ddce905c12887031158f5" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "heim-common", "heim-runtime", - "raw-cpuid", ] [[package]] @@ -704,12 +799,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hex" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" - [[package]] name = "indexmap" version = "1.6.0" @@ -838,16 +927,13 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.17.0" +name = "nb-connect" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", "libc", - "void", + "winapi", ] [[package]] @@ -901,9 +987,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6d5f418879385b213d905f7cf5bf4aa553d4c380f0152d1d4f2749186fa9" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", @@ -942,13 +1028,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] -name = "ordered-float" -version = "1.0.2" +name = "parking" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518" -dependencies = [ - "num-traits", -] +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" @@ -996,6 +1079,12 @@ dependencies = [ "syn", ] +[[package]] +name = "pin-project-lite" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" + [[package]] name = "pin-utils" version = "0.1.0" @@ -1003,10 +1092,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "platforms" -version = "0.2.1" +name = "polling" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "log", + "wepoll-sys", + "winapi", +] [[package]] name = "predicates" @@ -1067,17 +1163,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "raw-cpuid" -version = "7.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" -dependencies = [ - "bitflags", - "cc", - "rustc_version", -] - [[package]] name = "rayon" version = "1.5.0" @@ -1143,36 +1228,12 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.117" @@ -1225,6 +1286,24 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +[[package]] +name = "smol" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", + "once_cell", +] + [[package]] name = "socket2" version = "0.3.15" @@ -1307,15 +1386,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "time" version = "0.1.44" @@ -1402,16 +1472,16 @@ dependencies = [ ] [[package]] -name = "vec_map" -version = "0.8.2" +name = "vec-arena" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" [[package]] -name = "void" -version = "1.0.2" +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "wait-timeout" @@ -1422,6 +1492,12 @@ dependencies = [ "libc", ] +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -1434,6 +1510,15 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wepoll-sys" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" +dependencies = [ + "cc", +] + [[package]] name = "widestring" version = "0.4.3" diff --git a/Cargo.toml b/Cargo.toml index 55773ddd..1bf78295 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ fern = { version = "0.6.0", optional=true } log = { version="0.4.11", optional=true } [target.'cfg(not(any(target_arch = "arm", target_arch = "aarch64")))'.dependencies] -heim = "0.0.11" +heim = { version = "0.1.0-rc.1", features = ["disk", "memory", "net", "sensors"] } [target.'cfg(windows)'.dependencies] winapi = "0.3.9" diff --git a/src/app/data_harvester.rs b/src/app/data_harvester.rs index d7989c37..7f25539a 100644 --- a/src/app/data_harvester.rs +++ b/src/app/data_harvester.rs @@ -337,10 +337,12 @@ impl DataCollector { temp_data_fut ); - if let Some(net_data) = net_data { - self.total_rx = net_data.total_rx; - self.total_tx = net_data.total_tx; - self.data.network = Some(net_data); + if let Ok(net_data) = net_data { + if let Some(net_data) = &net_data { + self.total_rx = net_data.total_rx; + self.total_tx = net_data.total_tx; + } + self.data.network = net_data; } if let Ok(memory) = mem_res.0 { diff --git a/src/app/data_harvester/disks.rs b/src/app/data_harvester/disks.rs index 2d606c14..294288a0 100644 --- a/src/app/data_harvester/disks.rs +++ b/src/app/data_harvester/disks.rs @@ -1,6 +1,3 @@ -#[cfg(not(any(target_arch = "aarch64", target_arch = "arm")))] -use futures::stream::StreamExt; - #[derive(Debug, Clone, Default)] pub struct DiskHarvest { pub name: String, @@ -67,10 +64,14 @@ pub async fn get_io_usage( return Ok(None); } + use futures::StreamExt; + let mut io_hash: std::collections::HashMap> = std::collections::HashMap::new(); if get_physical { - let mut physical_counter_stream = heim::disk::io_counters_physical(); + let physical_counter_stream = heim::disk::io_counters_physical().await?; + futures::pin_mut!(physical_counter_stream); + while let Some(io) = physical_counter_stream.next().await { if let Ok(io) = io { let mount_point = io.device_name().to_str().unwrap_or("Name Unavailable"); @@ -84,7 +85,9 @@ pub async fn get_io_usage( } } } else { - let mut counter_stream = heim::disk::io_counters(); + let counter_stream = heim::disk::io_counters().await?; + futures::pin_mut!(counter_stream); + while let Some(io) = counter_stream.next().await { if let Ok(io) = io { let mount_point = io.device_name().to_str().unwrap_or("Name Unavailable"); @@ -110,8 +113,11 @@ pub async fn get_disk_usage( return Ok(None); } + use futures::StreamExt; + let mut vec_disks: Vec = Vec::new(); - let mut partitions_stream = heim::disk::partitions_physical(); + let partitions_stream = heim::disk::partitions_physical().await?; + futures::pin_mut!(partitions_stream); while let Some(part) = partitions_stream.next().await { if let Ok(part) = part { diff --git a/src/app/data_harvester/network.rs b/src/app/data_harvester/network.rs index 9836cfb0..37c8b46c 100644 --- a/src/app/data_harvester/network.rs +++ b/src/app/data_harvester/network.rs @@ -19,11 +19,11 @@ impl NetworkHarvest { pub async fn get_network_data( sys: &sysinfo::System, prev_net_access_time: Instant, prev_net_rx: &mut u64, prev_net_tx: &mut u64, curr_time: Instant, actually_get: bool, -) -> Option { +) -> crate::utils::error::Result> { use sysinfo::{NetworkExt, SystemExt}; if !actually_get { - return None; + return Ok(None); } let mut total_rx: u64 = 0; @@ -48,26 +48,27 @@ pub async fn get_network_data( *prev_net_rx = total_rx; *prev_net_tx = total_tx; - Some(NetworkHarvest { + Ok(Some(NetworkHarvest { rx, tx, total_rx, total_tx, - }) + })) } #[cfg(not(any(target_os = "windows", target_arch = "aarch64", target_arch = "arm")))] pub async fn get_network_data( prev_net_access_time: Instant, prev_net_rx: &mut u64, prev_net_tx: &mut u64, curr_time: Instant, actually_get: bool, -) -> Option { +) -> crate::utils::error::Result> { use futures::StreamExt; if !actually_get { - return None; + return Ok(None); } - let mut io_data = heim::net::io_counters(); + let io_data = heim::net::io_counters().await?; + futures::pin_mut!(io_data); let mut total_rx: u64 = 0; let mut total_tx: u64 = 0; @@ -91,10 +92,10 @@ pub async fn get_network_data( *prev_net_rx = total_rx; *prev_net_tx = total_tx; - Some(NetworkHarvest { + Ok(Some(NetworkHarvest { rx, tx, total_rx, total_tx, - }) + })) } diff --git a/src/app/data_harvester/temperature.rs b/src/app/data_harvester/temperature.rs index c3925ceb..470b1dbb 100644 --- a/src/app/data_harvester/temperature.rs +++ b/src/app/data_harvester/temperature.rs @@ -64,6 +64,7 @@ pub async fn get_temperature_data( temp_type: &TemperatureType, actually_get: bool, ) -> crate::utils::error::Result>> { use futures::StreamExt; + use heim::units::thermodynamic_temperature; if !actually_get { return Ok(None); @@ -71,8 +72,7 @@ pub async fn get_temperature_data( let mut temperature_vec: Vec = Vec::new(); - use heim::units::thermodynamic_temperature; - let mut sensor_data = heim::sensors::temperatures(); + let mut sensor_data = heim::sensors::temperatures().boxed_local(); while let Some(sensor) = sensor_data.next().await { if let Ok(sensor) = sensor { temperature_vec.push(TempHarvest { -- cgit v1.2.3