diff options
Diffstat (limited to 'mono/metadata/monitor.c')
| -rw-r--r-- | mono/metadata/monitor.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mono/metadata/monitor.c b/mono/metadata/monitor.c index 86a25e9d0cd..694e29d59b0 100644 --- a/mono/metadata/monitor.c +++ b/mono/metadata/monitor.c @@ -795,9 +795,6 @@ signal_monitor (gpointer mon_untyped) mono_coop_mutex_unlock (mon->entry_mutex); } -#ifdef ENABLE_NETCORE -static gint64 thread_contentions; /* for Monitor.LockContentionCount, otherwise mono_perfcounters struct is used */ -#endif /* If allow_interruption==TRUE, the method will be interrupted if abort or suspend * is requested. In this case it returns -1. @@ -856,9 +853,6 @@ retry: #ifndef DISABLE_PERFCOUNTERS mono_atomic_inc_i32 (&mono_perfcounters->thread_contentions); #else -#ifdef ENABLE_NETCORE - mono_atomic_inc_i64 (&thread_contentions); -#endif #endif /* If ms is 0 we don't block, but just fail straight away */ @@ -1223,19 +1217,11 @@ mono_monitor_try_enter_loop_if_interrupted (MonoObject *obj, guint32 ms, return res; } -#ifdef ENABLE_NETCORE -void -ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObjectHandle obj, guint32 ms, MonoBoolean allow_interruption, MonoBoolean* lockTaken, MonoError* error) -{ - mono_monitor_try_enter_loop_if_interrupted (MONO_HANDLE_RAW (obj), ms, allow_interruption, lockTaken, error); -} -#else void ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObjectHandle obj, guint32 ms, MonoBoolean* lockTaken, MonoError* error) { mono_monitor_try_enter_loop_if_interrupted (MONO_HANDLE_RAW (obj), ms, TRUE, lockTaken, error); } -#endif /** * mono_monitor_enter_v4: @@ -1493,33 +1479,14 @@ mono_monitor_wait (MonoObjectHandle obj_handle, guint32 ms, MonoBoolean allow_in return success; } -#ifdef ENABLE_NETCORE -MonoBoolean -ves_icall_System_Threading_Monitor_Monitor_wait (MonoObjectHandle obj_handle, guint32 ms, MonoBoolean allow_interruption, MonoError* error) -{ - return mono_monitor_wait (obj_handle, ms, allow_interruption, error); -} -#else MonoBoolean ves_icall_System_Threading_Monitor_Monitor_wait (MonoObjectHandle obj_handle, guint32 ms, MonoError* error) { return mono_monitor_wait (obj_handle, ms, TRUE, error); } -#endif void ves_icall_System_Threading_Monitor_Monitor_Enter (MonoObjectHandle obj, MonoError* error) { mono_monitor_enter_internal (MONO_HANDLE_RAW (obj)); } -#ifdef ENABLE_NETCORE -gint64 -ves_icall_System_Threading_Monitor_Monitor_LockContentionCount (void) -{ -#ifndef DISABLE_PERFCOUNTERS - return mono_perfcounters->thread_contentions; -#else - return thread_contentions; -#endif -} -#endif |