cores

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java

@@ -19,13 +19,4 @@ public class DVMCompilationTask extends DVMTask {
         maxtime = configuration.c_maxtime;
     }
     //--
-    @Override
-    public Vector<String> pack(Object arg) {
-        Vector<String> res = new Vector<>();
-        res.add(String.valueOf(id)); //1
-        res.add(String.valueOf(maxtime)); //2
-        res.add(String.valueOf(test_id)); //3
-        res.add(arg.toString().replace("\n", "|")); //4
-        return res;
-    }
 }

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java

@@ -90,19 +90,6 @@ public class DVMRunTask extends DVMTask {
         args = rt.args;
     }
     //-
-    @Override
-    public Vector<String> pack(Object arg) {
-        Vector<String> res = new Vector<>();
-        res.add(String.valueOf(id)); //1
-        res.add(String.valueOf(maxtime)); //2
-        res.add(String.valueOf(dvmcompilationtask_id)); //3
-        res.add(matrix); //4
-        res.add(environments); //5
-        res.add(usr_par.replace("\n", "|")); //6
-        res.add(args); //7
-        res.add(String.valueOf(kernels)); //8
-        return res;
-    }
     public String getEnvironments() {
         return environments.replace("\n", ";");
     }

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java

@@ -83,9 +83,6 @@ public class DVMTask extends iDBObject {
                         "results",
                         String.valueOf(id)).toFile();
     }
-    public Vector<String> pack(Object arg) {
-        return null;
-    }
     public String getResultFile(File resultFile) {
         String res = "";
         if (dvm_package_id == CommonConstants.Nan) res = "задача ещё не выполнялась";

src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java

@@ -79,25 +79,16 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
         DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
         //положить туда запакованные тексты задач.
-    //    Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть.
-    //    Vector<String> runLines_OLD = new Vector<>(); //старые, выкинуть.
         for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
             String makefileText = generateMakefile(tests.get(compilationTask.test_id), compilationTask.language, testingPackage.drv, compilationTask.flags);
-      //      compilationLines_OLD.addAll(compilationTask.pack(makefileText)); //old
             //--
             compilationPackage_json.tasks.add(new CompilationTask_json(compilationTask, makefileText));
             //--
             for (DVMRunTask runTask : compilationTask.runTasks) {
-        //        runLines_OLD.addAll(runTask.pack(null)); //оld
                 //--
                 runPackage_json.tasks.add(new RunTask_json(runTask));
             }
         }
-        //упразднить
-      //  RemoteFile compilationFile_old = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
-      //  RemoteFile runPackage_old = new RemoteFile(packageRemoteWorkspace, "runTasks");
-       // user.connection.writeToFile(String.join("\n", compilationLines_OLD) + "\n", compilationFile_old);
-      //  user.connection.writeToFile(String.join("\n", runLines_OLD) + "\n", runPackage_old);
         //--
         RemoteFile compilationFile_json = new RemoteFile(packageRemoteWorkspace, "compilationTasks.json");
         RemoteFile runFile_json = new RemoteFile(packageRemoteWorkspace, "runTasks.json");

src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java

@@ -3,7 +3,7 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import com.google.gson.annotations.Expose;
 public class RunTask_json extends Task_json {
     @Expose
-    public int kernels;
+    public int cores;
     @Expose
     public int compilation_task_id;
     @Expose
@@ -16,7 +16,7 @@ public class RunTask_json extends Task_json {
     public String usr_par; //- usr_par.replace("\n", "|") todo в планировщике убрать шифровку.
     public RunTask_json(DVMRunTask task){
         super(task);
-        kernels = task.kernels;
+        cores = task.kernels;
         compilation_task_id = task.dvmcompilationtask_id;
         matrix = task.matrix;
         args = task.args;