Fix in dotnet code path: find mmap in libc rather than __Internal

Benoit Hudson · Benoit Hudson · commit 4096a95f9456 · 2018-10-03T12:49:56.000-04:00
When run with mono or in visual studio, DllImport("__Internal", ...) works; but
when run via dotnet, it fails to load the library somehow. mmap is in libc, so
get it that way now.

Exceptions thrown in NUnit setup/teardown get silently swallowed, so I also
added try/catch to dynamic.cs to help debug future initialization exceptions.
diff --git a/src/embed_tests/dynamic.cs b/src/embed_tests/dynamic.cs
@@ -12,13 +12,23 @@ public class DynamicTest
         [SetUp]
         public void SetUp()
         {
-            _gs = Py.GIL();
+            try {
+                _gs = Py.GIL();
+            } catch (Exception e) {
+                Console.WriteLine($"exception in SetUp: {e}");
+                throw;
+            }
         }
 
         [TearDown]
         public void Dispose()
         {
-            _gs.Dispose();
+            try {
+                _gs.Dispose();
+            } catch(Exception e) {
+                Console.WriteLine($"exception in TearDown: {e}");
+                throw;
+            }
         }
 
         /// <summary>
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -609,10 +609,10 @@ int MAP_ANONYMOUS
                 }
             }
 
-            [DllImport("__Internal")]
+            [DllImport("libc")]
             static extern IntPtr mmap(IntPtr addr, IntPtr len, int prot, int flags, int fd, IntPtr offset);
 
-            [DllImport("__Internal")]
+            [DllImport("libc")]
             static extern int mprotect(IntPtr addr, IntPtr len, int prot);
 
             public IntPtr MapWriteable(int numBytes)

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,23 @@ public class DynamicTest`
`12`	`12`	`[SetUp]`
`13`	`13`	`public void SetUp()`
`14`	`14`	`{`
`15`		`- _gs = Py.GIL();`
	`15`	`+ try {`
	`16`	`+ _gs = Py.GIL();`
	`17`	`+ } catch (Exception e) {`
	`18`	`+ Console.WriteLine($"exception in SetUp: {e}");`
	`19`	`+ throw;`
	`20`	`+ }`
`16`	`21`	`}`
`17`	`22`
`18`	`23`	`[TearDown]`
`19`	`24`	`public void Dispose()`
`20`	`25`	`{`
`21`		`- _gs.Dispose();`
	`26`	`+ try {`
	`27`	`+ _gs.Dispose();`
	`28`	`+ } catch(Exception e) {`
	`29`	`+ Console.WriteLine($"exception in TearDown: {e}");`
	`30`	`+ throw;`
	`31`	`+ }`
`22`	`32`	`}`
`23`	`33`
`24`	`34`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -609,10 +609,10 @@ int MAP_ANONYMOUS`
`609`	`609`	`}`
`610`	`610`	`}`
`611`	`611`
`612`		`- [DllImport("__Internal")]`
	`612`	`+ [DllImport("libc")]`
`613`	`613`	`static extern IntPtr mmap(IntPtr addr, IntPtr len, int prot, int flags, int fd, IntPtr offset);`
`614`	`614`
`615`		`- [DllImport("__Internal")]`
	`615`	`+ [DllImport("libc")]`
`616`	`616`	`static extern int mprotect(IntPtr addr, IntPtr len, int prot);`
`617`	`617`
`618`	`618`	`public IntPtr MapWriteable(int numBytes)`