deviceNames = UtilOs.getDeviceNamesFromPartitionLinux(partition);
+ if (deviceNames.size() > 1) {
+ StringBuilder sb = new StringBuilder();
+ for (String dName : deviceNames) {
+ String dIface = UtilOs.getDriveInterfaceLinux("/dev/" + dName);
+ if (dIface != null) {
+ if (sb.length() > 0) sb.append(":");
+ sb.append(dIface);
+ }
+ }
+ iface = (sb.length() > 0) ? "Multiple drives: " + sb : null;
+ } else {
+ String devicePath = deviceNames.isEmpty()
+ ? partition
+ : "/dev/" + deviceNames.getFirst();
+ iface = UtilOs.getDriveInterfaceLinux(devicePath);
+ }
+ }
+ } else if (App.isMacOs()) {
+ String devicePath = UtilsMacOs.getDeviceFromPath(dataDirPath);
+ iface = UtilsMacOs.getDriveInterfaceMacOs(devicePath);
+ } else if (App.isWindows()) {
+ String driveLetter = dataDirPath.getRoot().toFile().toString().split(":")[0];
+ if (driveLetter.length() == 1 && Character.isLetter(driveLetter.charAt(0))) {
+ iface = UtilOs.getDriveInterfaceWindows(driveLetter);
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("Could not detect drive interface: " + e.getMessage());
+ }
+ return iface;
+ }
+
/*
* Example input win11 (english):
*
diff --git a/jdm-core/src/main/java/jdiskmark/UtilOs.java b/jdm-core/src/main/java/jdiskmark/UtilOs.java
index 3f025c7..794309c 100644
--- a/jdm-core/src/main/java/jdiskmark/UtilOs.java
+++ b/jdm-core/src/main/java/jdiskmark/UtilOs.java
@@ -205,6 +205,84 @@ public static String getDriveModelWindows(String driveLetter) {
return null;
}
+ /**
+ * Get the storage bus interface for a Windows drive letter using
+ * PowerShell's Get-Partition / Get-Disk pipeline.
+ *
+ * Returns the BusType string from {@code Get-Disk}, e.g.
+ * {@code NVMe}, {@code SATA}, {@code USB}, {@code RAID}, {@code SAS}.
+ *
+ * @param driveLetter single drive letter (e.g. "C")
+ * @return the bus type string, or null if unavailable
+ */
+ public static String getDriveInterfaceWindows(String driveLetter) {
+ driveLetter = driveLetter.toUpperCase();
+ try {
+ // Get-Partition maps a drive letter to a DiskNumber,
+ // then Get-Disk gives us the BusType.
+ String script = String.format(
+ "Get-Partition -DriveLetter %s | Get-Disk | Select-Object -ExpandProperty BusType",
+ driveLetter);
+ ProcessBuilder pb = new ProcessBuilder("powershell", "-NoProfile",
+ "-ExecutionPolicy", "Bypass", "-Command", script);
+ pb.redirectErrorStream(true);
+ Process process = pb.start();
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(process.getInputStream()))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ line = line.trim();
+ if (!line.isEmpty()) {
+ return line;
+ }
+ }
+ }
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Could not detect drive interface on Windows", e);
+ }
+ return null;
+ }
+
+ /**
+ * Get the storage transport for a Linux device using {@code lsblk --output TRAN}.
+ *
+ *
Returns values like {@code sata}, {@code nvme}, {@code usb}, or null.
+ *
+ * @param devicePath the device path (e.g. "/dev/sda", "/dev/nvme0n1")
+ * @return the transport string, or null if unavailable
+ */
+ public static String getDriveInterfaceLinux(String devicePath) {
+ try {
+ ProcessBuilder pb = new ProcessBuilder(
+ "lsblk", devicePath, "--nodeps", "--noheadings", "--output", "TRAN");
+ Map env = pb.environment();
+ env.put("LC_ALL", "C");
+ pb.redirectErrorStream(true);
+ Process process = pb.start();
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(process.getInputStream()))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ line = line.trim();
+ if (!line.isEmpty()) {
+ // Normalise common values
+ switch (line.toLowerCase()) {
+ case "nvme": return "NVMe";
+ case "sata": return "SATA";
+ case "usb": return "USB";
+ case "sas": return "SAS";
+ case "spi": return "SPI";
+ default: return line;
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Could not detect drive interface on Linux", e);
+ }
+ return null;
+ }
+
public static DiskUsageInfo getCapacityWindows(String driveLetter) {
File capacityPsFile = new File(CAPACITY_PS_FILENAME);
if (!capacityPsFile.exists()) {
@@ -1315,4 +1393,4 @@ static String getSectorSizeLinux(Path path) {
return null;
}
}
-
\ No newline at end of file
+
diff --git a/jdm-core/src/main/java/org/metricus/jdm/os/UtilsMacOs.java b/jdm-core/src/main/java/org/metricus/jdm/os/UtilsMacOs.java
index b28d4d4..27f79e2 100644
--- a/jdm-core/src/main/java/org/metricus/jdm/os/UtilsMacOs.java
+++ b/jdm-core/src/main/java/org/metricus/jdm/os/UtilsMacOs.java
@@ -134,6 +134,57 @@ public static String getDeviceModel(String devicePath) {
return "Model unavailable for " + deviceId;
}
+ /**
+ * Returns the storage bus interface for the given macOS device path
+ * by parsing the {@code Protocol} field from {@code diskutil info}.
+ *
+ * Common values: {@code PCI-Express} (NVMe), {@code SATA},
+ * {@code USB}, {@code Apple Fabric}.
+ *
+ * @param devicePath the device path (e.g. {@code /dev/disk4s1})
+ * @return the protocol string, or null if unavailable
+ */
+ public static String getDriveInterfaceMacOs(String devicePath) {
+ if (devicePath == null || devicePath.isEmpty()) {
+ return null;
+ }
+ try {
+ ProcessBuilder pb = new ProcessBuilder("diskutil", "info", devicePath);
+ Map env = pb.environment();
+ env.put("LC_ALL", "C");
+ pb.redirectErrorStream(true);
+ Process process = pb.start();
+
+ String protocol = null;
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if (line.contains("Protocol:")) {
+ protocol = line.split("Protocol:")[1].trim();
+ break;
+ }
+ }
+ }
+
+ try {
+ process.waitFor();
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ }
+
+ if (protocol != null) {
+ // Normalise common macOS protocol values
+ if (protocol.contains("PCI-Express") || protocol.contains("PCI")) {
+ return "NVMe";
+ }
+ return protocol;
+ }
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Could not detect drive interface on macOS", e);
+ }
+ return null;
+ }
+
// -----------------------------------------------------------------------
// Cache flush / drop
// -----------------------------------------------------------------------