Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 1 commit into from
Jul 9, 2022
Merged

Use the portable timer implementation in CoreCLR #71864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
<ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

<FeaturePortableThreadPool>true</FeaturePortableThreadPool>
<FeaturePortableTimer>true</FeaturePortableTimer>
</PropertyGroup>

<ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
<Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down
75 changes: 0 additions & 75 deletions src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs
View file
Open in desktop

This file was deleted.

13 changes: 1 addition & 12 deletions src/coreclr/debug/daccess/request.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
ThreadpoolMgr::LIST_ENTRY entry;
DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
TADDR node = (TADDR) entry.Flink;
threadpoolData->NumTimers = 0;
while (node && node != pEntry)
{
threadpoolData->NumTimers++;
DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
node = (TADDR) entry.Flink;
}
threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
SOSDacLeave();
return hr;
}
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/inc/dacvars.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/inc/gfunc_list.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down
10 changes: 0 additions & 10 deletions src/coreclr/inc/utilcode.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
STATIC_CONTRACT_MODE_ANY;

return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down
141 changes: 0 additions & 141 deletions src/coreclr/vm/comthreadpool.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
CONTRACTL
{
GC_TRIGGERS;
THROWS;
MODE_COOPERATIVE;
}
CONTRACTL_END;

#ifdef _DEBUG
MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
LogCall(pMeth,"AppDomainTimerCallback");
#endif

ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
Thread* pThread = GetThreadNULLOk();
if (pThread == NULL)
{
// TODO: how do we notify user of OOM here?
ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
pThread = SetupThreadNoThrow();
if (pThread == NULL) {
return;
}
}

CONTRACTL
{
THROWS;
MODE_ANY;
GC_TRIGGERS;
}
CONTRACTL_END;

GCX_COOP();

ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
QCALL_CONTRACT;

HANDLE hTimer = NULL;
BEGIN_QCALL;

_ASSERTE(dueTime >= 0);
_ASSERTE(timerId >= 0);

AppDomain* pAppDomain = GetThread()->GetDomain();

ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
timerContext->TimerId = timerId;
NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
&hTimer,
(WAITORTIMERCALLBACK)AppDomainTimerCallback,
(PVOID)timerContext,
(ULONG)dueTime,
(ULONG)-1 /* this timer doesn't repeat */,
0 /* no flags */);

if (!res)
{
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
COMPlusThrow(kNotSupportedException);
else
COMPlusThrowWin32();
}
else
{
timerContextHolder.SuppressRelease();
}

END_QCALL;
return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
QCALL_CONTRACT;

BOOL res = FALSE;
BEGIN_QCALL;

_ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

if (!res)
{
DWORD errorCode = ::GetLastError();
if (errorCode != ERROR_IO_PENDING)
COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
}

END_QCALL;
return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
QCALL_CONTRACT;

BOOL res = FALSE;
BEGIN_QCALL;

_ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
_ASSERTE(dueTime >= 0);

res = ThreadpoolMgr::ChangeTimerQueueTimer(
hTimer,
(ULONG)dueTime,
(ULONG)-1 /* this timer doesn't repeat */);

if (!res)
COMPlusThrowWin32();

END_QCALL;
return res;
}
3 changes: 0 additions & 3 deletions src/coreclr/vm/comthreadpool.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/vm/corelib.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/vm/qcallentrypoints.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
DllImportEntry(ThreadPool_RequestWorkerThread)
DllImportEntry(ThreadPool_PerformGateActivities)
DllImportEntry(AppDomainTimer_Create)
DllImportEntry(AppDomainTimer_Change)
DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down
6 changes: 2 additions & 4 deletions src/coreclr/vm/threadpoolrequest.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
_ASSERTE(pWorkRequest != NULL);
PREFIX_ASSUME(pWorkRequest != NULL);

if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
!ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
wrFunction = pWorkRequest->Function;
wrContext = pWorkRequest->Context;

if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
!ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down
10 changes: 3 additions & 7 deletions src/coreclr/vm/threads.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
pThread->SetThreadState(Thread::TS_CompletionPortThread);
pThread->SetBackground(TRUE);
}
else if (IsTimerSpecialThread() || IsWaitSpecialThread())
else if (IsWaitSpecialThread())
{
pThread->SetThreadState(Thread::TS_TPWorkerThread);
pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
{
pThread->SetThreadState(Thread::TS_CompletionPortThread);
}
else if (IsTimerSpecialThread() || IsWaitSpecialThread())
else if (IsWaitSpecialThread())
{
pThread->SetThreadState(Thread::TS_TPWorkerThread);
}
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
LIMITED_METHOD_CONTRACT;

return RequireSyncBlockCleanup()
|| ThreadpoolMgr::HaveTimerInfosToFlush()
|| Thread::CleanupNeededForFinalizedThread()
|| (m_DetachCount > 0)
|| SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
Thread::CleanupDetachedThreads();
}

