Skip to content

[NFC] Kill stupid while loop copy in PhotonJNICommon #2219

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
mcm001 merged 3 commits into from
Dec 6, 2025
Merged

[NFC] Kill stupid while loop copy in PhotonJNICommon #2219

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ffd32a
Kill stupid while loop copy in PhotonJNICommon
mcm001 Dec 6, 2025
823a2c6
Try with resources
mcm001 Dec 6, 2025
a78dc02
Merge branch 'main' into cleanup-jni-loader
mcm001 Dec 6, 2025
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
30 changes: 11 additions & 19 deletions photon-core/src/main/java/org/photonvision/jni/PhotonJNICommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

package org.photonvision.jni;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.List;
import org.photonvision.common.hardware.Platform;
import org.photonvision.common.logging.LogGroup;
Expand All @@ -35,40 +35,32 @@ public abstract class PhotonJNICommon {
protected static synchronized void forceLoad(
PhotonJNICommon instance, Class<?> clazz, List<String> libraries) throws IOException {
if (instance.isLoaded()) return;
if (logger == null) logger = new Logger(clazz, LogGroup.Camera);
if (logger == null) logger = new Logger(clazz, LogGroup.General);

for (var libraryName : libraries) {
for (String libraryName : libraries) {
try {
logger.info("Loading " + libraryName);
// We always extract the shared object (we could hash each so, but that's a lot of work)
var arch_name = Platform.getNativeLibraryFolderName();
var nativeLibName = System.mapLibraryName(libraryName);
String nativeLibName = System.mapLibraryName(libraryName);
var in = clazz.getResourceAsStream("/nativelibraries/" + arch_name + "/" + nativeLibName);

if (in == null) {
logger.error("Could not find " + libraryName);
instance.setLoaded(false);
return;
}

// It's important that we don't mangle the names of these files on Windows at least
File temp = new File(System.getProperty("java.io.tmpdir"), nativeLibName);
FileOutputStream fos = new FileOutputStream(temp);
var temp = Files.createTempDirectory("nativeExtract").resolve(nativeLibName);
Files.copy(in, temp, StandardCopyOption.REPLACE_EXISTING);

int read = -1;
byte[] buffer = new byte[1024];
while ((read = in.read(buffer)) != -1) {
fos.write(buffer, 0, read);
}
fos.close();
in.close();

System.load(temp.getAbsolutePath());

logger.info("Successfully loaded shared object " + temp.getName());
System.load(temp.toAbsolutePath().toString());
logger.info("Successfully loaded shared object " + temp.getFileName());

} catch (UnsatisfiedLinkError e) {
logger.error("Couldn't load shared object " + libraryName, e);
e.printStackTrace();
// logger.error(System.getProperty("java.library.path"));
instance.setLoaded(false);
return;
}
Expand Down
Loading