From: Jay Krell Date: Thu, 2 May 2019 14:25:58 +0000 (-0700) Subject: Move three trivial threadpool icalls to callers. (mono/mono#14296) X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~1350 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71792267c80789095720921567d42d1c7d0330eb;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Move three trivial threadpool icalls to callers. (mono/mono#14296) ves_icall_System_Threading_ThreadPool_PostQueuedCompletionStatus ves_icall_System_Threading_ThreadPool_BindIOCompletionCallbackNative ves_icall_System_Threading_ThreadPool_IsThreadPoolHosted Commit migrated from https://github.com/mono/mono/commit/d371432a1030db86d1ed6afb9bc174fb1587191f --- diff --git a/src/mono/configure.ac b/src/mono/configure.ac index 6c05201..34beb80 100644 --- a/src/mono/configure.ac +++ b/src/mono/configure.ac @@ -62,7 +62,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3` # This line is parsed by tools besides autoconf, such as msvc/mono.winconfig.targets. # It should remain in the format they expect. # -MONO_CORLIB_VERSION=8678BDEC-A621-42D3-B0F5-862BA3A90DC8 +MONO_CORLIB_VERSION=72b17ed6-e833-40ad-bc8b-d021b15b8d6e # # Put a quoted #define in config.h. diff --git a/src/mono/mono/metadata/icall-def.h b/src/mono/mono/metadata/icall-def.h index c9f93b0..7e6b098 100644 --- a/src/mono/mono/metadata/icall-def.h +++ b/src/mono/mono/metadata/icall-def.h @@ -1208,17 +1208,14 @@ NOHANDLES(ICALL(THREAD_51, "VolatileWrite(ulong&,ulong)", ves_icall_System_Threa NOHANDLES(ICALL(THREAD_9, "YieldInternal", ves_icall_System_Threading_Thread_YieldInternal)) #endif -ICALL_TYPE(THREADP, "System.Threading.ThreadPool", THREADP_1) -HANDLES(THREADP_1, "BindIOCompletionCallbackNative", ves_icall_System_Threading_ThreadPool_BindIOCompletionCallbackNative, MonoBoolean, 1, (gpointer)) +ICALL_TYPE(THREADP, "System.Threading.ThreadPool", THREADP_2) HANDLES(THREADP_2, "GetAvailableThreadsNative", ves_icall_System_Threading_ThreadPool_GetAvailableThreadsNative, void, 2, (gint32_ref, gint32_ref)) HANDLES(THREADP_3, "GetMaxThreadsNative", ves_icall_System_Threading_ThreadPool_GetMaxThreadsNative, void, 2, (gint32_ref, gint32_ref)) HANDLES(THREADP_4, "GetMinThreadsNative", ves_icall_System_Threading_ThreadPool_GetMinThreadsNative, void, 2, (gint32_ref, gint32_ref)) HANDLES(THREADP_5, "InitializeVMTp", ves_icall_System_Threading_ThreadPool_InitializeVMTp, void, 1, (MonoBoolean_ref)) -HANDLES(THREADP_6, "IsThreadPoolHosted", ves_icall_System_Threading_ThreadPool_IsThreadPoolHosted, MonoBoolean, 0, ()) HANDLES(THREADP_7, "NotifyWorkItemComplete", ves_icall_System_Threading_ThreadPool_NotifyWorkItemComplete, MonoBoolean, 0, ()) HANDLES(THREADP_8, "NotifyWorkItemProgressNative", ves_icall_System_Threading_ThreadPool_NotifyWorkItemProgressNative, void, 0, ()) HANDLES(THREADP_8m, "NotifyWorkItemQueued", ves_icall_System_Threading_ThreadPool_NotifyWorkItemQueued, void, 0, ()) -HANDLES(THREADP_9, "PostQueuedCompletionStatus", ves_icall_System_Threading_ThreadPool_PostQueuedCompletionStatus, MonoBoolean, 1, (MonoNativeOverlapped_ptr)) HANDLES(THREADP_11, "ReportThreadStatus", ves_icall_System_Threading_ThreadPool_ReportThreadStatus, void, 1, (MonoBoolean)) HANDLES(THREADP_12, "RequestWorkerThread", ves_icall_System_Threading_ThreadPool_RequestWorkerThread, MonoBoolean, 0, ()) HANDLES(THREADP_13, "SetMaxThreadsNative", ves_icall_System_Threading_ThreadPool_SetMaxThreadsNative, MonoBoolean, 2, (gint32, gint32)) diff --git a/src/mono/mono/metadata/icall-table.h b/src/mono/mono/metadata/icall-table.h index bf097aa..d472fe3 100644 --- a/src/mono/mono/metadata/icall-table.h +++ b/src/mono/mono/metadata/icall-table.h @@ -53,7 +53,6 @@ typedef MonoClassField *MonoClassField_ptr; typedef MonoEvent *MonoEvent_ptr; typedef MonoImage *MonoImage_ptr; typedef MonoMethod *MonoMethod_ptr; -typedef MonoNativeOverlapped *MonoNativeOverlapped_ptr; typedef MonoProperty *MonoProperty_ptr; typedef MonoPropertyInfo *MonoPropertyInfo_ref; typedef MonoType *MonoType_ptr; @@ -80,7 +79,6 @@ typedef MonoEvent *MonoEvent_ref; typedef MonoEventInfo *MonoEventInfo_ref; typedef MonoMethod *MonoMethod_ref; typedef MonoMethodInfo *MonoMethodInfo_ref; -typedef MonoNativeOverlapped *MonoNativeOverlapped_ref; typedef MonoResolveTokenError *MonoResolveTokenError_ref; typedef MonoType *MonoType_ref; typedef MonoTypedRef *MonoTypedRef_ref; @@ -155,7 +153,6 @@ typedef MonoReflectionModuleHandle MonoReflectionModuleOutHandle; #define MONO_HANDLE_TYPE_WRAP_MonoEventInfo_ref ICALL_HANDLES_WRAP_VALUETYPE_REF #define MONO_HANDLE_TYPE_WRAP_MonoMethod_ref ICALL_HANDLES_WRAP_VALUETYPE_REF #define MONO_HANDLE_TYPE_WRAP_MonoMethodInfo_ref ICALL_HANDLES_WRAP_VALUETYPE_REF -#define MONO_HANDLE_TYPE_WRAP_MonoNativeOverlapped_ref ICALL_HANDLES_WRAP_VALUETYPE_REF #define MONO_HANDLE_TYPE_WRAP_MonoPropertyInfo_ref ICALL_HANDLES_WRAP_VALUETYPE_REF #define MONO_HANDLE_TYPE_WRAP_MonoType_ref ICALL_HANDLES_WRAP_VALUETYPE_REF #define MONO_HANDLE_TYPE_WRAP_MonoTypedRef_ref ICALL_HANDLES_WRAP_VALUETYPE_REF @@ -178,7 +175,6 @@ typedef MonoReflectionModuleHandle MonoReflectionModuleOutHandle; #define MONO_HANDLE_TYPE_WRAP_MonoEvent_ptr ICALL_HANDLES_WRAP_NONE #define MONO_HANDLE_TYPE_WRAP_MonoGenericParamInfo_ptr ICALL_HANDLES_WRAP_NONE #define MONO_HANDLE_TYPE_WRAP_MonoMethod_ptr ICALL_HANDLES_WRAP_NONE -#define MONO_HANDLE_TYPE_WRAP_MonoNativeOverlapped_ptr ICALL_HANDLES_WRAP_NONE #define MONO_HANDLE_TYPE_WRAP_MonoType_ptr ICALL_HANDLES_WRAP_NONE #define MONO_HANDLE_TYPE_WRAP_MonoTypedRef_ptr ICALL_HANDLES_WRAP_NONE #define MONO_HANDLE_TYPE_WRAP_MonoStackCrawlMark_ptr ICALL_HANDLES_WRAP_NONE diff --git a/src/mono/mono/metadata/threadpool.c b/src/mono/mono/metadata/threadpool.c index 659c95b..f1ea753 100644 --- a/src/mono/mono/metadata/threadpool.c +++ b/src/mono/mono/metadata/threadpool.c @@ -798,24 +798,3 @@ ves_icall_System_Threading_ThreadPool_RequestWorkerThread (MonoError *error) mono_refcount_dec (&threadpool); return TRUE; } - -MonoBoolean G_GNUC_UNUSED -ves_icall_System_Threading_ThreadPool_PostQueuedCompletionStatus (MonoNativeOverlapped *native_overlapped, MonoError *error) -{ - /* This copy the behavior of the current Mono implementation */ - mono_error_set_not_implemented (error, ""); - return FALSE; -} - -MonoBoolean G_GNUC_UNUSED -ves_icall_System_Threading_ThreadPool_BindIOCompletionCallbackNative (gpointer file_handle, MonoError *error) -{ - /* This copy the behavior of the current Mono implementation */ - return TRUE; -} - -MonoBoolean G_GNUC_UNUSED -ves_icall_System_Threading_ThreadPool_IsThreadPoolHosted (MonoError *error) -{ - return FALSE; -} diff --git a/src/mono/mono/metadata/threadpool.h b/src/mono/mono/metadata/threadpool.h index c02b986..e2ff2b8 100644 --- a/src/mono/mono/metadata/threadpool.h +++ b/src/mono/mono/metadata/threadpool.h @@ -12,8 +12,6 @@ #include #include -typedef struct _MonoNativeOverlapped MonoNativeOverlapped; - void mono_threadpool_cleanup (void);