// If there were any TimerInfos waiting to be released, they'll get flushed now
ThreadpoolMgr::FlushQueueOfTimerInfos();

if (YieldProcessorNormalization::IsMeasurementScheduled())
{
GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
WRAPPER_NO_CONTRACT;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Use the portable timer implementation in CoreCLR#71864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 1 commit into

from

Jul 9, 2022
 Merged


Use the portable timer implementation in CoreCLR
#71864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
 <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>

 <FeaturePortableThreadPool>true</FeaturePortableThreadPool>
 <FeaturePortableTimer>true</FeaturePortableTimer>
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -236,7 +237,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ProcessorIdCache.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
Expand Down

75 changes: 0 additions & 75 deletions
src/coreclr/System.Private.CoreLib/src/System/Threading/Timer.CoreCLR.cs

View file


Open in desktop


This file was deleted.


13 changes: 1 addition & 12 deletions
src/coreclr/debug/daccess/request.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,20 +348,9 @@ ClrDataAccess::GetThreadpoolData(struct DacpThreadpoolData *threadpoolData)
 threadpoolData->MaxLimitTotalCPThreads = ThreadpoolMgr::MaxLimitTotalCPThreads;
 threadpoolData->CurrentLimitTotalCPThreads = (LONG)(counts.NumActive); //legacy: currently has no meaning
 threadpoolData->MinLimitTotalCPThreads = ThreadpoolMgr::MinLimitTotalCPThreads;

 TADDR pEntry = DacGetTargetAddrForHostAddr(&ThreadpoolMgr::TimerQueue,true);
 ThreadpoolMgr::LIST_ENTRY entry;
 DacReadAll(pEntry,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 TADDR node = (TADDR) entry.Flink;
 threadpoolData->NumTimers = 0;
 while (node && node != pEntry)
 {
 threadpoolData->NumTimers++;
 DacReadAll(node,&entry,sizeof(ThreadpoolMgr::LIST_ENTRY),true);
 node = (TADDR) entry.Flink;
 }
 threadpoolData->AsyncTimerCallbackCompletionFPtr = NULL;

 threadpoolData->AsyncTimerCallbackCompletionFPtr = (CLRDATA_ADDRESS) GFN_TADDR(ThreadpoolMgr__AsyncTimerCallbackCompletion);
 SOSDacLeave();
 return hr;
}
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/dacvars.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,6 @@ DEFINE_DACVAR(ThreadpoolMgr::ThreadCounter, ThreadpoolMgr__CPThreadCounter, Thre
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxFreeCPThreads, ThreadpoolMgr::MaxFreeCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MaxLimitTotalCPThreads, ThreadpoolMgr::MaxLimitTotalCPThreads)
DEFINE_DACVAR(LONG, ThreadpoolMgr__MinLimitTotalCPThreads, ThreadpoolMgr::MinLimitTotalCPThreads)
DEFINE_DACVAR(LIST_ENTRY, ThreadpoolMgr__TimerQueue, ThreadpoolMgr::TimerQueue)
DEFINE_DACVAR_NO_DUMP(SIZE_T, dac__HillClimbingLog, ::HillClimbingLog)
DEFINE_DACVAR(int, dac__HillClimbingLogFirstIndex, ::HillClimbingLogFirstIndex)
DEFINE_DACVAR(int, dac__HillClimbingLogSize, ::HillClimbingLogSize)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/inc/gfunc_list.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@
#define DEFINE_DACGFN_STATIC(class, func)
#endif

DEFINE_DACGFN_STATIC(ThreadpoolMgr, AsyncTimerCallbackCompletion)
DEFINE_DACGFN(DACNotifyCompilationFinished)
DEFINE_DACGFN(ThePreStub)

Expand Down

10 changes: 0 additions & 10 deletions
src/coreclr/inc/utilcode.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3898,16 +3898,6 @@ inline BOOL IsGateSpecialThread ()
 return !!(t_ThreadType & ThreadType_Gate);
}

// check if current thread is a Timer thread
inline BOOL IsTimerSpecialThread ()
{
 STATIC_CONTRACT_NOTHROW;
 STATIC_CONTRACT_GC_NOTRIGGER;
 STATIC_CONTRACT_MODE_ANY;

 return !!(t_ThreadType & ThreadType_Timer);
}

