Fix DllImport declarations

gpetrou · gpetrou · commit 3fa42f8c6681 · 2021-01-08T06:49:20.000Z
diff --git a/src/embed_tests/TestInterrupt.cs b/src/embed_tests/TestInterrupt.cs
@@ -31,12 +31,12 @@ public void Dispose()
         public void InterruptTest()
         {
             int runSimpleStringReturnValue = int.MinValue;
-            ulong nativeThreadId = 0;
+            uint nativeThreadID = uint.MinValue;
             Task.Factory.StartNew(() =>
             {
                 using (Py.GIL())
                 {
-                    nativeThreadId = PythonEngine.GetNativeThreadID();
+                    nativeThreadID = PythonEngine.GetNativeThreadID();
                     runSimpleStringReturnValue = PythonEngine.RunSimpleString(@"
 import time
 
@@ -49,11 +49,11 @@ import time
 
             using (Py.GIL())
             {
-                int interruptReturnValue = PythonEngine.Interrupt(nativeThreadId);
+                int interruptReturnValue = PythonEngine.Interrupt(nativeThreadID);
                 Assert.AreEqual(1, interruptReturnValue);
             }
 
-            Thread.Sleep(500);
+            Thread.Sleep(300);
 
             Assert.AreEqual(-1, runSimpleStringReturnValue);
         }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -16,10 +16,10 @@ public class PythonEngine : IDisposable
         private static extern uint GetCurrentThreadId();
 
         [DllImport("libc", EntryPoint = "pthread_self")]
-        private static extern IntPtr pthread_selfLinux();
+        private static extern UIntPtr pthread_selfLinux();
 
         [DllImport("pthread", EntryPoint = "pthread_self", CallingConvention = CallingConvention.Cdecl)]
-        private static extern ulong pthread_selfOSX();
+        private static extern uint pthread_selfOSX();
 
         public static ShutdownMode ShutdownMode
         {
@@ -580,7 +580,7 @@ public static void Exec(string code, IntPtr? globals = null, IntPtr? locals = nu
         /// Gets the native thread ID.
         /// </summary>
         /// <returns>The native thread ID.</returns>
-        public static ulong GetNativeThreadID()
+        public static uint GetNativeThreadID()
         {
             if (Runtime.PyVersion >= new Version(3, 8))
             {
@@ -595,7 +595,7 @@ public static ulong GetNativeThreadID()
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                return (ulong)pthread_selfLinux();
+                return pthread_selfLinux().ToUInt32();
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -611,7 +611,7 @@ public static ulong GetNativeThreadID()
         /// </summary>
         /// <param name="nativeThreadID">The native thread ID.</param>
         /// <returns>The number of thread states modified; this is normally one, but will be zero if the thread id isn’t found.</returns>
-        public static int Interrupt(ulong nativeThreadID)
+        public static int Interrupt(uint nativeThreadID)
         {
             if (Runtime.PyVersion >= new Version(3, 7))
             {
@@ -620,15 +620,15 @@ public static int Interrupt(ulong nativeThreadID)
                     return Runtime.PyThreadState_SetAsyncExc37Windows(nativeThreadID, Exceptions.KeyboardInterrupt);
                 }
 
-                return Runtime.PyThreadState_SetAsyncExc37NonWindows((UIntPtr)nativeThreadID, Exceptions.KeyboardInterrupt);
+                return Runtime.PyThreadState_SetAsyncExc37NonWindows(new UIntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                return Runtime.PyThreadState_SetAsyncExc36Windows((long)nativeThreadID, Exceptions.KeyboardInterrupt);
+                return Runtime.PyThreadState_SetAsyncExc36Windows((int)nativeThreadID, Exceptions.KeyboardInterrupt);
             }
 
-            return Runtime.PyThreadState_SetAsyncExc36NonWindows((IntPtr)nativeThreadID, Exceptions.KeyboardInterrupt);
+            return Runtime.PyThreadState_SetAsyncExc36NonWindows(new IntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);
         }
 
         /// <summary>
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -2147,10 +2147,10 @@ internal static void Py_CLEAR(ref IntPtr ob)
         internal static extern int Py_AddPendingCall(IntPtr func, IntPtr arg);
 
         [DllImport(_PythonDll, EntryPoint = "PyThreadState_SetAsyncExc", CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyThreadState_SetAsyncExc37Windows(ulong id, IntPtr exc);
+        internal static extern int PyThreadState_SetAsyncExc37Windows(uint id, IntPtr exc);
 
         [DllImport(_PythonDll, EntryPoint = "PyThreadState_SetAsyncExc", CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyThreadState_SetAsyncExc36Windows(long id, IntPtr exc);
+        internal static extern int PyThreadState_SetAsyncExc36Windows(int id, IntPtr exc);
 
         [DllImport(_PythonDll, EntryPoint = "PyThreadState_SetAsyncExc", CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyThreadState_SetAsyncExc37NonWindows(UIntPtr id, IntPtr exc);

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ public void Dispose()`
`31`	`31`	`public void InterruptTest()`
`32`	`32`	`{`
`33`	`33`	`int runSimpleStringReturnValue = int.MinValue;`
`34`		`- ulong nativeThreadId = 0;`
	`34`	`+ uint nativeThreadID = uint.MinValue;`
`35`	`35`	`Task.Factory.StartNew(() =>`
`36`	`36`	`{`
`37`	`37`	`using (Py.GIL())`
`38`	`38`	`{`
`39`		`- nativeThreadId = PythonEngine.GetNativeThreadID();`
	`39`	`+ nativeThreadID = PythonEngine.GetNativeThreadID();`
`40`	`40`	`runSimpleStringReturnValue = PythonEngine.RunSimpleString(@"`
`41`	`41`	`import time`
`42`	`42`
`@@ -49,11 +49,11 @@ import time`
`49`	`49`
`50`	`50`	`using (Py.GIL())`
`51`	`51`	`{`
`52`		`- int interruptReturnValue = PythonEngine.Interrupt(nativeThreadId);`
	`52`	`+ int interruptReturnValue = PythonEngine.Interrupt(nativeThreadID);`
`53`	`53`	`Assert.AreEqual(1, interruptReturnValue);`
`54`	`54`	`}`
`55`	`55`
`56`		`- Thread.Sleep(500);`
	`56`	`+ Thread.Sleep(300);`
`57`	`57`
`58`	`58`	`Assert.AreEqual(-1, runSimpleStringReturnValue);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ public class PythonEngine : IDisposable`
`16`	`16`	`private static extern uint GetCurrentThreadId();`
`17`	`17`
`18`	`18`	`[DllImport("libc", EntryPoint = "pthread_self")]`
`19`		`- private static extern IntPtr pthread_selfLinux();`
	`19`	`+ private static extern UIntPtr pthread_selfLinux();`
`20`	`20`
`21`	`21`	`[DllImport("pthread", EntryPoint = "pthread_self", CallingConvention = CallingConvention.Cdecl)]`
`22`		`- private static extern ulong pthread_selfOSX();`
	`22`	`+ private static extern uint pthread_selfOSX();`
`23`	`23`
`24`	`24`	`public static ShutdownMode ShutdownMode`
`25`	`25`	`{`
`@@ -580,7 +580,7 @@ public static void Exec(string code, IntPtr? globals = null, IntPtr? locals = nu`
`580`	`580`	`/// Gets the native thread ID.`
`581`	`581`	`/// </summary>`
`582`	`582`	`/// <returns>The native thread ID.</returns>`
`583`		`- public static ulong GetNativeThreadID()`
	`583`	`+ public static uint GetNativeThreadID()`
`584`	`584`	`{`
`585`	`585`	`if (Runtime.PyVersion >= new Version(3, 8))`
`586`	`586`	`{`
`@@ -595,7 +595,7 @@ public static ulong GetNativeThreadID()`
`595`	`595`
`596`	`596`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`597`	`597`	`{`
`598`		`- return (ulong)pthread_selfLinux();`
	`598`	`+ return pthread_selfLinux().ToUInt32();`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`@@ -611,7 +611,7 @@ public static ulong GetNativeThreadID()`
`611`	`611`	`/// </summary>`
`612`	`612`	`/// <param name="nativeThreadID">The native thread ID.</param>`
`613`	`613`	`/// <returns>The number of thread states modified; this is normally one, but will be zero if the thread id isn’t found.</returns>`
`614`		`- public static int Interrupt(ulong nativeThreadID)`
	`614`	`+ public static int Interrupt(uint nativeThreadID)`
`615`	`615`	`{`
`616`	`616`	`if (Runtime.PyVersion >= new Version(3, 7))`
`617`	`617`	`{`
`@@ -620,15 +620,15 @@ public static int Interrupt(ulong nativeThreadID)`
`620`	`620`	`return Runtime.PyThreadState_SetAsyncExc37Windows(nativeThreadID, Exceptions.KeyboardInterrupt);`
`621`	`621`	`}`
`622`	`622`
`623`		`- return Runtime.PyThreadState_SetAsyncExc37NonWindows((UIntPtr)nativeThreadID, Exceptions.KeyboardInterrupt);`
	`623`	`+ return Runtime.PyThreadState_SetAsyncExc37NonWindows(new UIntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);`
`624`	`624`	`}`
`625`	`625`
`626`	`626`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`627`	`627`	`{`
`628`		`- return Runtime.PyThreadState_SetAsyncExc36Windows((long)nativeThreadID, Exceptions.KeyboardInterrupt);`
	`628`	`+ return Runtime.PyThreadState_SetAsyncExc36Windows((int)nativeThreadID, Exceptions.KeyboardInterrupt);`
`629`	`629`	`}`
`630`	`630`
`631`		`- return Runtime.PyThreadState_SetAsyncExc36NonWindows((IntPtr)nativeThreadID, Exceptions.KeyboardInterrupt);`
	`631`	`+ return Runtime.PyThreadState_SetAsyncExc36NonWindows(new IntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`/// <summary>`