diff options
| author | Filip Navara <filip.navara@gmail.com> | 2019-02-27 07:48:33 +0100 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-26 22:48:33 -0800 |
| commit | a94826d9aac0eae32c5cc59ad0e013d8dc3e0817 (patch) | |
| tree | a89bf778e75bfc47414b251435433f9af147c74e /src/vm/ecalllist.h | |
| parent | 95eb6a45d50a3b104b5c8c22ff053d076f034271 (diff) | |
| download | coreclr-a94826d9aac0eae32c5cc59ad0e013d8dc3e0817.tar.gz coreclr-a94826d9aac0eae32c5cc59ad0e013d8dc3e0817.tar.bz2 coreclr-a94826d9aac0eae32c5cc59ad0e013d8dc3e0817.zip | |
Move Thread to shared CoreLib (#22744)
* Move Thread to shared CoreLib
* Remove all local variables from Thread in shared code
* Remove duplicate checks
* Port back CoreRT changes needed for shared code
* Fix missing culture initialization in ThreadStart()
* Adjust for shared WaitHandle
Diffstat (limited to 'src/vm/ecalllist.h')
| -rw-r--r-- | src/vm/ecalllist.h | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 30492d1512..43049a3e44 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -620,7 +620,22 @@ FCFuncStart(gMathFFuncs) FCIntrinsic("Tanh", COMSingle::Tanh, CORINFO_INTRINSIC_Tanh) FCFuncEnd() -FCFuncStart(gRuntimeThreadFuncs) +FCFuncStart(gThreadFuncs) + FCDynamic("InternalGetCurrentThread", CORINFO_INTRINSIC_Illegal, ECall::InternalGetCurrentThread) + FCFuncElement("StartInternal", ThreadNative::Start) +#undef Sleep + FCFuncElement("SleepInternal", ThreadNative::Sleep) +#define Sleep(a) Dont_Use_Sleep(a) + FCFuncElement("SetStart", ThreadNative::SetStart) + QCFuncElement("InformThreadNameChange", ThreadNative::InformThreadNameChange) + FCFuncElement("SpinWaitInternal", ThreadNative::SpinWait) + QCFuncElement("YieldInternal", ThreadNative::YieldThread) + FCIntrinsic("GetCurrentThreadNative", ThreadNative::GetCurrentThread, CORINFO_INTRINSIC_GetCurrentManagedThread) + FCIntrinsic("get_ManagedThreadId", ThreadNative::GetManagedThreadId, CORINFO_INTRINSIC_GetManagedThreadId) + FCFuncElement("InternalFinalize", ThreadNative::Finalize) +#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT + FCFuncElement("StartupSetApartmentStateInternal", ThreadNative::StartupSetApartmentState) +#endif // FEATURE_COMINTEROP_APARTMENT_SUPPORT FCFuncElement("get_IsAlive", ThreadNative::IsAlive) FCFuncElement("IsBackgroundNative", ThreadNative::IsBackground) FCFuncElement("SetBackgroundNative", ThreadNative::SetBackground) @@ -636,30 +651,12 @@ FCFuncStart(gRuntimeThreadFuncs) #ifdef FEATURE_COMINTEROP FCFuncElement("DisableComObjectEagerCleanup", ThreadNative::DisableComObjectEagerCleanup) #endif // FEATURE_COMINTEROP - FCFuncElement("InterruptInternal", ThreadNative::Interrupt) - FCFuncElement("JoinInternal", ThreadNative::Join) + FCFuncElement("Interrupt", ThreadNative::Interrupt) + FCFuncElement("Join", ThreadNative::Join) QCFuncElement("GetOptimalMaxSpinWaitsPerSpinIterationInternal", ThreadNative::GetOptimalMaxSpinWaitsPerSpinIteration) FCFuncElement("GetCurrentProcessorNumber", ThreadNative::GetCurrentProcessorNumber) FCFuncEnd() -FCFuncStart(gThreadFuncs) - FCDynamic("InternalGetCurrentThread", CORINFO_INTRINSIC_Illegal, ECall::InternalGetCurrentThread) - FCFuncElement("StartInternal", ThreadNative::Start) -#undef Sleep - FCFuncElement("SleepInternal", ThreadNative::Sleep) -#define Sleep(a) Dont_Use_Sleep(a) - FCFuncElement("SetStart", ThreadNative::SetStart) - QCFuncElement("InformThreadNameChange", ThreadNative::InformThreadNameChange) - FCFuncElement("SpinWaitInternal", ThreadNative::SpinWait) - QCFuncElement("YieldInternal", ThreadNative::YieldThread) - FCIntrinsic("GetCurrentThreadNative", ThreadNative::GetCurrentThread, CORINFO_INTRINSIC_GetCurrentManagedThread) - FCIntrinsic("get_ManagedThreadId", ThreadNative::GetManagedThreadId, CORINFO_INTRINSIC_GetManagedThreadId) - FCFuncElement("InternalFinalize", ThreadNative::Finalize) -#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT - FCFuncElement("StartupSetApartmentStateInternal", ThreadNative::StartupSetApartmentState) -#endif // FEATURE_COMINTEROP_APARTMENT_SUPPORT -FCFuncEnd() - FCFuncStart(gThreadPoolFuncs) FCFuncElement("PostQueuedCompletionStatus", ThreadPoolNative::CorPostQueuedCompletionStatus) FCFuncElement("GetAvailableThreadsNative", ThreadPoolNative::CorGetAvailableThreads) @@ -1269,7 +1266,6 @@ FCClassElement("RuntimeHelpers", "System.Runtime.CompilerServices", gRuntimeHelp FCClassElement("RuntimeImports", "System.Runtime", gRuntimeImportsFuncs) FCClassElement("RuntimeMethodHandle", "System", gRuntimeMethodHandle) FCClassElement("RuntimeModule", "System.Reflection", gCOMModuleFuncs) -FCClassElement("RuntimeThread", "Internal.Runtime.Augments", gRuntimeThreadFuncs) FCClassElement("RuntimeType", "System", gSystem_RuntimeType) FCClassElement("RuntimeTypeHandle", "System", gCOMTypeHandleFuncs) FCClassElement("SafeTypeNameParserHandle", "System", gSafeTypeNameParserHandle) |