// check if current thread is a debugger helper thread
inline BOOL IsDbgHelperSpecialThread ()
{
Expand Down

141 changes: 0 additions & 141 deletions
src/coreclr/vm/comthreadpool.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -852,144 +852,3 @@ FCIMPL1(FC_BOOL_RET, ThreadPoolNative::CorPostQueuedCompletionStatus, LPOVERLAPP
 FC_RETURN_BOOL(res);
}
FCIMPLEND


/********************************************************************************************************************/


/******************************************************************************************/
/* */
/* Timer Functions */
/* */
/******************************************************************************************/

void AppDomainTimerCallback_Worker(LPVOID ptr)
{
 CONTRACTL
 {
 GC_TRIGGERS;
 THROWS;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;

#ifdef _DEBUG
 MethodDesc *pMeth = CoreLibBinder::GetMethod(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK);
 LogCall(pMeth,"AppDomainTimerCallback");
#endif

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)ptr;
 ARG_SLOT args[] = { PtrToArgSlot(pTimerInfoContext->TimerId) };
 MethodDescCallSite(METHOD__TIMER_QUEUE__APPDOMAIN_TIMER_CALLBACK).Call(args);
}

VOID WINAPI AppDomainTimerCallback(PVOID callbackState, BOOLEAN timerOrWaitFired)
{
 Thread* pThread = GetThreadNULLOk();
 if (pThread == NULL)
 {
 // TODO: how do we notify user of OOM here?
 ClrFlsSetThreadType(ThreadType_Threadpool_Worker);
 pThread = SetupThreadNoThrow();
 if (pThread == NULL) {
 return;
 }
 }

 CONTRACTL
 {
 THROWS;
 MODE_ANY;
 GC_TRIGGERS;
 }
 CONTRACTL_END;

 GCX_COOP();

 ThreadpoolMgr::TimerInfoContext* pTimerInfoContext = (ThreadpoolMgr::TimerInfoContext*)callbackState;
 ManagedThreadBase::ThreadPool(AppDomainTimerCallback_Worker, pTimerInfoContext);
}

extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId)
{
 QCALL_CONTRACT;

 HANDLE hTimer = NULL;
 BEGIN_QCALL;

 _ASSERTE(dueTime >= 0);
 _ASSERTE(timerId >= 0);

 AppDomain* pAppDomain = GetThread()->GetDomain();

 ThreadpoolMgr::TimerInfoContext* timerContext = new ThreadpoolMgr::TimerInfoContext();
 timerContext->TimerId = timerId;
 NewHolder<ThreadpoolMgr::TimerInfoContext> timerContextHolder(timerContext);

 BOOL res = ThreadpoolMgr::CreateTimerQueueTimer(
 &hTimer,
 (WAITORTIMERCALLBACK)AppDomainTimerCallback,
 (PVOID)timerContext,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */,
 0 /* no flags */);

 if (!res)
 {
 if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
 COMPlusThrow(kNotSupportedException);
 else
 COMPlusThrowWin32();
 }
 else
 {
 timerContextHolder.SuppressRelease();
 }

 END_QCALL;
 return hTimer;
}

extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 res = ThreadpoolMgr::DeleteTimerQueueTimer(hTimer, NULL);

 if (!res)
 {
 DWORD errorCode = ::GetLastError();
 if (errorCode != ERROR_IO_PENDING)
 COMPlusThrowWin32(HRESULT_FROM_WIN32(errorCode));
 }

 END_QCALL;
 return res;
}


extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime)
{
 QCALL_CONTRACT;

 BOOL res = FALSE;
 BEGIN_QCALL;

 _ASSERTE(hTimer != NULL && hTimer != INVALID_HANDLE_VALUE);
 _ASSERTE(dueTime >= 0);

 res = ThreadpoolMgr::ChangeTimerQueueTimer(
 hTimer,
 (ULONG)dueTime,
 (ULONG)-1 /* this timer doesn't repeat */);

 if (!res)
 COMPlusThrowWin32();

 END_QCALL;
 return res;
}

3 changes: 0 additions & 3 deletions
src/coreclr/vm/comthreadpool.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,6 @@ class ThreadPoolNative
extern "C" INT64 QCALLTYPE ThreadPool_GetCompletedWorkItemCount();
extern "C" BOOL QCALLTYPE ThreadPool_RequestWorkerThread();
extern "C" BOOL QCALLTYPE ThreadPool_PerformGateActivities(INT32 cpuUtilization);
extern "C" HANDLE QCALLTYPE AppDomainTimer_Create(INT32 dueTime, INT32 timerId);
extern "C" BOOL QCALLTYPE AppDomainTimer_Change(HANDLE hTimer, INT32 dueTime);
extern "C" BOOL QCALLTYPE AppDomainTimer_Delete(HANDLE hTimer);

