rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Process.getWorkingDirectory() and setWorkingDirectory() and posix implementation.

Browse Source
This commit is contained in:
Adam Murdoch
2013-01-26 17:51:10 +11:00
parent 47f914b49d
commit 64a738008e
9 changed files with 151 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/rubygrapefruit/platform/Native.java
View File

@@ -55,7 +55,7 @@ public class Native {
loader.load(platform.getLibraryName());
int nativeVersion = NativeLibraryFunctions.getVersion();
if (nativeVersion != NativeLibraryFunctions.VERSION) {
throw new NativeException(String.format("Unexpected native library version loaded. Expected %s, was %s.", nativeVersion, NativeLibraryFunctions.VERSION));
throw new NativeException(String.format("Unexpected native library version loaded. Expected %s, was %s.", NativeLibraryFunctions.VERSION, nativeVersion));
}
} catch (NativeException e) {
throw e;

18
src/main/java/net/rubygrapefruit/platform/Process.java
View File

@@ -16,6 +16,8 @@
package net.rubygrapefruit.platform;
import java.io.File;
/**
* Functions to query and modify a process' state.
*/
@@ -28,4 +30,20 @@ public interface Process extends NativeIntegration {
*/
@ThreadSafe
int getProcessId() throws NativeException;
/**
* Returns the process' current working directory.
*
* @throws NativeException On failure.
*/
@ThreadSafe
File getWorkingDirectory() throws NativeException;
/**
* Sets the process' working directory.
*
* @throws NativeException On failure.
*/
@ThreadSafe
void setWorkingDirectory(File directory) throws NativeException;
}

20
src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java
View File

@@ -19,8 +19,28 @@ package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.*;
import net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions;
import java.io.File;
public class DefaultProcess implements net.rubygrapefruit.platform.Process {
public int getProcessId() throws NativeException {
return PosixProcessFunctions.getPid();
}
public File getWorkingDirectory() throws NativeException {
FunctionResult result = new FunctionResult();
String dir = PosixProcessFunctions.getWorkingDirectory(result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not get process working directory: %s", result.getMessage()));
}
return new File(dir);
}
public void setWorkingDirectory(File directory) throws NativeException {
FunctionResult result = new FunctionResult();
PosixProcessFunctions.setWorkingDirectory(directory.getAbsolutePath(), result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not set process working directory: %s", result.getMessage()));
}
System.setProperty("user.dir", directory.getAbsolutePath());
}
}

2
src/main/java/net/rubygrapefruit/platform/internal/jni/NativeLibraryFunctions.java
View File

@@ -20,7 +20,7 @@ import net.rubygrapefruit.platform.internal.FunctionResult;
import net.rubygrapefruit.platform.internal.MutableSystemInfo;
public class NativeLibraryFunctions {
public static final int VERSION = 11;
public static final int VERSION = 12;
public static native int getVersion();

48
src/main/java/net/rubygrapefruit/platform/internal/jni/PosixProcessFunctions.java
View File

@@ -1,21 +1,27 @@
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
public class PosixProcessFunctions {
public static native int getPid();
}
/*
* Copyright 2012 Adam Murdoch
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.rubygrapefruit.platform.internal.jni;
import net.rubygrapefruit.platform.internal.FunctionResult;
public class PosixProcessFunctions {
public static native int getPid();
public static native String getWorkingDirectory(FunctionResult result);
public static native void setWorkingDirectory(String dir, FunctionResult result);
}