Changeset 16288 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs

Timestamp:

11/08/18 17:10:53 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• added license information to all files
• added missing storable and cloning constructors
• fixed a bug that caused an exception when a Hive Slave tried to delete the files in the PluginTemp folder

Location:

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre

Files:

• Plugin.cs.frame (modified) (2 diffs)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Plugin.cs.frame

@@ -21 +21 @@
 
 using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.OrTools {
+
   [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.9.0.$WCREV$")]
   [PluginFile("HeuristicLab.OrTools-6.9.0-pre.dll", PluginFileType.Assembly)]
@@ -30 +34 @@
   [PluginFile("Google.OrTools.runtime.win-x64.dll", PluginFileType.NativeDll)]
   [PluginFile("Google.OrTools_version.txt", PluginFileType.Data)]
+  [PluginFile("Google.Protobuf.dll", PluginFileType.Assembly)]
   [PluginFile("glpk_4_65.dll", PluginFileType.NativeDll)]
   [PluginFile("glpk-license.txt", PluginFileType.License)]
   public class HeuristicLabOrToolsPlugin : PluginBase {
+
+    ~HeuristicLabOrToolsPlugin() {
+      OnUnload(); // HACK: remove once ticket #2961 is solved
+    }
+
+    public override void OnUnload() {
+      base.OnUnload();
+
+      var thisClass = typeof(HeuristicLabOrToolsPlugin);
+      var dir = new FileInfo(thisClass.Assembly.Location).Directory;
+      if (dir == null)
+        return;
+
+      var nativeDlls = thisClass.GetCustomAttributes(typeof(PluginFileAttribute), true)
+        .Cast<PluginFileAttribute>()
+        .Where(pf => pf.FileType == PluginFileType.NativeDll)
+        .Select(pf => pf.FileName);
+
+      foreach (var nativeDll in dir.EnumerateFiles().Where(f => nativeDlls.Contains(f.Name))) {
+        var handle = LoadLibrary(nativeDll.FullName);
+        if (handle == IntPtr.Zero)
+          continue;
+
+        FreeLibrary(handle); // close handle obtained above
+        FreeLibrary(handle); // close implicitly obtained handle
+      }
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool FreeLibrary(IntPtr hModule);
+
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Ansi)]
+    private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)]string lpFileName);
   }
 }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.8.0.0")]
-[assembly: AssemblyFileVersion("6.8.0.16172")]
+[assembly: AssemblyFileVersion("6.8.0.16233")]