Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(process) Add option for automatic profiling

Browse Source 
The change adds a new system property 'system.profile' that makes ProcessService automatically trigger JFR profiling of the processes it spawns.  By default, these are put in the log directory.

The change also adds a JVM parameter that makes it shut up about native access.
This commit is contained in:
Viktor Lofgren 2024-06-27 13:58:36 +02:00
parent 0e4dd3d76d
commit 738e0e5fed
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/execution/java/nu/marginalia/process/ProcessService.java
View File

@ -19,6 +19,8 @@ import org.slf4j.MarkerFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -32,6 +34,7 @@ public class ProcessService {
private final ServiceEventLog eventLog; private final ServiceEventLog eventLog;
private final ConcurrentHashMap<ProcessId, Process> processes = new ConcurrentHashMap<>(); private final ConcurrentHashMap<ProcessId, Process> processes = new ConcurrentHashMap<>();
private final int node;
public static ProcessService.ProcessId translateExternalIdBase(String id) { public static ProcessService.ProcessId translateExternalIdBase(String id) {
@ -78,6 +81,7 @@ public class ProcessService {
@Inject @Inject
public ProcessService(BaseServiceParams params) { public ProcessService(BaseServiceParams params) {
this.eventLog = params.eventLog; this.eventLog = params.eventLog;
this.node = params.configuration.node();
} }
@ -86,7 +90,7 @@ public class ProcessService {
List<String> args = new ArrayList<>(); List<String> args = new ArrayList<>();
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
args.add(STR."\{javaHome}/bin/java"); args.add(javaHome + "/bin/java");
args.add("-cp"); args.add("-cp");
args.add(System.getProperty("java.class.path")); args.add(System.getProperty("java.class.path"));
@ -94,6 +98,7 @@ public class ProcessService {
else args.add("-da"); else args.add("-da");
args.add("--enable-preview"); args.add("--enable-preview");
args.add("--enable-native-access=ALL-UNNAMED");
String loggingOpts = System.getProperty("log4j2.configurationFile"); String loggingOpts = System.getProperty("log4j2.configurationFile");
if (loggingOpts != null) { if (loggingOpts != null) {
@ -104,6 +109,17 @@ public class ProcessService {
args.add("-Dsystem.serviceNode=" + System.getProperty("system.serviceNode")); args.add("-Dsystem.serviceNode=" + System.getProperty("system.serviceNode"));
} }
if (Boolean.getBoolean("system.profile")) {
// add jfr options
args.add("-XX:+FlightRecorder");
String jfrFileName = "/var/log/wmsa/profile-%s-%d-%s.jfr".formatted(
processId.toString(),
node,
LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '.')
);
args.add("-XX:StartFlightRecording=filename=%s,name=%s".formatted(jfrFileName, processId.toString()));
}
args.addAll(processId.envOpts()); args.addAll(processId.envOpts());
args.add(processId.mainClass); args.add(processId.mainClass);
args.addAll(Arrays.asList(extraArgs)); args.addAll(Arrays.asList(extraArgs));