From 8fc70d48adc331286eafd5e2f8bee2f893948225 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 13 Mar 2025 20:10:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=BC=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml           | 12 ++++++------
 properties                    |  8 ++++----
 src/_VisualDVM/Constants.java |  2 +-
 src/files/Global.h            |  3 +++
 src/files/RunTask.h           |  2 +-
 src/files/String.h            |  1 +
 src/files/Utils.h             |  9 ++++++++-
 src/files/planner.cpp         |  1 +
 src/files/version.h           |  2 +-
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e5d1fe6..61447e29 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Repository/DownloadRepositoryPass.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/Passes/All/DownloadDvmRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmTestsRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Global.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Global.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/String.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/String.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Utils.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Utils.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/planner.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/planner.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 7dd00382..789eef95 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\Tests",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -30,9 +30,9 @@
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": false,
   "CompleteRunEnvironments": false,
-  "lastMachineId": 1,
-  "lastUserId": 17,
-  "lastCompilerId": 15,
+  "lastMachineId": 28,
+  "lastUserId": 36,
+  "lastCompilerId": 110,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 04bd82dc..e562fef2 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
 import java.util.Vector;
 public class Constants {
     public static final int version = 1208;
-    public static final int planner_version = 15;
+    public static final int planner_version = 16;
     public static final int testingMaxKernels = 64;
     //--
     public static final String ApplicationFileName = "VisualSapfor.jar";
diff --git a/src/files/Global.h b/src/files/Global.h
index d3ea9aac..8120a9b8 100644
--- a/src/files/Global.h
+++ b/src/files/Global.h
@@ -4,9 +4,12 @@
 
 String userWorkspace;
 String packageWorkspace;
+String packageId;
+
 int maxKernels;
 int busyKernels;
 int freeKernels;
+
 String dvm_drv;
 String PATH;
 String LD_LIBRARY_PATH;
diff --git a/src/files/RunTask.h b/src/files/RunTask.h
index fd892206..b70f63bd 100644
--- a/src/files/RunTask.h
+++ b/src/files/RunTask.h
@@ -46,7 +46,7 @@ public:
 	}
 	void setParent(CompilationTask* parent_in) {
 		parent = parent_in;
-		binary_name = "spf_" + String(id) + "_" + matrix.Replace(' ', '_');
+		binary_name = "spf_" + packageId+"_"+String(id) + "_" + matrix.Replace(' ', '_');
 	}
 	CompilationTask* getParent() {
 		return parent;
diff --git a/src/files/String.h b/src/files/String.h
index 2df6ee26..e03136a3 100644
--- a/src/files/String.h
+++ b/src/files/String.h
@@ -23,6 +23,7 @@ public:
 	String(int s) { body = to_string(s); }
 	String(long s) { body = to_string(s); }
 	String(long long s) { body = to_string(s); }
+	String (string s){ body = s;}
 
 	void println() const { printf("[%s]\n", body.c_str()); }
 	void addChar(char c) { body += c; }
diff --git a/src/files/Utils.h b/src/files/Utils.h
index 7567429a..bf162996 100644
--- a/src/files/Utils.h
+++ b/src/files/Utils.h
@@ -106,10 +106,17 @@ public:
 	static time_t getAbsoluteTime() {
 		return time(NULL);
 	}
-
 	static String getDate() {
 		auto ttime = time(NULL);
 		String res(ctime(&ttime));
 		return res;
 	}
+
+static String getFileName(const String& path){
+	    int start_i = path.getBody().find_last_of('/');
+	    if (start_i != string::npos){
+	        return String(path.getBody().substr(start_i+1));
+	    }
+	    return String();
+	}
 };
diff --git a/src/files/planner.cpp b/src/files/planner.cpp
index 045a52f0..7f3e5375 100644
--- a/src/files/planner.cpp
+++ b/src/files/planner.cpp
@@ -115,6 +115,7 @@ int main(int argc, char ** argv)
     ("PATH="+PATH).println();
     ("LD_LIBRARY_PATH="+LD_LIBRARY_PATH).println();
     //--
+    packageId =Utils::getFileName(packageWorkspace);
 #if __cplusplus >= 201703L
 	std::filesystem::current_path(packageWorkspace.getCharArray());
 #else
diff --git a/src/files/version.h b/src/files/version.h
index 3f10ffe7..19c7bdba 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-15
\ No newline at end of file
+16
\ No newline at end of file