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

src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java

@@ -19,7 +19,16 @@ public class DVMCompilationTask extends DVMTask {
                               String flags_in
                               ) {
         super(configuration, group, test, flags_in);
-        flags = flags_in;
         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/TestingSystem/DVM/DVMTasks/DVMRunTask.java

@@ -29,8 +29,6 @@ public class DVMRunTask extends DVMTask {
     @Expose
     public int progress = 0;
     @Expose
-    public LanguageName language = LanguageName.fortran;
-    @Expose
     public int cube = 1;
     @Expose
     public int min_dim = 1;
@@ -56,7 +54,6 @@ public class DVMRunTask extends DVMTask {
         super(configuration, group, test, flags_in);
         //--------------------------
         //инфа о компиляции.
-        language = group.language;
         compilation_maxtime = configuration.c_maxtime;
         compilation_state = TaskState.Waiting;
         //инфа о запуске
@@ -99,7 +96,7 @@ public class DVMRunTask extends DVMTask {
     }
     //-
     @Override
-    public Vector<String> pack(int kernels_in) {
+    public Vector<String> pack(Object arg) {
         Vector<String> res = new Vector<>();
         res.add(String.valueOf(id)); //1
         res.add(String.valueOf(maxtime)); //2
@@ -108,7 +105,7 @@ public class DVMRunTask extends DVMTask {
         res.add(environments); //5
         res.add(usr_par.replace("\n", "|")); //6
         res.add(args); //7
-        res.add(String.valueOf(kernels_in)); //8
+        res.add(String.valueOf(kernels)); //8
         return res;
     }
     public String getEnvironments() {

src/TestingSystem/DVM/DVMTasks/DVMTask.java

@@ -3,6 +3,7 @@ import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.iDBObject;
 import GlobalData.Tasks.TaskState;
+import ProjectData.LanguageName;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestType;
@@ -22,6 +23,8 @@ public class DVMTask extends iDBObject {
     @Expose
     public String test_description = "";
     @Expose
+    public LanguageName language = LanguageName.fortran;
+    @Expose
     public String flags = "";
     @Expose
     public int kernels = 1;
@@ -43,6 +46,7 @@ public class DVMTask extends iDBObject {
         group_description = t.group_description;
         test_id = t.test_id;
         test_description = t.test_description;
+        language = t.language;
         flags = t.flags;
         kernels = t.kernels;
         state = t.state;
@@ -62,9 +66,10 @@ public class DVMTask extends iDBObject {
         group_description = group.description;
         test_description = test.description;
         test_type = group.type;
+        language = group.language;
         flags = flags_in;
     }
-    public Vector<String> pack(int kernels) {
+    public Vector<String> pack(Object arg) {
         return null;
     }
 }