From a70c93e66d11ba43562c439c293d53ff8758f414 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 24 Feb 2026 14:58:22 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 10 ++++-
 properties                                    |  4 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../DVM/DVMPackage/DVMPackage.java            | 19 ++++++----
 .../DVM/RemoteDVMTestingPlanner.java          | 38 ++++++++++++++-----
 .../DVM/json/CompilationTask_json.java        | 15 ++++++++
 .../DVM/json/DVMCompilationPackage_json.java  |  3 ++
 .../DVM/json/DVMPackage_json.java             |  9 +++++
 .../DVM/json/DVMRunPackage_json.java          |  3 ++
 .../TestingSystem/DVM/json/RunTask_json.java  | 26 +++++++++++++
 .../TestingSystem/DVM/json/Task_json.java     | 13 +++++++
 11 files changed, 121 insertions(+), 21 deletions(-)
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java
 create mode 100644 src/_VisualDVM/TestingSystem/DVM/json/Task_json.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3da45a14..39837da3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 0b1056d8..21dcc7a2 100644
--- a/properties
+++ b/properties
@@ -27,12 +27,12 @@
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "PrecompilationFlags": " ",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": true,
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
-  "ErasePackageWorkspace": true,
+  "ErasePackageWorkspace": false,
   "lastMachineId": 13,
   "lastUserId": 24,
   "lastCompilerId": 52,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index e623984d..676a3935 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1265;
+    public static final int version = 1266;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index e32a809e..1ea861e5 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -200,13 +200,18 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
             return flags_in;
     }
     public static String completeEnvironments(String environmentsSet_in) {
-        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
-            if (environmentsSet_in.isEmpty())
-                return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
-            else
-                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
-        } else
-            return environmentsSet_in;
+        if (environmentsSet_in.isEmpty()){
+            return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1")+" "+ "DVMH_SET_AFFINITY="+Utils_.DQuotes("0");
+        }
+        //-
+        String res = environmentsSet_in;
+        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")){
+            res+=" DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
+        }
+        if (!environmentsSet_in.contains("DVMH_SET_AFFINITY")){
+            res+=" DVMH_SET_AFFINITY=" + Utils_.DQuotes("0");
+        }
+        return res;
     }
     @Override
     public Class getJsonClass() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 8d72ba08..8874e538 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -7,6 +7,10 @@ import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import _VisualDVM.TestingSystem.DVM.json.DVMCompilationPackage_json;
+import _VisualDVM.TestingSystem.DVM.json.CompilationTask_json;
+import _VisualDVM.TestingSystem.DVM.json.DVMRunPackage_json;
+import _VisualDVM.TestingSystem.DVM.json.RunTask_json;
 
 import java.io.File;
 import java.util.Collections;
@@ -71,19 +75,35 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         //создать папку для пакета.
         user.connection.RMDIR(packageRemoteWorkspace.full_name);
         user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name);
+        //--
+        DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
+        DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
         //положить туда запакованные тексты задач.
-        Vector<String> compilationLines = new Vector<>();
-        Vector<String> runLines = new Vector<>();
+        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.addAll(compilationTask.pack(makefileText));
-            for (DVMRunTask runTask : compilationTask.runTasks)
-                runLines.addAll(runTask.pack(null));
+            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 compilationPackage = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
-        RemoteFile runPackage = new RemoteFile(packageRemoteWorkspace, "runTasks");
-        user.connection.writeToFile(String.join("\n", compilationLines) + "\n", compilationPackage);
-        user.connection.writeToFile(String.join("\n", runLines) + "\n", runPackage);
+        //упразднить
+        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");
+        //--
+        user.connection.writeToFile(Utils_.gson.toJson(compilationPackage_json),compilationFile_json);
+        user.connection.writeToFile(Utils_.gson.toJson(runPackage_json), runFile_json);
         // --
         user.connection.MKDIR(new RemoteFile(packageRemoteWorkspace, "state"));
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java b/src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java
new file mode 100644
index 00000000..90a91c7a
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java
@@ -0,0 +1,15 @@
+package _VisualDVM.TestingSystem.DVM.json;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
+import com.google.gson.annotations.Expose;
+public class CompilationTask_json extends Task_json {
+    @Expose
+    public String test_name; //-
+    @Expose
+    public String makefile_text; //res.add(arg.toString().replace("\n", "|")); //4 todo в планировщике убрать шифровку
+    //--
+    public CompilationTask_json(DVMCompilationTask task, String makefile_text_in){
+        super(task);
+        test_name = String.valueOf(task.test_id);
+        makefile_text = makefile_text_in;
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java b/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java
new file mode 100644
index 00000000..ebc78bc2
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java
@@ -0,0 +1,3 @@
+package _VisualDVM.TestingSystem.DVM.json;
+public class DVMCompilationPackage_json extends DVMPackage_json<CompilationTask_json> {
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java b/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java
new file mode 100644
index 00000000..77aacdd3
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java
@@ -0,0 +1,9 @@
+package _VisualDVM.TestingSystem.DVM.json;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class DVMPackage_json<T extends Task_json> {
+    @Expose
+    public List<T> tasks = new Vector<>();
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java b/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java
new file mode 100644
index 00000000..8ab4458d
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java
@@ -0,0 +1,3 @@
+package _VisualDVM.TestingSystem.DVM.json;
+public class DVMRunPackage_json extends DVMPackage_json<RunTask_json>{
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java b/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java
new file mode 100644
index 00000000..9cdc6f00
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java
@@ -0,0 +1,26 @@
+package _VisualDVM.TestingSystem.DVM.json;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import com.google.gson.annotations.Expose;
+public class RunTask_json extends Task_json {
+    @Expose
+    public int kernels;
+    @Expose
+    public int compilation_task_id;
+    @Expose
+    public String matrix;
+    @Expose
+    public String args;
+    @Expose
+    public String environments;
+    @Expose
+    public String usr_par; //- usr_par.replace("\n", "|") todo в планировщике убрать шифровку.
+    public RunTask_json(DVMRunTask task){
+        super(task);
+        kernels = task.kernels;
+        compilation_task_id = task.dvmcompilationtask_id;
+        matrix = task.matrix;
+        args = task.args;
+        environments = task.environments;
+        usr_par = task.usr_par;
+    }
+}
diff --git a/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java b/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java
new file mode 100644
index 00000000..af4a95f5
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java
@@ -0,0 +1,13 @@
+package _VisualDVM.TestingSystem.DVM.json;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
+import com.google.gson.annotations.Expose;
+public class Task_json {
+    @Expose
+    public int id; //-
+    @Expose
+    public int maxtime;
+    public Task_json(DVMTask task){
+        id = task.id;
+        maxtime = task.maxtime;
+    }
+}