Changeset 16582 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame

Timestamp:

01/29/19 17:45:06 (5 years ago)

Author:

ddorfmei

Message:

#2931: solved the issues found during the review

File:

• branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -35 +36 @@
   [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 resolved
-    }
-
     public override void OnUnload() {
-      base.OnUnload();
-
+      // HACK: free handle to native DLL used temporarily by the Hive Slave
+      // should be solved for all native DLLs used by the Hive Slave
       var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
-      if (dllDir == null)
+      if (dllDir == null || !dllDir.FullName.Contains(Path.DirectorySeparatorChar + "PluginTemp" + Path.DirectorySeparatorChar))
         return;
 
@@ -56 +51 @@
 
       foreach (var nativeDll in dllDir.EnumerateFiles().Where(f => nativeDlls.Contains(f.Name))) {
+        if (Process.GetCurrentProcess().Modules.Cast<ProcessModule>().All(m => m.ModuleName != nativeDll.Name))
+          continue;
+
         var handle = LoadLibrary(nativeDll.FullName);
         if (handle == IntPtr.Zero)