From 7b28d1a84dcc9167e419b71984a06777be90585c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 4 Dec 2023 16:26:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D1=8B.=20=D0=A0=D0=B0=D0=B7=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=BB=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20?=
 =?UTF-8?q?=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=D1=85=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D0=B8=20=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?=
 =?UTF-8?q?=D1=85=20=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA.?=
 =?UTF-8?q?=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=87=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87,=20=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                 |  8 +++++---
 src/files/Planner/CompilationTask.h |  1 +
 src/files/Planner/RunSupervisor.h   | 10 ----------
 src/files/Planner/RunTask.h         |  4 +++-
 src/files/Planner/Supervisor.h      | 16 +++-------------
 src/files/Planner/Task.h            | 25 ++++++-------------------
 6 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dc645192..2eebb6a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,11 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunSupervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/RunSupervisor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/RunTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Task.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Task.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/files/Planner/CompilationTask.h b/src/files/Planner/CompilationTask.h
index 18059a6c..d96f60a1 100644
--- a/src/files/Planner/CompilationTask.h
+++ b/src/files/Planner/CompilationTask.h
@@ -45,6 +45,7 @@ public:
 			"make -j -f Makefile";
 	}
 	virtual void analyseResults() {
+	    Task::analyseResults();
 		String binary = workspace + "/0";
 		state = Utils::Exists(binary) ? Done : DoneWithErrors;
 	}
diff --git a/src/files/Planner/RunSupervisor.h b/src/files/Planner/RunSupervisor.h
index 527fc343..d0823240 100644
--- a/src/files/Planner/RunSupervisor.h
+++ b/src/files/Planner/RunSupervisor.h
@@ -22,14 +22,4 @@ public:
 	virtual String getStatePrefix() {
 		return String("Running");
 	}
-
-	/*
-	virtual void Finalize(){
-		this->state = Archivation;
-		saveState();
-		printf("Archivation started\n");
-		Utils::ZipFolder(String("./"),String("archive.zip"));
-		printf("Archivation ended\n");
-	}
-	*/
 };
diff --git a/src/files/Planner/RunTask.h b/src/files/Planner/RunTask.h
index a87ce402..31da0c07 100644
--- a/src/files/Planner/RunTask.h
+++ b/src/files/Planner/RunTask.h
@@ -96,8 +96,10 @@ public:
 	virtual String copyResults(const String& pathRes) {
 	    String resultPath = Task::copyResults(pathRes);
 		if (Utils::Exists(workspace + "/sts.gz+")) {
-			String dvm_start = String::DQuotes(dvm_drv) + " pa " + String::DQuotes(String(getId()) + "/sts.gz+") + " " + String::DQuotes(resultPath + "/statistic.txt");
+		    String stsPath(resultPath + "/statistic.txt");
+			String dvm_start = String::DQuotes(dvm_drv) + " pa " + String::DQuotes(String(getId()) + "/sts.gz+") + " " + String::DQuotes(stsPath);
 			system(dvm_start.getCharArray());
+			while (!Utils::Exists(stsPath));
 		}
 		return resultPath;
 	}
diff --git a/src/files/Planner/Supervisor.h b/src/files/Planner/Supervisor.h
index f60c0092..1114c058 100644
--- a/src/files/Planner/Supervisor.h
+++ b/src/files/Planner/Supervisor.h
@@ -11,9 +11,8 @@
 enum SupervisorState {   
     WorkspacesCreation, //0   
     Preparation,        //1   
-    Execution,      //2   
-    Archivation,        //3
-    End         //4   
+    Execution,      //2
+    End         //3
 };    
   
 template <class T>     
@@ -32,8 +31,6 @@ public:
             return String("Preparation");
         case Execution:
             return String("Execution");
-        case Archivation:
-            return String("Archivation");
         case End:
             return String("End");
         default:
@@ -71,7 +68,6 @@ public:
             saveState();
             break;
         case Execution:
-            Finalize();
             this->state = End;
             saveState();
             break;
@@ -187,18 +183,12 @@ public:
 
         changeState();
 
-        String outFile(pathRes + "/info.txt");
+        String outFile(pathRes + "/"+getStatePrefix()+"Info.txt");
         File tmp(outFile, String(buf.c_str()));
-
-        //Utils::ZipFolder(pathRes, pathRes + ".zip");
     }
-
-    virtual void Finalize() { }
-
     void saveState() {
         Utils::Sleep(1); //чтобы не было одинаковых по дате файлов.
         String stateFile = packageWorkspace + "/state/" + getStatePrefix() + printState();
-        //printf("stateFile=<%s>\n", stateFile.getCharArray()); 
         File tmp(stateFile, Utils::getDate());
     }
 };
\ No newline at end of file
diff --git a/src/files/Planner/Task.h b/src/files/Planner/Task.h
index dc463fe4..d5d124c0 100644
--- a/src/files/Planner/Task.h
+++ b/src/files/Planner/Task.h
@@ -173,15 +173,10 @@ public:
 				}
 			}
 		}
-
 		if (state != Running) {
-			//- 
 			busyKernels = Utils::min(busyKernels - kernels, maxKernels);
 			freeKernels = Utils::max(0, maxKernels - busyKernels);
-			//- 
-			saveState();
 		}
-
 		return (state != Running);
 	}
 
@@ -192,19 +187,11 @@ public:
 		printf("%ld done with time %f\n", id, total_time);
 		state = Finished;
 	}
-
-	virtual void saveState() {
-		String stateFile = workspace + "/TaskState";
-		File tmp(stateFile, printState());
-	}
-
-	virtual String copyResults(const String& pathRes) {
-        String resultPath(packageWorkspace + "/" + pathRes + "/" + getId());
-        Utils::Mkdir(resultPath);
-        //Utils::Copy(workspace + "/TaskState", resultPath + "/TaskState");
-        Utils::Copy(workspace + "/out.txt", resultPath + "/out.txt");
-        Utils::Copy(workspace + "/err.txt", resultPath + "/err.txt");
-        //Utils::Copy(workspace + "/total_time", resultPath + "/total_time");
-    	return resultPath;
+    virtual String copyResults(const String& pathRes) {
+		String resultPath(packageWorkspace + "/" + pathRes + "/" + getId());
+		Utils::Mkdir(resultPath);
+		Utils::Copy(workspace + "/out.txt", resultPath + "/out.txt");
+		Utils::Copy(workspace + "/err.txt", resultPath + "/err.txt");
+		return resultPath;
     }
 };