Changeset 17013 for branches/2924_DotNetCoreMigration/HeuristicLab

Timestamp:

06/17/19 10:40:41 (5 years ago)

Author:

dpiringe

Message:

#2924:

• some changes in CLIApplication.cs to reduce unnecessary allocation of string objects
• renamed AppTest to ConsoleOptimizer and fixed race condition
• replaced enum RunnerJob with class RunnerMessage for more control of saved data
• changed usage of BinaryFormatter with HEAL.Attic, following types are now Storable:
  • ConsoleOptimizer
  • InspectApplication
  • ApplicationBase
  • ApplicationRunner
  • AssemblyInfo
  • Runner
  • UniPath
  • RunnerMessage
• switched QuietMode from ApplicationRunner to IRunner
• DockerRunnerHost can now automatically build docker images for linux and windows containers (also identifies which container type is active) -> removes the condition to have the image preinstalled
  • to achieve this, there are two new folders DockerLinuxBuild and DockerWindowsBuild included in build output, which include Dockerfiles to build images for linux and windows container
• added NuGet package System.CodeDom to project HeuristicLab.Scripting-3.3
• added method Send(RunnerMessage) to IRunnerHost and transferred methods Pause and Resume to IRunner
• added internal reference of RunnerHost in Runner
• added abstract method SendMessage(RunnerMessage) in RunnerHost which gets called from method Send(RunnerMessage)
• because of a Google.Protobuf "bug", RunnerMessages cannot get serialized/deserialized directly on stream -> workaround with a byte array, which gets written and read
  • additionally, the length of the array gets sent first (length as integer -> 4 bytes)
  • static method in RunnerMessage to read a message from a stream
  • the method SendMessage(RunnerMessage) in RunnerHost implements this functionality

Location:

branches/2924_DotNetCoreMigration/HeuristicLab/3.3

Files:

• ApplicationCommand.cs (modified) (1 diff)
• DockerLinuxBuild (added)
• DockerLinuxBuild/Dockerfile (added)
• DockerWindowsBuild (added)
• DockerWindowsBuild/Dockerfile (added)
• Dockerfile (deleted)
• HeuristicLab-3.3.csproj (modified) (2 diffs)
• InspectCommand.cs (modified) (1 diff)
• OptimizeCommand.cs (modified) (2 diffs)

branches/2924_DotNetCoreMigration/HeuristicLab/3.3/ApplicationCommand.cs

@@ -40 +40 @@
     private void StartupRunnerHost() {
       Stream stdin = Console.OpenStandardInput();
-      IRunner runner = Runner.Deserialize(stdin);
+      var message = (TransportRunnerMessage)RunnerMessage.ReadMessageFromStream(stdin);
+      IRunner runner = message.Runner;
 
       if (runner != null)

branches/2924_DotNetCoreMigration/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -22 +22 @@
 
   <ItemGroup>
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.9" />
   </ItemGroup>
@@ -31 +32 @@
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="HEAL.Attic">
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(SolutionDir)\HeuristicLab\3.3\DockerWindowsBuild\**" CopyToOutputDirectory="Always" LinkBase="DockerWindowsBuild\" />
+    <None Include="$(SolutionDir)\HeuristicLab\3.3\DockerLinuxBuild\**" CopyToOutputDirectory="Always" LinkBase="DockerLinuxBuild\" />
+  </ItemGroup>
+
 </Project>

branches/2924_DotNetCoreMigration/HeuristicLab/3.3/InspectCommand.cs

@@ -16 +16 @@
 
       if (Settings.Host != null) {
+        Settings.Host.QuietMode = false;
         Settings.Host.Run(new ApplicationRunner() {
-          QuietMode = false,
           AssembliesToLoad = Settings.assemblyInfos,
           StartApplication =

branches/2924_DotNetCoreMigration/HeuristicLab/3.3/OptimizeCommand.cs

@@ -21 +21 @@
       if (Output != null && !Directory.Exists(Output))
         throw new DirectoryNotFoundException("Output directory does not exist!");
-
       if (Settings.Host != null) {
-        Settings.Host.Run(new ApplicationRunner() {
-          QuietMode = Quiet,
+        Settings.Host.QuietMode = Quiet;
+        IRunner runner = new ApplicationRunner() {
           AssembliesToLoad = Settings.assemblyInfos,
           StartApplication =
@@ -32 +31 @@
             ).Where(x => x.Name.Equals("CLIOptimize"))
              .First()
-        });
+        };
+        Settings.Host.Run(runner);
       }
     }