no message
This commit is contained in:
11
.idea/workspace.xml
generated
11
.idea/workspace.xml
generated
@@ -8,6 +8,17 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Common/Database/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DataSet.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -230,11 +230,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
|||||||
public void RestoreLastSelections() {
|
public void RestoreLastSelections() {
|
||||||
if (hasUI()) {
|
if (hasUI()) {
|
||||||
Object lastPk = selections.get(getClass());
|
Object lastPk = selections.get(getClass());
|
||||||
// if (lastPk != null) UI.Info(this.getClass() + ":" + lastPk.toString());
|
|
||||||
if ((CurrentName() != Current.Undefined) && (lastPk != null)) {
|
if ((CurrentName() != Current.Undefined) && (lastPk != null)) {
|
||||||
// UI.Info(lastPk.toString());
|
|
||||||
// System.out.println(ui);
|
|
||||||
// UI.Info("+");
|
|
||||||
ui_.Select(lastPk);
|
ui_.Select(lastPk);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,13 +136,11 @@ public class PerformanceAnalyzer extends Component {
|
|||||||
});
|
});
|
||||||
// UI.Info(String.valueOf(getPort()));
|
// UI.Info(String.valueOf(getPort()));
|
||||||
process_thread = new Thread(() -> {
|
process_thread = new Thread(() -> {
|
||||||
System.out.println("+");
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
|
Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
|
||||||
"java -jar -Dprism.order=sw "+ Utils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
|
"java -jar -Dprism.order=sw "+ Utils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort());
|
||||||
//-
|
//-
|
||||||
System.out.println("++");
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ public class Visualizer_2 extends OSDComponent {
|
|||||||
InetAddress.getLoopbackAddress(),
|
InetAddress.getLoopbackAddress(),
|
||||||
port, 0
|
port, 0
|
||||||
);
|
);
|
||||||
Print("+");
|
|
||||||
in = new BufferedReader(new InputStreamReader(client.getInputStream())); //то что нам приходит от сервера
|
in = new BufferedReader(new InputStreamReader(client.getInputStream())); //то что нам приходит от сервера
|
||||||
out = new PrintWriter(client.getOutputStream(), true); //то что мы пишем серверу.
|
out = new PrintWriter(client.getOutputStream(), true); //то что мы пишем серверу.
|
||||||
}
|
}
|
||||||
@@ -111,7 +110,6 @@ public class Visualizer_2 extends OSDComponent {
|
|||||||
out.flush();
|
out.flush();
|
||||||
System.gc();
|
System.gc();
|
||||||
out.println(request = request_in);
|
out.println(request = request_in);
|
||||||
Print("+");
|
|
||||||
}
|
}
|
||||||
//запрос-ответ. анализируются только общие ошибочные случаи.
|
//запрос-ответ. анализируются только общие ошибочные случаи.
|
||||||
public String Command(String request_in) throws Exception {
|
public String Command(String request_in) throws Exception {
|
||||||
@@ -126,7 +124,6 @@ public class Visualizer_2 extends OSDComponent {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Print("<-" + response);
|
Print("<-" + response);
|
||||||
Print("+");
|
|
||||||
out.flush();
|
out.flush();
|
||||||
System.gc();
|
System.gc();
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -491,6 +491,7 @@ public class UserConnection {
|
|||||||
Utils.sleep(1000);
|
Utils.sleep(1000);
|
||||||
}
|
}
|
||||||
ShellDisconnect();
|
ShellDisconnect();
|
||||||
|
"+"
|
||||||
return readFromFile(outFile).replace("\n","").replace("\r","");
|
return readFromFile(outFile).replace("\n","").replace("\r","");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class DownloadRepository extends ProcessPass {
|
|||||||
} else {
|
} else {
|
||||||
Utils.CleanDirectory(dst);
|
Utils.CleanDirectory(dst);
|
||||||
PerformScript("cd Repo\nsvn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + src + "\n"); //export
|
PerformScript("cd Repo\nsvn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + src + "\n"); //export
|
||||||
FileUtils.write(loadedFile, "+");
|
FileUtils.write(loadedFile, "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -211,9 +211,6 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
protected void unpack(String packed) throws Exception {
|
protected void unpack(String packed) throws Exception {
|
||||||
//System.out.println("---");
|
|
||||||
// System.out.println(packed);
|
|
||||||
// UI.Info("+");
|
|
||||||
String[] splited = packed.split("\\|");
|
String[] splited = packed.split("\\|");
|
||||||
int j = 0;
|
int j = 0;
|
||||||
//-
|
//-
|
||||||
@@ -266,8 +263,6 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//---
|
|
||||||
//UI.Info("+");
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
|
|||||||
@@ -47,11 +47,6 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void unpack(String packed) throws Exception {
|
protected void unpack(String packed) throws Exception {
|
||||||
// Utils.CreateTempFile("DEBUG1.txt", Utils.Brackets(packed));
|
|
||||||
// System.out.println("---");
|
|
||||||
// System.out.println(packed);
|
|
||||||
// UI.Info("+");
|
|
||||||
|
|
||||||
LinkedHashMap<String, FuncInfo> declarated_functions = new LinkedHashMap<>();
|
LinkedHashMap<String, FuncInfo> declarated_functions = new LinkedHashMap<>();
|
||||||
String[] splited = packed.split("\\|");
|
String[] splited = packed.split("\\|");
|
||||||
Index idx = new Index();
|
Index idx = new Index();
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass {
|
|||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (super.canStart(args)){
|
if (super.canStart(args)){
|
||||||
UI.Info("+");
|
|
||||||
SPF_ParseFilesWithOrder.silent = true;
|
SPF_ParseFilesWithOrder.silent = true;
|
||||||
return (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone() || passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do());
|
return (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone() || passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,9 +74,7 @@ public class SPF_InlineProceduresH extends SapforTransformation {
|
|||||||
}
|
}
|
||||||
Options = Utils.toU(String.join("|", Result));
|
Options = Utils.toU(String.join("|", Result));
|
||||||
System.out.println(Utils.Brackets(Options));
|
System.out.println(Utils.Brackets(Options));
|
||||||
// UI.Info("+");
|
|
||||||
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
|
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
|
||||||
// Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1");
|
|
||||||
SPF_ParseFilesWithOrder.silent = true;
|
SPF_ParseFilesWithOrder.silent = true;
|
||||||
return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();
|
return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -979,7 +979,7 @@ public enum PassCode_2021 {
|
|||||||
name = "GET_MIN_MAX_BLOCK_DIST";
|
name = "GET_MIN_MAX_BLOCK_DIST";
|
||||||
break;
|
break;
|
||||||
case SPF_InsertIncludesPass:
|
case SPF_InsertIncludesPass:
|
||||||
name = "INSERT_INCLUDES"+" -includeAll";
|
name = "INSERT_INCLUDES -includeAll";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return p + " " + name;
|
return p + " " + name;
|
||||||
|
|||||||
@@ -51,8 +51,6 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
|
|||||||
new Date().toString()
|
new Date().toString()
|
||||||
);
|
);
|
||||||
user.connection.sftpChannel.rename(STARTED.full_name, StartLog.full_name);
|
user.connection.sftpChannel.rename(STARTED.full_name, StartLog.full_name);
|
||||||
|
|
||||||
user.connection.writeToFile("+", StartLog);
|
|
||||||
//--
|
//--
|
||||||
RemoteFile[] files = new RemoteFile[]{
|
RemoteFile[] files = new RemoteFile[]{
|
||||||
new RemoteFile(serverHome, Constants.script),
|
new RemoteFile(serverHome, Constants.script),
|
||||||
@@ -65,13 +63,11 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
protected void ShutdownServer() throws Exception {
|
protected void ShutdownServer() throws Exception {
|
||||||
//--
|
|
||||||
// UI.Info("+");
|
|
||||||
RemoteFile INTERRUPT = new RemoteFile(serverHome, Constants.INTERRUPT);
|
RemoteFile INTERRUPT = new RemoteFile(serverHome, Constants.INTERRUPT);
|
||||||
RemoteFile ABORTED = new RemoteFile(serverHome, Constants.ABORTED);
|
RemoteFile ABORTED = new RemoteFile(serverHome, Constants.ABORTED);
|
||||||
//--
|
//--
|
||||||
ShowMessage1("Создание файла INTERRUPT..");
|
ShowMessage1("Создание файла INTERRUPT..");
|
||||||
user.connection.writeToFile("+", INTERRUPT);
|
user.connection.writeToFile("", INTERRUPT);
|
||||||
ShowMessage1("Ожидание остановки сервера тестирования");
|
ShowMessage1("Ожидание остановки сервера тестирования");
|
||||||
do {
|
do {
|
||||||
Utils.sleep(1000);
|
Utils.sleep(1000);
|
||||||
|
|||||||
Reference in New Issue
Block a user