промежуточный. делаю задание числа потоков при тестировании через визуализатор

This commit is contained in:
2023-10-14 02:30:31 +03:00
parent a2971e95da
commit 79848baaa1
9 changed files with 14 additions and 21 deletions

View File

@@ -4,6 +4,8 @@ import com.google.gson.annotations.Expose;
import java.util.List;
import java.util.Vector;
public class SapforTasksPackage_json {
@Expose
public int kernels = 1;
@Expose
public String sapfor_drv = ""; //файл с сапфором. Имя уникально для сценария.
@Expose

View File

@@ -17,7 +17,7 @@ public class SapforTasksPackage extends nDBObject {
public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения
//-
public int kernels=1; //количество потоков.д
public int kernels=1; //количество потоков.
@Description("DEFAULT 'Queued'")
public TasksPackageState state = TasksPackageState.Queued;
// допустимые состояния
@@ -37,6 +37,7 @@ public class SapforTasksPackage extends nDBObject {
tasksCount = p.tasksCount;
StartDate = p.StartDate;
ChangeDate = p.ChangeDate;
kernels = p.kernels;
state = p.state;
}
}

View File

@@ -16,11 +16,12 @@ public class SapforTasksPackageSupervisor extends ThreadsPlanner {
SapforTasksPackage_json package_json = null;
SapforTasksResults_json results_json = new SapforTasksResults_json();
public SapforTasksPackageSupervisor() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum);
super(2000);
package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "package_json"), SapforTasksPackage_json.class);
results_json.StartDate = new Date().getTime();
//формирование списка задач.
File sapfor_drv = new File(Global.Home, package_json.sapfor_drv);
setMaxKernels(package_json.kernels);
for (SapforConfiguration_json sapforConfiguration_json : package_json.configurations) {
for (String testName : package_json.tests) {
//--- чтобы было можно на нее сослаться после выполнения всех нитей.

View File

@@ -11,6 +11,8 @@ public class SapforTasksPackage_info implements Serializable {
@Expose
public int sapforId = Constants.Nan; //файл с сапфором
@Expose
public int kernels = 1;
@Expose
public List<String> testsIds = new Vector<>();
@Expose
public List<String> configurationsIds = new Vector<>();

View File

@@ -24,8 +24,10 @@ public abstract class ThreadsPlanner {
protected Vector<Integer> activeThreads = new Vector<>();
protected Vector<Integer> waitingThreads = new Vector<>();
//--
public ThreadsPlanner(int wait_ms_in, int maxKernels_in) {
public ThreadsPlanner(int wait_ms_in) {
wait_ms = wait_ms_in;
}
public void setMaxKernels(int maxKernels_in){
maxKernels = maxKernels_in;
kernels = maxKernels;
}