inode, device: 20x faster

Author: scivision

+stdlib/+java/device.m

@@ -8,9 +8,9 @@
 
 % Java 1.8 benefits from the absolute() for stability
 % seen on older Matlab versions on HPC
-opt = java.nio.file.LinkOption.values();
 
 try
+  opt = java.nio.file.LinkOption.values();
   i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:dev", opt);
 catch e
   javaException(e)

+stdlib/+java/inode.m

@@ -8,9 +8,9 @@
 
 % Java 1.8 benefits from the absolute() for stability
 % seen on older Matlab versions on HPC
-opt = java.nio.file.LinkOption.values();
 
 try
+  opt = java.nio.file.LinkOption.values();
   i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:ino", opt);
 catch e
   javaException(e)

+stdlib/+java/private/javaException.m

@@ -1,8 +1,17 @@
 function javaException(e)
 
-switch class(e.ExceptionObject)
-  case {'java.nio.file.NoSuchFileException', 'java.nio.file.NotLinkException'}
-  otherwise, rethrow(e)
+switch e.identifier
+  case 'MATLAB:Java:GenericException'
+    switch class(e.ExceptionObject)
+      case {'java.nio.file.NoSuchFileException', 'java.nio.file.NotLinkException'}
+        % pass
+      otherwise
+        rethrow(e)
+    end
+  case 'MATLAB:undefinedVarOrClass'
+    % Java not enabled -nojvm
+  otherwise
+    rethrow(e)
 end
 
 end

+stdlib/device.m

@@ -2,18 +2,35 @@
 %
 %%% Inputs
 % * file: path to file
+% * backend: backend to use
 %%% Outputs
 % * i: device index
 % * b: backend used
 
 function [i, b] = device(file, backend)
 arguments
   file string
-  backend (1,:) string = ["java", "python", "perl", "sys"]
+  backend (1,:) string = ["java", "python", "sys"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
-i = o.func(file);
+i = uint64.empty;
+
+for b = backend
+  switch b
+    case "java"
+      i = stdlib.java.device(file);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.device(file);
+    case "sys"
+      i = stdlib.sys.device(file);
+    otherwise
+      error("stdlib:device:ValueError", "Unknown backend: %s", b)
+  end
+
+  if ~isempty(i)
+    return
+  end
+end
 
-b = o.backend;
 end

+stdlib/inode.m

@@ -2,24 +2,35 @@
 %
 %%% inputs
 % * file: path to check
+% * backend: backend to use
 %%% Outputs
 % * i: inode number
 % * b: backend used
 
 function [i, b] = inode(file, backend)
 arguments
   file string
-  backend (1,:) string = ["java", "python", "perl", "sys"]
+  backend (1,:) string = ["java", "python", "sys"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
+i = uint64.empty;
 
-if isscalar(file)
-  i = o.func(file);
-else
-  i = arrayfun(o.func, file);
-end
+for b = backend
+  switch b
+    case "java"
+      i = stdlib.java.inode(file);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.inode(file);
+    case "sys"
+      i = stdlib.sys.inode(file);
+    otherwise
+      error("stdlib:inode:ValueError", "Unknown backend: %s", b)
+  end
 
-b = o.backend;
+  if ~isempty(i)
+    return
+  end
+end
 
 end

+stdlib/+perl/device.m renamed to example/+perl/device.m

@@ -1,3 +1,6 @@
+%% PERL.INODE
+% several times slower than stdlib.sys.inode
+
 function [r, cmd] = inode(file)
 
 r = uint64.empty;

+stdlib/+perl/inode.m renamed to example/+perl/inode.m

@@ -8,16 +8,9 @@
 end
 
 properties(TestParameter)
-backend
+backend = cellstr(["java", "python", "sys"])
 end
 
-methods (TestParameterDefinition, Static)
-function backend = setupBackend()
-  backend = init_backend('inode');
-end
-end
-
-
 methods (Test)
 
 function bench_exist(tc, backend)

example/BenchmarkInode.m

@@ -18,6 +18,6 @@ function BenchmarkInodeRun()
 
 function result = run_bench(name)
 suite = testsuite(name);
-exp = matlab.perftest.TimeExperiment.limitingSamplingError(RelativeMarginOfError=0.1);
+exp = matlab.perftest.TimeExperiment.limitingSamplingError(RelativeMarginOfError=0.05);
 result = exp.run(suite);
 end

example/BenchmarkInodeRun.m

@@ -15,19 +15,18 @@
 B_hard_link_count
 B_filesystem_type
 B_owner
-B_device
+B_device = {'java', 'python', 'sys'}
 B_is_dev_drive
 end
 
 methods (TestParameterDefinition, Static)
-function [B_disk, B_is_removable, B_is_mount, B_hard_link_count, B_filesystem_type, B_owner, B_device, B_is_dev_drive] = setupBackends()
+function [B_disk, B_is_removable, B_is_mount, B_hard_link_count, B_filesystem_type, B_owner, B_is_dev_drive] = setupBackends()
 B_disk = init_backend("disk_available");
 B_is_removable = init_backend("is_removable");
 B_is_mount = init_backend("is_mount");
 B_hard_link_count = init_backend("hard_link_count");
 B_filesystem_type = init_backend("filesystem_type");
 B_owner = init_backend("get_owner");
-B_device = init_backend("device");
 B_is_dev_drive = init_backend('is_dev_drive');
 end
 end
@@ -130,8 +129,9 @@ function test_remove_file(tc)
 
 
 function test_device(tc, Po, B_device)
-i = stdlib.device(Po, B_device);
+[i, b] = stdlib.device(Po, B_device);
 tc.verifyClass(i, 'uint64')
+tc.assertEqual(char(b), B_device)
 
 if ~stdlib.exists(Po)
   tc.verifyEmpty(i)
@@ -144,8 +144,9 @@ function test_device(tc, Po, B_device)
 
 function test_inode(tc, Po, B_device)
 
-i = stdlib.inode(Po, B_device);
+[i, b] = stdlib.inode(Po, B_device);
 tc.verifyClass(i, 'uint64')
+tc.assertEqual(char(b), B_device)
 
 if ~stdlib.exists(Po)
   tc.verifyEmpty(i)