diff --git a/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java index cb008bf37..c9ee5a407 100644 --- a/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java +++ b/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java @@ -13,6 +13,7 @@ import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinBase; +import com.sun.jna.platform.win32.WinError; import com.sun.jna.ptr.IntByReference; import dev.slimevr.bridge.Pipe.PipeState; @@ -21,7 +22,6 @@ import io.eiren.util.logging.LogManager; import io.eiren.vr.VRServer; import io.eiren.vr.trackers.VRTracker; import io.eiren.vr.trackers.ShareableTracker; -import io.eiren.vr.trackers.Tracker; import io.eiren.vr.trackers.TrackerPosition; import io.eiren.vr.trackers.TrackerStatus; @@ -49,14 +49,22 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { try { createPipes(); while(true) { - waitForPipesToOpen(); - if(areAllPipesOpen()) { - boolean pipesUpdated = updatePipes(); // Update at HMDs frequency - if(!pipesUpdated) { + boolean pipesUpdated = false; + if(pipe.state == PipeState.CREATED) { + tryOpeningPipe(pipe); + } + if(pipe.state == PipeState.OPEN) { + pipesUpdated = updatePipes(); + } + if(pipe.state == PipeState.ERROR) { + resetPipe(); + } + if(!pipesUpdated) { + try { Thread.sleep(5); // Up to 200Hz + } catch(InterruptedException e) { + e.printStackTrace(); } - } else { - Thread.sleep(10); } } } catch(Exception e) { @@ -64,12 +72,6 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { } } - private void waitForPipesToOpen() { - if(pipe.state == PipeState.CREATED) { - tryOpeningPipe(pipe); - } - } - public boolean updatePipes() throws IOException { if(pipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); @@ -91,11 +93,15 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { } } if(bytesRead < buffArray.length) - break; // Don't repeat, we read all available bytes + return true; // All pipe data read } - return true; + } else { + return false; // Pipe was empty, it's okay } } + // PeekNamedPipe or ReadFile returned an error + pipe.state = PipeState.ERROR; + LogManager.log.severe("[SteamVRPipeInputBridge] Pipe error: " + Kernel32.INSTANCE.GetLastError()); } return false; } @@ -208,8 +214,14 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { // Not used, only input } + private void resetPipe() { + Pipe.safeDisconnect(pipe); + pipe.state = PipeState.CREATED; + //Main.vrServer.queueTask(this::disconnected); + } + private boolean tryOpeningPipe(Pipe pipe) { - if(Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null)) { + if(Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED) { pipe.state = PipeState.OPEN; LogManager.log.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " is open"); return true; @@ -219,13 +231,6 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { return false; } - private boolean areAllPipesOpen() { - if(pipe == null || pipe.state == PipeState.CREATED) { - return false; - } - return true; - } - private void createPipes() throws IOException { try { pipe = new Pipe(Kernel32.INSTANCE.CreateNamedPipe(PipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode @@ -240,18 +245,10 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { throw new IOException("Can't open " + PipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); LogManager.log.info("[SteamVRPipeInputBridge] Pipes are open"); } catch(IOException e) { - safeDisconnect(pipe); + Pipe.safeDisconnect(pipe); throw e; } } - - public static void safeDisconnect(Pipe pipe) { - try { - if(pipe != null && pipe.pipeHandle != null) - Kernel32.INSTANCE.DisconnectNamedPipe(pipe.pipeHandle); - } catch(Exception e) { - } - } @Override public void addSharedTracker(ShareableTracker tracker) { diff --git a/src/main/java/io/eiren/vr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java index 1d4bffeed..5d029bef0 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/src/main/java/io/eiren/vr/VRServer.java @@ -17,6 +17,7 @@ import java.util.function.Consumer; import dev.slimevr.bridge.Bridge; import dev.slimevr.bridge.NamedPipeBridge; +import dev.slimevr.bridge.SteamVRPipeInputBridge; import dev.slimevr.bridge.VMCBridge; import dev.slimevr.bridge.WebSocketVRBridge; import io.eiren.util.OperatingSystem; @@ -67,6 +68,7 @@ public class VRServer extends Thread { NamedPipeVRBridge driverBridge = new NamedPipeVRBridge(hmdTracker, shareTrackers, this); tasks.add(() -> driverBridge.startBridge()); bridges.add(driverBridge); + //*/ // Create named pipe bridge for SteamVR input SteamVRPipeInputBridge steamVRInput = new SteamVRPipeInputBridge(this); tasks.add(() -> steamVRInput.startBridge());