VOID QueueUserWorkItemManagedCallback(PVOID pArg);
void WINAPI BindIoCompletionCallbackStub(DWORD ErrorCode,
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/corelib.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -906,9 +906,6 @@ DEFINE_METHOD(TPWAITORTIMER_HELPER, PERFORM_WAITORTIMER_CALLBACK,
DEFINE_CLASS(TP_WAIT_CALLBACK, Threading, _ThreadPoolWaitCallback)
DEFINE_METHOD(TP_WAIT_CALLBACK, PERFORM_WAIT_CALLBACK, PerformWaitCallback, SM_RetBool)

DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
DEFINE_METHOD(TIMER_QUEUE, APPDOMAIN_TIMER_CALLBACK, AppDomainTimerCallback, SM_Int_RetVoid)

DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
DEFINE_METHOD(THREAD_POOL, ENSURE_GATE_THREAD_RUNNING, EnsureGateThreadRunning, SM_RetVoid)
DEFINE_METHOD(THREAD_POOL, UNSAFE_QUEUE_UNMANAGED_WORK_ITEM, UnsafeQueueUnmanagedWorkItem, SM_IntPtr_IntPtr_RetVoid)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/vm/qcallentrypoints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,9 +212,6 @@ static const Entry s_QCall[] =
 DllImportEntry(ThreadPool_GetCompletedWorkItemCount)
 DllImportEntry(ThreadPool_RequestWorkerThread)
 DllImportEntry(ThreadPool_PerformGateActivities)
 DllImportEntry(AppDomainTimer_Create)
 DllImportEntry(AppDomainTimer_Change)
 DllImportEntry(AppDomainTimer_Delete)
#ifdef TARGET_UNIX
 DllImportEntry(WaitHandle_CorWaitOnePrioritizedNative)
#endif
Expand Down

6 changes: 2 additions & 4 deletions
src/coreclr/vm/threadpoolrequest.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,8 +385,7 @@ void UnManagedPerAppDomainTPCount::QueueUnmanagedWorkRequest(LPTHREAD_START_ROUT
 _ASSERTE(pWorkRequest != NULL);
 PREFIX_ASSUME(pWorkRequest != NULL);

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(function))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolEnqueue))
 FireEtwThreadPoolEnqueue(pWorkRequest, GetClrInstanceId());

 m_lock.Init(LOCK_TYPE_DEFAULT);
Expand DownExpand Up@@ -493,8 +492,7 @@ void UnManagedPerAppDomainTPCount::DispatchWorkItem(bool* foundWork, bool* wasNo
 wrFunction = pWorkRequest->Function;
 wrContext = pWorkRequest->Context;

 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue) &&
 !ThreadpoolMgr::AreEtwQueueEventsSpeciallyHandled(wrFunction))
 if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context, ThreadPoolDequeue))
 FireEtwThreadPoolDequeue(pWorkRequest, GetClrInstanceId());

 ThreadpoolMgr::FreeWorkRequest(pWorkRequest);
Expand Down

10 changes: 3 additions & 7 deletions
src/coreclr/vm/threads.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -703,7 +703,7 @@ Thread* SetupThread()
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 pThread->SetBackground(TRUE);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 pThread->SetBackground(TRUE);
Expand DownExpand Up@@ -794,7 +794,7 @@ Thread* SetupThread()
 {
 pThread->SetThreadState(Thread::TS_CompletionPortThread);
 }
 else if (IsTimerSpecialThread() || IsWaitSpecialThread())
 else if (IsWaitSpecialThread())
 {
 pThread->SetThreadState(Thread::TS_TPWorkerThread);
 }
Expand DownExpand Up@@ -7183,7 +7183,6 @@ BOOL Thread::HaveExtraWorkForFinalizer()
 LIMITED_METHOD_CONTRACT;

 return RequireSyncBlockCleanup()
 || ThreadpoolMgr::HaveTimerInfosToFlush()
 || Thread::CleanupNeededForFinalizedThread()
 || (m_DetachCount > 0)
 || SystemDomain::System()->RequireAppDomainCleanup()
Expand DownExpand Up@@ -7231,9 +7230,6 @@ void Thread::DoExtraWorkForFinalizer()
 Thread::CleanupDetachedThreads();
 }

 // If there were any TimerInfos waiting to be released, they'll get flushed now
 ThreadpoolMgr::FlushQueueOfTimerInfos();

 if (YieldProcessorNormalization::IsMeasurementScheduled())
 {
 GCX_PREEMP();
Expand DownExpand Up@@ -7585,7 +7581,7 @@ void ManagedThreadBase::KickOff(ADCallBackFcnType pTarget, LPVOID args)
 ManagedThreadBase_FullTransition(pTarget, args, ManagedThread);
}

// The IOCompletion, QueueUserWorkItem, AddTimer, RegisterWaitForSingleObject cases in the ThreadPool
// The IOCompletion, QueueUserWorkItem, RegisterWaitForSingleObject cases in the ThreadPool
void ManagedThreadBase::ThreadPool(ADCallBackFcnType pTarget, LPVOID args)
{
 WRAPPER_NO_CONTRACT;
Expand Down
Loading