Add free/total inode counts #659

Space2Man · 2018-10-20T22:55:15Z

Hi,

initial pull request ... not sure about the variable names ... in LibC I have called them (free|total)InodeCounts because that's what it is (at least on Linux) ... not sure if it's called like that for all the other OS as well. In FreeBSD it's called

file serial numbers (i.e., inodes)

But in LinuxFileSystem I have called them file counts ... let me know what you prefer. Furthermore I had issues using the "new" JNA stuff ... if you convert the existing Sysinfo I can adapt Statvfs as well.

Furthermore I have set it to -1 for all other OS except of Linux ... not sure how to implement it for FreeBSD, Solaris, MacOS, ...

dbwiddis · 2018-10-20T23:24:35Z

I think "inode" is fine; it seems standard terminology/POSIX standard on all the *nix-based systems including mac, and there's no windows equivalent.

Check out here for the "new" JNA way to do Sysinfo.

dbwiddis · 2018-10-21T00:07:37Z

oshi-core/src/main/java/oshi/software/os/linux/LinuxFileSystem.java

+                    totalSpace = vfsStat.fsSizeInBlocks.longValue() * vfsStat.fsBlockSize.longValue();
+                    usableSpace = vfsStat.fsBlocksFree.longValue() * vfsStat.fsBlockSize.longValue();
+                } else {
+                    totalSpace = new File(path).getTotalSpace();


don't create a new File object twice.

dbwiddis · 2018-10-21T00:08:38Z

oshi-core/src/main/java/oshi/software/os/linux/LinuxFileSystem.java

+                LOG.error("Failed to get file counts from statvfs. {}", e);
+            }
+
+            OSFileStore osStore = new OSFileStore(name, volume, path, description, type, uuid, usableSpace, totalSpace, usableFiles, totalFiles);


Use a no-argument constructor and setters.

dbwiddis · 2018-10-21T00:14:51Z

oshi-json/src/main/java/oshi/json/software/os/OSFileStore.java

+     *
+     * @return Usable files / free inodes on the drive (count)
+     */
+    public long getUsableFiles() {


per comments, let's go with freeInodes()

- Avoid calling new File() twice - use Constructor + setters

dbwiddis · 2018-10-21T17:36:41Z

Looking good so far....

For Solaris you should be able to do something similar to Linux with the Statvfs structure. For Mac and FreeBSD you're going to have to parse the output of df -i. And for Windows just leave as default/unimplemented.

dbwiddis · 2018-10-21T17:39:16Z

Also travis-ci can no longer test on oraclejdk10 so for the time being you can just delete that in your .travis.yml file so the PR build tests don't show red. I can't seem to get it to work with oraclejdk11 yet due to some issue with surefire plugin and writing to the console. Hopefully I'll get it figured out soon...

Space2Man · 2018-10-21T17:43:34Z

Is someone able to help with Solaris / Mac / FreeBSD? I have no such system at hand ...

dbwiddis · 2018-10-21T17:58:25Z

I can help with those. Can you get rid of the “-1, -1” add ones to those constructors though? Stick with the original constructors or switch to no-arg with the -1 as the initialization.

…alues

This reverts commit 8af8e18

Space2Man · 2018-10-21T19:21:10Z

I pushed a new version ... Switched back to the original constructors and added a copy constructor for json instead ...

dbwiddis · 2018-10-21T20:28:13Z

Looks good. I'll see if I can check out your branch and send commits to it for the other OS's.

dbwiddis · 2018-10-22T06:03:15Z

Heh. Mac was trivial, the needed values were already in the Statfs structure we already had.

Macintosh HD (Volume) [apfs] 86.4 GiB of 465.7 GiB free (18.6%), 9223372036852193649 of 9223372036854775807 files free (100.0%) is /dev/disk1s1 [/] and is mounted at null

I've committed implementations for Mac, Solaris, and FreeBSD to your master branch.

dbwiddis · 2018-10-22T15:46:13Z

oshi-core/src/main/java/oshi/software/os/unix/freebsd/FreeBsdFileSystem.java

+                if (split.length > 7) {
+                    inodeFreeMap.put(split[0], ParseUtil.parseLongOrDefault(split[6], 0L));
+                    // total is actually used + free
+                    if (inodeFreeMap.get(split[0]) >= 0) {


This conditional should be removed since I changed the default from -1.

dbwiddis · 2018-10-22T15:47:32Z

oshi-core/src/main/java/oshi/jna/platform/linux/Libc.java

+     * @return On success, zero is returned. On error, -1 is returned, and errno
+     *         is set appropriately.
+     */
+    int statvfs(String path, Statvfs buf);


Need to write a test method for this.

dbwiddis · 2018-10-22T15:48:06Z

oshi-core/src/main/java/oshi/software/os/unix/freebsd/FreeBsdFileSystem.java

+                if (split.length > 7) {
+                    inodeFreeMap.put(split[0], ParseUtil.parseLongOrDefault(split[6], 0L));
+                    // total is actually used + free
+                    if (inodeFreeMap.get(split[0]) >= 0) {


need to remove this conditional left over from earlier logic.

oshi-core/src/main/java/oshi/jna/platform/linux/Libc.java

codecov-io · 2018-10-22T17:41:41Z

Codecov Report

Merging #659 into master will decrease coverage by 0.25%.
The diff coverage is 81.81%.

@@             Coverage Diff              @@
##             master     #659      +/-   ##
============================================
- Coverage      83.9%   83.64%   -0.26%     
- Complexity      197      198       +1     
============================================
  Files            28       28              
  Lines          1460     1480      +20     
  Branches        211      213       +2     
============================================
+ Hits           1225     1238      +13     
- Misses          112      117       +5     
- Partials        123      125       +2

Impacted Files	Coverage Δ	Complexity Δ
...re/src/main/java/oshi/software/os/OSFileStore.java	`100% <100%> (+5%)`	`0 <0> (ø)`	⬇️
...c/main/java/oshi/json/software/os/OSFileStore.java	`71.18% <50%> (-10.45%)`	`20 <2> (+1)`
...n/src/main/java/oshi/json/util/PropertiesUtil.java	`76.92% <0%> (-3.85%)`	`9% <0%> (ø)`
...hi-core/src/main/java/oshi/hardware/NetworkIF.java	`81.42% <0%> (-0.27%)`	`0% <0%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 696a208...44fdbff. Read the comment docs.

Space2Man

Hi,

looks like for Windows now OSFileStore.mount is not set any more ... previously it was the drive (strMount) which is now stored in OSFileStore.logicalVolume ... is this wanted?

dbwiddis · 2018-10-25T14:50:24Z

No... that error was everywhere and I backed it out the other 4 OS's but since we weren't adding the new fields to Windows I didn't even bother looking! Whoops. Can you fix?

Space2Man · 2018-10-25T21:23:15Z

see #664

- Initial version of fileCount

0d88516

dbwiddis reviewed Oct 21, 2018

View reviewed changes

dbwiddis force-pushed the master branch 2 times, most recently from 96afac1 to a8cd334 Compare October 21, 2018 02:08

jogi added 3 commits October 21, 2018 18:24

- Rename to Inode

31bbe29

- Avoid calling new File() twice - use Constructor + setters

- Rename to Inode - continued

584c985

- Rename to Inode - continued

197305f

oshi deleted a comment Oct 21, 2018

jogi added 4 commits October 21, 2018 21:12

- Switch back to original constructor with -1 as defaults for inode v…

edb2e3f

…alues

- Implement and use copy constructors

9768e6d

- remove oracle jdk10 from travis

8af8e18

Revert "- remove oracle jdk10 from travis"

1955c60

This reverts commit 8af8e18

oshi deleted a comment Oct 21, 2018

dbwiddis force-pushed the master branch from 6efd94b to 05f1ce7 Compare October 22, 2018 05:59

oshi deleted a comment Oct 22, 2018

dbwiddis requested changes Oct 22, 2018

View reviewed changes

oshi deleted a comment Oct 22, 2018

dbwiddis force-pushed the master branch from 7e510c1 to cedff8c Compare October 23, 2018 00:34

dbwiddis added 2 commits October 22, 2018 17:41

Remove deprecated Travis builds

c1539cc

Update Linux Libc with FieldOrder annotation

be8acb5

dbwiddis force-pushed the master branch from cedff8c to 8ce3f74 Compare October 23, 2018 00:41

dbwiddis added 5 commits October 22, 2018 17:44

Enforce no-arg constructor for OSFileStore

8445496

Free/total inodes on macOS

23094ef

Free/total inodes on Solaris

c373501

Free/total inodes on FreeBSD

b8f8cea

Update maven-surefire-plugin for jdk11

72764c2

dbwiddis force-pushed the master branch from 8ce3f74 to 72764c2 Compare October 23, 2018 00:45

dbwiddis approved these changes Oct 23, 2018

View reviewed changes

dbwiddis added 2 commits October 22, 2018 18:21

Oracle jdk10 deprecated on Travis CI

4d24dab

Add tests for inodes

b34283a

dbwiddis force-pushed the master branch from efaf525 to b34283a Compare October 23, 2018 01:21

dbwiddis added 2 commits October 22, 2018 18:22

Merge branch 'master' into master

063671e

Changelog

44fdbff

dbwiddis changed the title ~~- Initial version of fileCount~~ Add free/total inode counts Oct 23, 2018

dbwiddis merged commit 5ef8bb2 into oshi:master Oct 23, 2018

dbwiddis mentioned this pull request Oct 23, 2018

Function to get number of files / available files for OSFileStore #617

Closed

Space2Man commented Oct 25, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add free/total inode counts #659

Add free/total inode counts #659

Space2Man commented Oct 20, 2018

dbwiddis commented Oct 20, 2018 •

edited

Loading

dbwiddis Oct 21, 2018

dbwiddis Oct 21, 2018

dbwiddis Oct 21, 2018

dbwiddis commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

Space2Man commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

Space2Man commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

dbwiddis commented Oct 22, 2018 •

edited

Loading

dbwiddis Oct 22, 2018

dbwiddis Oct 22, 2018

dbwiddis Oct 22, 2018

codecov-io commented Oct 22, 2018 •

edited

Loading

Space2Man left a comment •

edited

Loading

dbwiddis commented Oct 25, 2018

Space2Man commented Oct 25, 2018

Add free/total inode counts #659

Add free/total inode counts #659

Conversation

Space2Man commented Oct 20, 2018

dbwiddis commented Oct 20, 2018 • edited Loading

dbwiddis Oct 21, 2018

Choose a reason for hiding this comment

dbwiddis Oct 21, 2018

Choose a reason for hiding this comment

dbwiddis Oct 21, 2018

Choose a reason for hiding this comment

dbwiddis commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

Space2Man commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

Space2Man commented Oct 21, 2018

dbwiddis commented Oct 21, 2018

dbwiddis commented Oct 22, 2018 • edited Loading

dbwiddis Oct 22, 2018

Choose a reason for hiding this comment

dbwiddis Oct 22, 2018

Choose a reason for hiding this comment

dbwiddis Oct 22, 2018

Choose a reason for hiding this comment

codecov-io commented Oct 22, 2018 • edited Loading

Codecov Report

Space2Man left a comment • edited Loading

Choose a reason for hiding this comment

dbwiddis commented Oct 25, 2018

Space2Man commented Oct 25, 2018

dbwiddis commented Oct 20, 2018 •

edited

Loading

dbwiddis commented Oct 22, 2018 •

edited

Loading

codecov-io commented Oct 22, 2018 •

edited

Loading

Space2Man left a comment •

edited

Loading