Rebase the TiKV branch on to master

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: [GuillaumeGomez]
+patreon: GuillaumeGomez
+custom: ["https://paypal.me/imperioland"]

.travis.yml

@@ -55,7 +55,7 @@ script:
   - rustc --version
   - sysctl -a | grep mem
   - if [[ "$TRAVIS_RUST_VERSION" == "nightly" ]]; then
-      (rustup component add clippy-preview && cargo clippy) || touch clippy_install_failed;
+      (rustup component add clippy && cargo clippy) || touch clippy_install_failed;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       cargo build --features debug;
@@ -74,6 +74,7 @@ script:
   - if [[ -z "$EXTRA" ]]; then
       RUST_BACKTRACE=1 cargo test;
     fi
+  - cargo doc
   - cd examples
   - if [[ -z "$EXTRA" ]]; then
       RUST_BACKTRACE=1 cargo build;
@@ -87,4 +88,4 @@ script:
     fi
   - if [[ -z "$EXTRA" ]]; then
       LD_LIBRARY_PATH=./target/debug ./simple;
-    fi
+    fi

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "sysinfo"
-version = "0.9.6"
+version = "0.11.2"
 authors = ["Guillaume Gomez <[email protected]>"]
 
-description = "Library to handle processes"
+description = "Library to get system information such as processes, processors, disks, components and networks"
 repository = "https://github.com/GuillaumeGomez/sysinfo"
 license = "MIT"
 readme = "README.md"
@@ -16,11 +16,17 @@ build = "build.rs"
 cfg-if = "0.1"
 rayon = "^1.0"
 doc-comment = "0.3"
+once_cell = "1.0"
+walkdir = "2.2.9"
+pnet_datalink = "0.23.0"
+num_cpus = "1.11.1"
+cache-size = "0.4.0"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["fileapi", "handleapi", "ioapiset", "minwindef", "pdh", "psapi", "synchapi", "sysinfoapi", "tlhelp32", "winbase", "winerror", "winioctl", "winnt"] }
+winapi = { version = "0.3", features = ["fileapi", "handleapi", "ifdef", "ioapiset", "minwindef", "pdh", "psapi", "synchapi", "sysinfoapi", "winbase", "winerror", "winioctl", "winnt", "oleauto", "wbemcli", "rpcdce", "combaseapi", "objidl", "objbase", "powerbase", "netioapi"] }
+ntapi = "0.3"
 
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
+[target.'cfg(not(any(target_os = "unknown", target_arch = "wasm32")))'.dependencies]
 libc = "0.2"
 
 [lib]

README.md

@@ -14,14 +14,28 @@ Support the following platforms:
 
  * Linux
  * Raspberry
- * Mac OSX
+ * Android
+ * macOS
  * Windows
 
 It also compiles for Android but never been tested on it.
 
 ### Running on Raspberry
 
-It'll be difficult to build on Raspberry. A good way-around is to be build on Linux before sending it to your Raspberry:
+It'll be difficult to build on Raspberry. A good way-around is to be build on Linux before sending it to your Raspberry.
+
+First install the arm toolchain, for example on Ubuntu: `sudo apt-get install gcc-multilib-arm-linux-gnueabihf`.
+
+Then configure cargo to use the corresponding toolchain:
+
+```bash
+cat << EOF > ~/.cargo/config
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+EOF
+```
+
+Finally, cross compile:
 
 ```bash
 rustup target add armv7-unknown-linux-gnueabihf
@@ -33,8 +47,6 @@ cargo build --target=armv7-unknown-linux-gnueabihf
 You have an example into the `examples` folder. Just run `cargo run` inside the `examples` folder to start it. Otherwise, here is a little code sample:
 
 ```rust
-extern crate sysinfo;
-
 use sysinfo::{NetworkExt, System, SystemExt};
 
 let mut sys = System::new();
@@ -55,13 +67,13 @@ for component in sys.get_components_list() {
 }
 
 // Memory information:
