Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc3f7c78

Browse files
committed
Add GetNativeThreadID method in PythonEngine and different PyThreadState_SetAsyncExc calls for OS and Python version
1 parentd075db3 commitc3f7c78

File tree

4 files changed

+71
-30
lines changed

4 files changed

+71
-30
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1010
###Added
1111

1212
- Ability to instantiate new .NET arrays using`Array[T](dim1, dim2, ...)` syntax
13-
- Add Interruptmethod in PythonEngine
13+
- AddGetNativeThreadID andInterruptmethods in PythonEngine
1414

1515
###Changed
1616
- Drop support for Python 2, 3.4, and 3.5

‎src/embed_tests/TestInterrupt.cs

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
usingSystem;
3-
usingSystem.Runtime.InteropServices;
43
usingSystem.Threading;
54
usingSystem.Threading.Tasks;
65

@@ -14,15 +13,6 @@ public class TestInterrupt
1413
{
1514
privateIntPtr_threadState;
1615

17-
[DllImport("Kernel32",EntryPoint="GetCurrentThreadId",ExactSpelling=true)]
18-
privatestaticexternuintGetCurrentThreadId();
19-
20-
[DllImport("libc",EntryPoint="pthread_self")]
21-
privatestaticexternIntPtrpthread_selfLinux();
22-
23-
[DllImport("pthread",EntryPoint="pthread_self",CallingConvention=CallingConvention.Cdecl)]
24-
privatestaticexternulongpthread_selfOSX();
25-
2616
[OneTimeSetUp]
2717
publicvoidSetUp()
2818
{
@@ -44,21 +34,9 @@ public void InterruptTest()
4434
ulongnativeThreadId=0;
4535
Task.Factory.StartNew(()=>
4636
{
47-
if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
48-
{
49-
nativeThreadId=GetCurrentThreadId();
50-
}
51-
elseif(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
52-
{
53-
nativeThreadId=(ulong)pthread_selfLinux();
54-
}
55-
elseif(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
56-
{
57-
nativeThreadId=pthread_selfOSX();
58-
}
59-
6037
using(Py.GIL())
6138
{
39+
nativeThreadId=PythonEngine.GetNativeThreadID();
6240
runSimpleStringReturnValue=PythonEngine.RunSimpleString(@"
6341
import time
6442
@@ -75,7 +53,7 @@ import time
7553
Assert.AreEqual(1,interruptReturnValue);
7654
}
7755

78-
Thread.Sleep(300);
56+
Thread.Sleep(500);
7957

8058
Assert.AreEqual(-1,runSimpleStringReturnValue);
8159
}

‎src/runtime/pythonengine.cs

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ namespace Python.Runtime
1212
/// </summary>
1313
publicclassPythonEngine:IDisposable
1414
{
15+
[DllImport("Kernel32",EntryPoint="GetCurrentThreadId",ExactSpelling=true)]
16+
privatestaticexternuintGetCurrentThreadId();
17+
18+
[DllImport("libc",EntryPoint="pthread_self")]
19+
privatestaticexternIntPtrpthread_selfLinux();
20+
21+
[DllImport("pthread",EntryPoint="pthread_self",CallingConvention=CallingConvention.Cdecl)]
22+
privatestaticexternulongpthread_selfOSX();
23+
1524
publicstaticShutdownModeShutdownMode
1625
{
1726
get=>Runtime.ShutdownMode;
@@ -567,14 +576,59 @@ public static void Exec(string code, IntPtr? globals = null, IntPtr? locals = nu
567576
}
568577
}
569578

579+
/// <summary>
580+
/// Gets the native thread ID.
581+
/// </summary>
582+
/// <returns>The native thread ID.</returns>
583+
publicstaticulongGetNativeThreadID()
584+
{
585+
if(Runtime.PyVersion>=newVersion(3,8))
586+
{
587+
dynamicthreading=Py.Import("threading");
588+
returnthreading.get_native_id();
589+
}
590+
591+
if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
592+
{
593+
returnGetCurrentThreadId();
594+
}
595+
596+
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
597+
{
598+
return(ulong)pthread_selfLinux();
599+
}
600+
601+
if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
602+
{
603+
returnpthread_selfOSX();
604+
}
605+
606+
return0;
607+
}
608+
570609
/// <summary>
571610
/// Interrupts the execution of a thread.
572611
/// </summary>
573-
/// <param name="nativeThreadId">The native threadid.</param>
612+
/// <param name="nativeThreadID">The native threadID.</param>
574613
/// <returns>The number of thread states modified; this is normally one, but will be zero if the thread id isn’t found.</returns>
575-
publicstaticintInterrupt(ulongnativeThreadId)
614+
publicstaticintInterrupt(ulongnativeThreadID)
576615
{
577-
returnRuntime.PyThreadState_SetAsyncExc(nativeThreadId,Exceptions.KeyboardInterrupt);
616+
if(Runtime.PyVersion>=newVersion(3,7))
617+
{
618+
if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
619+
{
620+
returnRuntime.PyThreadState_SetAsyncExc37Windows(nativeThreadID,Exceptions.KeyboardInterrupt);
621+
}
622+
623+
returnRuntime.PyThreadState_SetAsyncExc37NonWindows((UIntPtr)nativeThreadID,Exceptions.KeyboardInterrupt);
624+
}
625+
626+
if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
627+
{
628+
returnRuntime.PyThreadState_SetAsyncExc36Windows((long)nativeThreadID,Exceptions.KeyboardInterrupt);
629+
}
630+
631+
returnRuntime.PyThreadState_SetAsyncExc36NonWindows((IntPtr)nativeThreadID,Exceptions.KeyboardInterrupt);
578632
}
579633

580634
/// <summary>

‎src/runtime/runtime.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,8 +2143,17 @@ internal static void Py_CLEAR(ref IntPtr ob)
21432143
[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]
21442144
internalstaticexternint Py_AddPendingCall(IntPtr func, IntPtr arg);
21452145

2146-
[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]
2147-
internalstaticexternint PyThreadState_SetAsyncExc(ulong id, IntPtr exc);
2146+
[DllImport(_PythonDll, EntryPoint= "PyThreadState_SetAsyncExc", CallingConvention= CallingConvention.Cdecl)]
2147+
internalstaticexternint PyThreadState_SetAsyncExc37Windows(ulong id, IntPtr exc);
2148+
2149+
[DllImport(_PythonDll, EntryPoint= "PyThreadState_SetAsyncExc", CallingConvention= CallingConvention.Cdecl)]
2150+
internalstaticexternint PyThreadState_SetAsyncExc36Windows(long id, IntPtr exc);
2151+
2152+
[DllImport(_PythonDll, EntryPoint= "PyThreadState_SetAsyncExc", CallingConvention= CallingConvention.Cdecl)]
2153+
internalstaticexternint PyThreadState_SetAsyncExc37NonWindows(UIntPtr id, IntPtr exc);
2154+
2155+
[DllImport(_PythonDll, EntryPoint= "PyThreadState_SetAsyncExc", CallingConvention= CallingConvention.Cdecl)]
2156+
internalstaticexternint PyThreadState_SetAsyncExc36NonWindows(IntPtr id, IntPtr exc);
21482157

21492158
[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]
21502159
internalstaticexternint Py_MakePendingCalls();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp