8000 Tweak things for when the library is proguarded by alexarchambault · Pull Request #3 · coursier/jni-utils · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Tweak things for when the library is proguarded #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from 8000
Apr 27, 2021
Merged

Tweak things for when the library is proguarded #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f153e4
Tweak snprintf / const stuff
alexarchambault Apr 27, 2021
4deb58c
Only generate DllName class where it's needed
alexarchambault Apr 27, 2021
790f869
Avoid loading coursier.jniutils.NativeCalls when it's not needed
alexarchambault Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import mill._, scalalib._
import scala.concurrent.duration._


object `windows-jni-utils` extends WindowsUtils with HasCSources with JniUtilsPublishModule {
object `windows-jni-utils` extends WindowsUtils with HasCSources with JniUtilsPublishModule with WithDllNameJava {
def linkingLibs = Seq("ole32")

def compile = T{
Expand Down Expand Up @@ -50,7 +50,7 @@ object `windows-jni-utils-tests` extends ScalaModule with JniUtilsPublishModule

// compile these projects to generate or update JNI header files
object headers extends Module {
object `windows-jni-utils` extends WindowsUtils with GenerateHeaders
object `windows-jni-utils` extends WindowsUtils with GenerateHeaders with WithDllNameJava
object `windows-jni-utils-bootstrap` extends WindowsUtils with GenerateHeaders {
def moduleDeps = Seq(`windows-jni-utils`)
def cDirectory = `windows-jni-utils`.cDirectory()
Expand All @@ -68,12 +68,8 @@ object headers extends Module {
define.BasePath(super.millModuleBasePath.value / os.up)
}

trait WindowsUtils extends MavenModule with JniUtilsPublishVersion with WithDllNameJava {
trait WindowsUtils extends MavenModule with JniUtilsPublishVersion {
def compileIvyDeps = Agg(Deps.svm)
def dllName = T{
val ver = publishVersion()
s"csjniutils-$ver"
}
}

def windowsJvmArchive = T.persistent {
Expand Down
7 changes: 6 additions & 1 deletion settings.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ def publishSonatype(
}

trait WithDllNameJava extends JavaModule {
def dllName: T[String]
def generatedSources = T{
val f = T.ctx().dest / "coursier" / "jniutils" / "DllName.java"
val dllName0 = dllName()
Expand All @@ -296,4 +295,10 @@ trait WithDllNameJava extends JavaModule {
os.write(f, content, createFolders = true)
Seq(PathRef(f))
}

def publishVersion: T[String]
def dllName = T{
val ver = publishVersion()
s"csjniutils-$ver"
}
}
8 changes: 4 additions & 4 deletions windows-jni-utils/src/main/c/coursier_jniutils_WindowsAnsiTerminal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jstring _Java_coursier_jniutils_NativeCalls_Terminal_lastError
DWORD err = GetLastError();
char dummy[1];
const int len = snprintf(dummy, 1, "error:%s error %lu", origin, err);
char *buf = malloc(len);
snprintf(buf, len, "error:%s error %lu", origin, err);
char *buf = malloc(len + 1);
snprintf(buf, len + 1, "error:%s error %lu", origin, err);
const jstring result = (*env)->NewStringUTF(env, buf);
free(buf);
return result;
Expand All @@ -23,9 +23,9 @@ jstring _Java_coursier_jniutils_NativeCalls_Terminal_format
va_start(ap, format);
const int len = vsnprintf(dummy, 1, format, ap);
va_end(ap);
char *buf = malloc(len);
char *buf = malloc(len + 1);
va_start(ap, format);
vsnprintf(buf, len, format, ap);
vsnprintf(buf, len + 1, format, ap);
va_end(ap);
const jstring result = (*env)->NewStringUTF(env, buf);
free(buf);
Expand Down
16 changes: 8 additions & 8 deletions windows-jni-utils/src/main/c/coursier_jniutils_WindowsEnvironmentVariables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_SetUserEnvironmentVariableNative
(JNIEnv *env, jclass class, jbyteArray key, jbyteArray value) {

const jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);
const jbyte *valueStr = (*env)->GetByteArrayElements(env, value, NULL);
jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);
jbyte *valueStr = (*env)->GetByteArrayElements(env, value, NULL);
const size_t valueLen = (*env)->GetArrayLength(env, value);

LSTATUS status = RegSetKeyValueA(
Expand Down Expand Up @@ -40,7 +40,7 @@ JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_SetUserEnvironme
JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_GetUserEnvironmentVariableNative
(JNIEnv *env, jclass class, jbyteArray key) {

const jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);
jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);

DWORD type = 0;

Expand Down Expand Up @@ -100,7 +100,7 @@ JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_GetUserEnvironme
JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_DeleteUserEnvironmentVariableNative
(JNIEnv *env, jclass class, jbyteArray key) {

const jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);
jbyte *keyStr = (*env)->GetByteArrayElements(env, key, NULL);

LSTATUS status = RegDeleteKeyValueA(
HKEY_CURRENT_USER,
Expand All @@ -109,11 +109,11 @@ JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_NativeCalls_DeleteUserEnviro
);
(*env)->ReleaseByteArrayElements(env, key, keyStr, JNI_ABORT);
if (status != ERROR_SUCCESS && status != ERROR_FILE_NOT_FOUND) {
size_t size = 256;
jbyteArray arr = (*env)->NewByteArray(env, size);
char dummy = 0;
int len = snprintf(&dummy, 1, "E%lu", status);
jbyteArray arr = (*env)->NewByteArray(env, len + 1);
jbyte *data = (*env)->GetByteArrayElements(env, arr, NULL);
snprintf(data, size, "E%lu", status);
data[size - 1] = '\0';
snprintf(data, len + 1, "E%lu", status);
(*env)->ReleaseByteArrayElements(env, arr, data, 0);
return arr;
}
Expand Down
26 changes: 25 additions & 1 deletion windows-jni-utils/src/main/java/coursier/jniutils/NativeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package coursier.jniutils;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

public abstract class NativeApi {

public abstract String terminalSize();
Expand All @@ -16,8 +19,29 @@ public abstract class NativeApi {
private static NativeApi instance = null;
public static NativeApi get() {
if (instance == null) {
instance = NativeCalls.nativeApi();
// Equivalent to
// instance = NativeCalls.nativeApi();
// but without referencing coursier.jniutils.NativeCalls from here, so
// that if this code gets proguarded, the JVM doesn't try (and fail) to link the
// native methods of coursier.jniutils.NativeCalls. Users need setup a different
// NativeCalls instance themselves in that case (from one of the other modules).
ClassLoader cl = Thread.currentThread().getContextClassLoader();
String className = "coursier";
className = className + ".";
className = className + "jniutils";
className = className + ".";
className = className + "NativeCalls";
try {
Class<?> cls = cl.loadClass(className);
Method m = cls.getMethod("nativeApi");
Object v = m.invoke(null);
instance = (NativeApi) v;
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
throw new RuntimeException("No NativeApi instance available. Set up one with coursier.jniutils.NativeCalls.setup()", e);
}
}
if (instance == null)
throw new RuntimeException("No NativeApi instance available. Set up one with coursier.jniutils.NativeCalls.setup()");
return instance;
}

Expand Down
9 changes: 7 additions & 2 deletions windows-jni-utils/src/main/java/coursier/jniutils/NativeCalls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package coursier.jniutils;

final class NativeCalls {
public final class NativeCalls {

static native String terminalSizeNative();

Expand All @@ -12,7 +12,7 @@ final class NativeCalls {

static native String GetKnownFolderPathNative(String rfid);

static NativeApi nativeApi() {
public static NativeApi nativeApi() {
LoadWindowsLibrary.ensureInitialized();
return new NativeApi() {
public String terminalSize() {
Expand All @@ -39,4 +39,9 @@ public String GetKnownFolderPath(String rfid) {
};
}

public static void setup() {
LoadWindowsLibrary.ensureInitialized();
NativeApi nativeApi0 = nativeApi();
NativeApi.set(nativeApi0);
}
}
11 changes: 11 additions & 0 deletions ...ls/src/main/resources/META-INF/native-image/io.get-coursier/jni-utils/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"name" : "coursier.jniutils.NativeCalls",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"allDeclaredClasses" : true,
"allPublicClasses" : true
}
]
0