M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

рефакторинг. переносил текущие объекты в другое место

Browse Source
This commit is contained in:
02090095
2024-10-13 22:08:13 +03:00
parent 09b64218bd
commit 6afa2dc892
240 changed files with 1472 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -74,10 +74,10 @@ public class CompilationTask extends Task {
@Override
public boolean isVisible() {
return
Current_.matchCurrentID(Current.Machine, machine_id) &&
Current_.matchCurrentID(Current.User, user_id) &&
Current.HasProject() &&
belongsToProject(Current.getProject());
Global.mainModule.matchCurrentID(Current.Machine, machine_id) &&
Global.mainModule.matchCurrentID(Current.User, user_id) &&
Global.mainModule.HasProject() &&
belongsToProject(Global.mainModule.getProject());
}
public Makefile getMakefile() {
return Global.mainModule.getDb().getById(Makefile.class, makefile_id);

3
src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.Tasks.Passes;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
import Visual_DVM_2021.Passes.ProcessPass;
public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPass {
@@ -26,6 +27,6 @@ public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPas
}
@Override
public void Interrupt() throws Exception {
Current.getProject().CreateInterruptFile();
Global.mainModule.getProject().CreateInterruptFile();
}
}

14
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -53,13 +53,13 @@ public class RunTask extends Task {
@Override
public boolean isVisible() {
return
Current_.matchCurrentID(Current.Machine, machine_id) &&
Current_.matchCurrentID(Current.User, user_id) &&
Current_.matchCurrentID(Current.RunConfiguration, run_configuration_id) &&
Current.HasProject() &&
belongsToProject(Current.getProject()) &&
Current.HasCompilationTask() &&
compilation_task_id == Current.getCompilationTask().id;
Global.mainModule.matchCurrentID(Current.Machine, machine_id) &&
Global.mainModule.matchCurrentID(Current.User, user_id) &&
Global.mainModule.matchCurrentID(Current.RunConfiguration, run_configuration_id) &&
Global.mainModule.HasProject() &&
belongsToProject(Global.mainModule.getProject()) &&
Global.mainModule.HasCompilationTask() &&
compilation_task_id == Global.mainModule.getCompilationTask().id;
}
public RunConfiguration getRunConfiguration() {
return (Global.mainModule.getDb()).runConfigurations.Data.get(run_configuration_id);

3
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Map;
@@ -16,7 +17,7 @@ public class LinuxLocalRunSupervisor extends LinuxLocalTaskSupervisor<RunTask> {
}
@Override
protected Map<String, String> getEnvs() {
return Current.getRunConfiguration().getEnvMap();
return Global.mainModule.getRunConfiguration().getEnvMap();
}
@Override
protected String getScriptText() {

3
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Map;
@@ -25,7 +26,7 @@ public class WindowsLocalRunSupervisor extends WindowsLocalTaskSupervisor<RunTas
}
@Override
protected Map<String, String> getEnvs() {
return Current.getRunConfiguration().getEnvMap();
return Global.mainModule.getRunConfiguration().getEnvMap();
}
void kill_mpi() throws Exception {
}

3
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -29,7 +30,7 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
}
@Override
protected void StartTask() throws Exception {
String env = String.join(" ", Current.getRunConfiguration().getEnvList());
String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
mvs_time = (task.maxtime / 60); //в минутах
if (task.maxtime % 60 > 0) mvs_time += 1;
String res = "maxtime=" + Utils_.DQuotes(mvs_time) + " ./run";

3
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -14,7 +15,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
@Override
protected void StartTask() throws Exception {
String res = "./run";
String env = String.join(" ", Current.getRunConfiguration().getEnvList());
String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
if (!env.isEmpty()) res = env + " " + res;
//--
task.PID = pass.user.connection.startShellProcess(getRemoteProject(),"PID",