Try using ulong and long

gpetrou · gpetrou · commit 90a08b6cf36e · 2020-12-31T09:07:53.000Z
diff --git a/src/embed_tests/TestInterrupt.cs b/src/embed_tests/TestInterrupt.cs
@@ -31,7 +31,7 @@ public void Dispose()
         public void InterruptTest()
         {
             int runSimpleStringReturnValue = int.MinValue;
-            uint nativeThreadID = uint.MinValue;
+            ulong nativeThreadID = uint.MinValue;
             Task.Factory.StartNew(() =>
             {
                 using (Py.GIL())
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 UIntPtr pthread_selfLinux();
+        private static extern ulong pthread_selfLinux();
 
         [DllImport("pthread", EntryPoint = "pthread_self", CallingConvention = CallingConvention.Cdecl)]
-        private static extern uint pthread_selfOSX();
+        private static extern ulong 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 uint GetNativeThreadID()
+        public static ulong GetNativeThreadID()
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -589,7 +589,7 @@ public static uint GetNativeThreadID()
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                return pthread_selfLinux().ToUInt32();
+                return pthread_selfLinux();
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -605,24 +605,24 @@ public static uint 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(uint nativeThreadID)
+        public static int Interrupt(ulong nativeThreadID)
         {
             if (Runtime.PyVersion >= new Version(3, 7))
             {
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    return Runtime.PyThreadState_SetAsyncExc37Windows(nativeThreadID, Exceptions.KeyboardInterrupt);
+                    return Runtime.PyThreadState_SetAsyncExc37Windows((uint)nativeThreadID, Exceptions.KeyboardInterrupt);
                 }
 
-                return Runtime.PyThreadState_SetAsyncExc37NonWindows(new UIntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);
+                return Runtime.PyThreadState_SetAsyncExc37NonWindows(nativeThreadID, Exceptions.KeyboardInterrupt);
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 return Runtime.PyThreadState_SetAsyncExc36Windows((int)nativeThreadID, Exceptions.KeyboardInterrupt);
             }
 
-            return Runtime.PyThreadState_SetAsyncExc36NonWindows(new IntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);
+            return Runtime.PyThreadState_SetAsyncExc36NonWindows((long)nativeThreadID, Exceptions.KeyboardInterrupt);
         }
 
         /// <summary>
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -2150,10 +2150,10 @@ internal static void Py_CLEAR(ref IntPtr ob)
         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);
+        internal static extern int PyThreadState_SetAsyncExc37NonWindows(ulong id, IntPtr exc);
 
         [DllImport(_PythonDll, EntryPoint = "PyThreadState_SetAsyncExc", CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int PyThreadState_SetAsyncExc36NonWindows(IntPtr id, IntPtr exc);
+        internal static extern int PyThreadState_SetAsyncExc36NonWindows(long id, IntPtr exc);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int Py_MakePendingCalls();

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void Dispose()`
`31`	`31`	`public void InterruptTest()`
`32`	`32`	`{`
`33`	`33`	`int runSimpleStringReturnValue = int.MinValue;`
`34`		`- uint nativeThreadID = uint.MinValue;`
	`34`	`+ ulong nativeThreadID = uint.MinValue;`
`35`	`35`	`Task.Factory.StartNew(() =>`
`36`	`36`	`{`
`37`	`37`	`using (Py.GIL())`
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 UIntPtr pthread_selfLinux();`
	`19`	`+ private static extern ulong pthread_selfLinux();`
`20`	`20`
`21`	`21`	`[DllImport("pthread", EntryPoint = "pthread_self", CallingConvention = CallingConvention.Cdecl)]`
`22`		`- private static extern uint pthread_selfOSX();`
	`22`	`+ private static extern ulong 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 uint GetNativeThreadID()`
	`583`	`+ public static ulong GetNativeThreadID()`
`584`	`584`	`{`
`585`	`585`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`586`	`586`	`{`
`@@ -589,7 +589,7 @@ public static uint GetNativeThreadID()`
`589`	`589`
`590`	`590`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`591`	`591`	`{`
`592`		`- return pthread_selfLinux().ToUInt32();`
	`592`	`+ return pthread_selfLinux();`
`593`	`593`	`}`
`594`	`594`
`595`	`595`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`@@ -605,24 +605,24 @@ public static uint GetNativeThreadID()`
`605`	`605`	`/// </summary>`
`606`	`606`	`/// <param name="nativeThreadID">The native thread ID.</param>`
`607`	`607`	`/// <returns>The number of thread states modified; this is normally one, but will be zero if the thread id isn’t found.</returns>`
`608`		`- public static int Interrupt(uint nativeThreadID)`
	`608`	`+ public static int Interrupt(ulong nativeThreadID)`
`609`	`609`	`{`
`610`	`610`	`if (Runtime.PyVersion >= new Version(3, 7))`
`611`	`611`	`{`
`612`	`612`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`613`	`613`	`{`
`614`		`- return Runtime.PyThreadState_SetAsyncExc37Windows(nativeThreadID, Exceptions.KeyboardInterrupt);`
	`614`	`+ return Runtime.PyThreadState_SetAsyncExc37Windows((uint)nativeThreadID, Exceptions.KeyboardInterrupt);`
`615`	`615`	`}`
`616`	`616`
`617`		`- return Runtime.PyThreadState_SetAsyncExc37NonWindows(new UIntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);`
	`617`	`+ return Runtime.PyThreadState_SetAsyncExc37NonWindows(nativeThreadID, Exceptions.KeyboardInterrupt);`
`618`	`618`	`}`
`619`	`619`
`620`	`620`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`621`	`621`	`{`
`622`	`622`	`return Runtime.PyThreadState_SetAsyncExc36Windows((int)nativeThreadID, Exceptions.KeyboardInterrupt);`
`623`	`623`	`}`
`624`	`624`
`625`		`- return Runtime.PyThreadState_SetAsyncExc36NonWindows(new IntPtr(nativeThreadID), Exceptions.KeyboardInterrupt);`
	`625`	`+ return Runtime.PyThreadState_SetAsyncExc36NonWindows((long)nativeThreadID, Exceptions.KeyboardInterrupt);`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`/// <summary>`