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

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,7 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;

5
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -6,10 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
@@ -60,10 +60,9 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};
}
@Override

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

@@ -1,16 +1,16 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Utils.StringTemplate;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Utils.StringTemplate;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;

4
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -2,9 +2,9 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import static Common.Visual.Tables.TableRenderers.RendererDate;
@@ -47,7 +47,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};

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

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.User;
import Common.Passes.PassException;
import _VisualDVM.Utils;
import java.io.File;
import java.nio.file.Files;

8
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import Common.Passes.Pass;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -102,5 +102,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
FileUtils.write(par_text, String.join("\n", rTask.getRunConfiguration().getParList()));
}
}
protected String getCoupDeGrace(){return "";}
protected String getCoupDeGrace() {
return "";
}
}

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

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

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

@@ -1,6 +1,5 @@
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;
@@ -48,11 +47,11 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
}
@Override
protected void CheckTask() throws Exception {
// mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
// mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
}
@Override
protected void AbortTask() throws Exception {
// pass.ShellCommand(mvs.getCancelTaskCommand(task));
// pass.ShellCommand(mvs.getCancelTaskCommand(task));
}
@Override
protected void CalculatePerformanceTime() throws Exception {

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Utils;
import java.io.File;
public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<CompilationTask> {
@@ -30,7 +30,7 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
}
@Override
protected void StartTask() throws Exception {
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",getStartCommand());
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID", getStartCommand());
task.state = TaskState.Running;
}
@Override

1
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
View File

@@ -73,7 +73,6 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
public String getLauncher() {
return String.join("/", pass.user.workspace, "modules", "launcher");
}
protected String getStartCommand() {
String res =
String.join(" ",

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

@@ -1,10 +1,9 @@
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;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Utils;
import com.jcraft.jsch.ChannelSftp;
import java.io.ByteArrayInputStream;
@@ -18,7 +17,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
if (!env.isEmpty()) res = env + " " + res;
//--
task.PID = pass.user.connection.startShellProcess(getRemoteProject(),"PID",
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",
"ulimit -s unlimited", res);
task.state = TaskState.Running;
}

14
src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.Tasks.Supervisor;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.PassException;
import Common.Passes.Pass;
import java.util.Date;
public abstract class TaskSupervisor<T extends Task, P extends Pass> {
@@ -13,9 +13,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
protected db_project_info project; //проект к которому относится задача
protected P pass; //проход отвечающий за задачу
protected int performanceTime; //сколько задача уже выполняется.
public void ShowTaskState(){
public void ShowTaskState() {
Global.mainModule.getDb().tables.get(task.getClass()).ShowUI(task.getPK());
}
public void Init(T task_in, P pass_in, db_project_info project_in) {
@@ -49,7 +47,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
protected void CheckTask() throws Exception {
}
protected void CheckIfNeedAbort() {
if (project.getInterruptFile().exists()){
if (project.getInterruptFile().exists()) {
task.state = TaskState.AbortingByUser;
ShowTaskState();
}
@@ -57,11 +55,11 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
//досрочное прерывание задачи
protected void AbortTask() throws Exception {
}
protected String getCoupDeGrace(){
protected String getCoupDeGrace() {
return "";
}
//добивание задачи после ее завершения по таймауту. не всегда нужно
// protected void CoupDeGraceTask() throws Exception {}
// protected void CoupDeGraceTask() throws Exception {}
//получить результаты выполнения задачи. в случае локальной машины, очевидно, пустая функция
protected void AchieveResults() throws Exception {
}

5
src/_VisualDVM/GlobalData/Tasks/Task.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.Tasks;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
@@ -88,7 +88,6 @@ public abstract class Task extends iDBObject {
public void MaximizeTime() {
Time = maxtime + 1;
}
public void UpdateState(TaskState state_in) {
if (state != state_in) {
state = state_in;

2
src/_VisualDVM/GlobalData/Tasks/TaskState.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks;
import Common.Visual.StatusEnum;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.StatusEnum;
public enum TaskState implements StatusEnum {
Inactive,
//--