-println!("total memory: {} kB", sys.get_total_memory());
-println!("used memory : {} kB", sys.get_used_memory());
-println!("total swap  : {} kB", sys.get_total_swap());
-println!("used swap   : {} kB", sys.get_used_swap());
+println!("total memory: {} KiB", sys.get_total_memory());
+println!("used memory : {} KiB", sys.get_used_memory());
+println!("total swap  : {} KiB", sys.get_total_swap());
+println!("used swap   : {} KiB", sys.get_used_swap());
 
 // Number of processors
-println!("NB processors: {}", sys.get_processor_list().len());
+println!("NB processors: {}", sys.get_processors().len());
 
 // To refresh all system information:
 sys.refresh_all();
@@ -80,6 +92,82 @@ To build the C example, just run:
 > LD_LIBRARY_PATH=target/release/ ./simple
 ```
 
+### Benchmarks
+
+You can run the benchmarks locally with rust **nightly** by doing:
+
+```bash
+> cargo bench
+```
+
+Here are the current results:
+
+**Linux**
+
+<details>
+
+```text
+test bench_new                     ... bench:       3,741 ns/iter (+/- 252)
+test bench_new_all                 ... bench:  10,491,084 ns/iter (+/- 450,925)
+test bench_refresh_all             ... bench:   2,787,974 ns/iter (+/- 235,649)
+test bench_refresh_components      ... bench:      24,270 ns/iter (+/- 1,127)
+test bench_refresh_components_list ... bench:     370,693 ns/iter (+/- 51,925)
+test bench_refresh_cpu             ... bench:      13,367 ns/iter (+/- 1,858)
+test bench_refresh_disks           ... bench:       2,532 ns/iter (+/- 108)
+test bench_refresh_disks_lists     ... bench:      50,359 ns/iter (+/- 5,877)
+test bench_refresh_memory          ... bench:      11,713 ns/iter (+/- 1,006)
+test bench_refresh_networks        ... bench:     220,246 ns/iter (+/- 24,294)
+test bench_refresh_networks_list   ... bench:     229,648 ns/iter (+/- 82,050)
+test bench_refresh_process         ... bench:      77,375 ns/iter (+/- 10,657)
+test bench_refresh_processes       ... bench:   2,282,106 ns/iter (+/- 154,098)
+test bench_refresh_system          ... bench:      52,466 ns/iter (+/- 4,710)
+```
+</details>
+
+**Windows**
+
+<details>
+
+```text
+test bench_new                     ... bench:   7,688,460 ns/iter (+/- 1,230,010)
+test bench_new_all                 ... bench:  24,098,860 ns/iter (+/- 5,260,950)
+test bench_refresh_all             ... bench:   3,096,107 ns/iter (+/- 94,257)
+test bench_refresh_components      ... bench:   1,205,378 ns/iter (+/- 40,071)
+test bench_refresh_components_list ... bench:   3,181,602 ns/iter (+/- 102,533)
+test bench_refresh_cpu             ... bench:         395 ns/iter (+/- 18)
+test bench_refresh_disks           ... bench:      53,082 ns/iter (+/- 1,834)
+test bench_refresh_disks_lists     ... bench:     114,080 ns/iter (+/- 1,920)
+test bench_refresh_memory          ... bench:         596 ns/iter (+/- 48)
+test bench_refresh_networks        ... bench:      37,549 ns/iter (+/- 1,622)
+test bench_refresh_networks_list   ... bench:     667,180 ns/iter (+/- 59,859)
+test bench_refresh_process         ... bench:         755 ns/iter (+/- 47)
+test bench_refresh_processes       ... bench:   1,217,488 ns/iter (+/- 69,041)
+test bench_refresh_system          ... bench:   1,214,780 ns/iter (+/- 52,013)
+```
+</details>
+
+**macOS**
+
+<details>
+
+```text
+test bench_new                     ... bench:      56,861 ns/iter (+/- 5,653)
+test bench_new_all                 ... bench:   4,634,509 ns/iter (+/- 1,604,369)
+test bench_refresh_all             ... bench:   1,962,343 ns/iter (+/- 129,726)
+test bench_refresh_components      ... bench:     294,752 ns/iter (+/- 45,107)
+test bench_refresh_components_list ... bench:     895,672 ns/iter (+/- 112,586)
+test bench_refresh_cpu             ... bench:      11,187 ns/iter (+/- 2,483)
+test bench_refresh_disks           ... bench:         975 ns/iter (+/- 50)
+test bench_refresh_disks_lists     ... bench:      25,955 ns/iter (+/- 3,159)
+test bench_refresh_memory          ... bench:       3,440 ns/iter (+/- 198)
+test bench_refresh_networks        ... bench:     211,552 ns/iter (+/- 16,686)
+test bench_refresh_networks_list   ... bench:     211,138 ns/iter (+/- 22,644)
+test bench_refresh_process         ... bench:       4,174 ns/iter (+/- 1,249)
+test bench_refresh_processes       ... bench:     803,559 ns/iter (+/- 42,974)
+test bench_refresh_system          ... bench:     365,762 ns/iter (+/- 55,893)
+```
+</details>
+
 ## Donations
 
 If you appreciate my work and want to support me, you can do it here:

appveyor.yml

@@ -11,12 +11,15 @@ install:
   - curl -sSf -o rustup-init.exe https://win.rustup.rs
   - rustup-init.exe --default-host "%ARCH%-pc-windows-gnu" --default-toolchain %RUST% -y
   - SET PATH=C:\Users\appveyor\.cargo\bin;C:\msys64\mingw%BITS%\bin;%PATH%;C:\msys64\usr\bin
+  - rustup component add clippy
   - rustc -Vv
   - cargo -Vv
 
 build_script:
+  - cargo clippy
   - cargo build
   - cargo test
+  - cargo doc
   - cd examples
   - cargo build
 

benches/basic.rs

@@ -3,6 +3,7 @@
 extern crate sysinfo;
 extern crate test;
 
+use sysinfo::get_current_pid;
 use sysinfo::SystemExt;
 
 #[bench]
@@ -12,9 +13,16 @@ fn bench_new(b: &mut test::Bencher) {
     });
 }
 
+#[bench]
+fn bench_new_all(b: &mut test::Bencher) {
+    b.iter(|| {
+        sysinfo::System::new_all();
+    });
+}
+
 #[bench]
 fn bench_refresh_all(b: &mut test::Bencher) {
-    let mut s = sysinfo::System::new();
+    let mut s = sysinfo::System::new_all();
 
     b.iter(move || {
         s.refresh_all();
@@ -23,7 +31,7 @@ fn bench_refresh_all(b: &mut test::Bencher) {
 
 #[bench]
 fn bench_refresh_system(b: &mut test::Bencher) {
-    let mut s = sysinfo::System::new();
+    let mut s = sysinfo::System::new_all();
 
     s.refresh_system();
     b.iter(move || {
@@ -35,6 +43,7 @@ fn bench_refresh_system(b: &mut test::Bencher) {
 fn bench_refresh_processes(b: &mut test::Bencher) {
     let mut s = sysinfo::System::new();
 
+    s.refresh_processes(); // to load the whole processes list a first time.
     b.iter(move || {
         s.refresh_processes();
     });
@@ -45,35 +54,81 @@ fn bench_refresh_process(b: &mut test::Bencher) {
     let mut s = sysinfo::System::new();
 
     s.refresh_all();
-    let pid = *s.get_process_list().iter().take(1).next().unwrap().0;
+    // to be sure it'll exist for at least as long as we run
+    let pid = get_current_pid().expect("failed to get current pid");
     b.iter(move || {
         s.refresh_process(pid);
     });
 }
 
 #[bench]
 fn bench_refresh_disks(b: &mut test::Bencher) {
-    let mut s = sysinfo::System::new();
+    let mut s = sysinfo::System::new_all();
 
     b.iter(move || {
         s.refresh_disks();
     });
 }
 
 #[bench]
-fn bench_refresh_disk_lists(b: &mut test::Bencher) {
+fn bench_refresh_disks_lists(b: &mut test::Bencher) {
+    let mut s = sysinfo::System::new();
+
+    b.iter(move || {
+        s.refresh_disks_list();
+    });
+}
+
+#[bench]
+fn bench_refresh_networks(b: &mut test::Bencher) {
+    let mut s = sysinfo::System::new_all();
+
+    b.iter(move || {
+        s.refresh_networks();
+    });
+}
+
+#[bench]
+fn bench_refresh_networks_list(b: &mut test::Bencher) {
+    let mut s = sysinfo::System::new();
+
+    b.iter(move || {
+        s.refresh_networks_list();
+    });
+}
+
+#[bench]
+fn bench_refresh_memory(b: &mut test::Bencher) {
     let mut s = sysinfo::System::new();
 
     b.iter(move || {
-        s.refresh_disk_list();
+        s.refresh_memory();
     });
 }
 
 #[bench]
-fn bench_refresh_network(b: &mut test::Bencher) {
+fn bench_refresh_cpu(b: &mut test::Bencher) {
     let mut s = sysinfo::System::new();
 
     b.iter(move || {
-        s.refresh_network();
+        s.refresh_cpu();
+    });
+}
+
+#[bench]
+fn bench_refresh_components(b: &mut test::Bencher) {
+    let mut s = sysinfo::System::new_all();
+
+    b.iter(move || {
+        s.refresh_components();
+    });
+}
+
+#[bench]
+fn bench_refresh_components_list(b: &mut test::Bencher) {
+    let mut s = sysinfo::System::new_all();
+
+    b.iter(move || {
+        s.refresh_components_list();
     });
 }

examples/src/simple.c

@@ -63,19 +63,19 @@ bool process_loop(pid_t pid, CProcess process, void *data) {
 int main() {
     CSystem system = sysinfo_init();
     sysinfo_refresh_all(system);
-    printf("total memory:    %ld\n", sysinfo_get_total_memory(system));
-    printf("free memory:     %ld\n", sysinfo_get_free_memory(system));
-    printf("used memory:     %ld\n", sysinfo_get_used_memory(system));
-    printf("total swap:      %ld\n", sysinfo_get_total_swap(system));
-    printf("free swap:       %ld\n", sysinfo_get_free_swap(system));
-    printf("used swap:       %ld\n", sysinfo_get_used_swap(system));
-    printf("network income:  %ld\n", sysinfo_get_network_income(system));
-    printf("network outcome: %ld\n", sysinfo_get_network_outcome(system));
+    printf("total memory:     %ld\n", sysinfo_get_total_memory(system));
+    printf("free memory:      %ld\n", sysinfo_get_free_memory(system));
+    printf("used memory:      %ld\n", sysinfo_get_used_memory(system));
+    printf("total swap:       %ld\n", sysinfo_get_total_swap(system));
+    printf("free swap:        %ld\n", sysinfo_get_free_swap(system));
+    printf("used swap:        %ld\n", sysinfo_get_used_swap(system));
+    printf("networks income:  %ld\n", sysinfo_get_networks_income(system));
+    printf("networks outcome: %ld\n", sysinfo_get_networks_outcome(system));
     unsigned int len = 0, i = 0;
     float *procs = NULL;
     sysinfo_get_processors_usage(system, &len, &procs);
     while (i < len) {
-        printf("Processor #%d usage: %f\n", i, procs[i]);
+        printf("Processor #%d usage: %f%%\n", i, procs[i]);
         i += 1;
     }
     free(procs);