X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmonitor.c;h=d3b51abfc80247f536fdb2410f28edf528411200;hb=HEAD;hp=1d9ff1b8acc251ee6fd5524232aa1edf35204b71;hpb=9add1a79714a50f0ef2ef473dc41e2e30bb1b1fa;p=mono.git diff --git a/mono/metadata/monitor.c b/mono/metadata/monitor.c index 1d9ff1b8acc..d3b51abfc80 100644 --- a/mono/metadata/monitor.c +++ b/mono/metadata/monitor.c @@ -1,5 +1,6 @@ -/* - * monitor.c: Monitor locking functions +/** + * \file + * Monitor locking functions * * Author: * Dick Porter (dick@ximian.com) @@ -18,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +31,8 @@ #include #include #include +#include +#include /* * Pull the list of opcodes @@ -307,10 +309,9 @@ monitor_is_on_freelist (MonoThreadsSync *mon) /** * mono_locks_dump: - * @include_untaken: - * + * \param include_untaken Whether to list unheld inflated locks. * Print a report on stdout of the managed locks currently held by - * threads. If @include_untaken is specified, list also inflated locks + * threads. If \p include_untaken is specified, list also inflated locks * which are unheld. * This is supposed to be used in debuggers like gdb. */ @@ -373,7 +374,7 @@ mon_finalize (MonoThreadsSync *mon) mon->data = monitor_freelist; monitor_freelist = mon; #ifndef DISABLE_PERFCOUNTERS - mono_perfcounters->gc_sync_blocks--; + InterlockedDecrement (&mono_perfcounters->gc_sync_blocks); #endif } @@ -396,7 +397,7 @@ mon_new (gsize id) /* Orphaned events left by aborted threads */ while (new_->wait_list) { LOCK_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d): Closing orphaned event %d", mono_thread_info_get_small_id (), new_->wait_list->data)); - CloseHandle (new_->wait_list->data); + mono_w32event_close (new_->wait_list->data); new_->wait_list = g_slist_remove (new_->wait_list, new_->wait_list->data); } } @@ -445,7 +446,7 @@ mon_new (gsize id) new_->data = NULL; #ifndef DISABLE_PERFCOUNTERS - mono_perfcounters->gc_sync_blocks++; + InterlockedIncrement (&mono_perfcounters->gc_sync_blocks); #endif return new_; } @@ -792,7 +793,7 @@ retry: /* The object must be locked by someone else... */ #ifndef DISABLE_PERFCOUNTERS - mono_perfcounters->thread_contentions++; + InterlockedIncrement (&mono_perfcounters->thread_contentions); #endif /* If ms is 0 we don't block, but just fail straight away */ @@ -801,7 +802,7 @@ retry: return 0; } - mono_profiler_monitor_event (obj, MONO_PROFILER_MONITOR_CONTENTION); + MONO_PROFILER_RAISE (monitor_contention, (obj)); /* The slow path begins here. */ retry_contended: @@ -824,7 +825,7 @@ retry_contended: if (G_LIKELY (tmp_status == old_status)) { /* Success */ g_assert (mon->nest == 1); - mono_profiler_monitor_event (obj, MONO_PROFILER_MONITOR_DONE); + MONO_PROFILER_RAISE (monitor_acquired, (obj)); return 1; } } @@ -832,7 +833,7 @@ retry_contended: /* If the object is currently locked by this thread... */ if (mon_status_get_owner (old_status) == id) { mon->nest++; - mono_profiler_monitor_event (obj, MONO_PROFILER_MONITOR_DONE); + MONO_PROFILER_RAISE (monitor_acquired, (obj)); return 1; } @@ -868,14 +869,14 @@ retry_contended: } } - if (ms != INFINITE) { + if (ms != MONO_INFINITE_WAIT) { then = mono_msec_ticks (); } waitms = ms; #ifndef DISABLE_PERFCOUNTERS - mono_perfcounters->thread_queue_len++; - mono_perfcounters->thread_queue_max++; + InterlockedIncrement (&mono_perfcounters->thread_queue_len); + InterlockedIncrement (&mono_perfcounters->thread_queue_max); #endif thread = mono_thread_internal_current (); @@ -891,7 +892,7 @@ retry_contended: * */ if (allow_interruption) { - if (!mono_thread_test_and_set_state (thread, (MonoThreadState)(ThreadState_StopRequested | ThreadState_AbortRequested), ThreadState_WaitSleepJoin)) { + if (!mono_thread_test_and_set_state (thread, ThreadState_AbortRequested, ThreadState_WaitSleepJoin)) { wait_ret = MONO_SEM_TIMEDWAIT_RET_ALERTED; goto done_waiting; } @@ -909,7 +910,7 @@ retry_contended: done_waiting: #ifndef DISABLE_PERFCOUNTERS - mono_perfcounters->thread_queue_len--; + InterlockedDecrement (&mono_perfcounters->thread_queue_len); #endif if (wait_ret == MONO_SEM_TIMEDWAIT_RET_ALERTED && !allow_interruption) { @@ -918,8 +919,8 @@ done_waiting: * We have to obey a stop/suspend request even if * allow_interruption is FALSE to avoid hangs at shutdown. */ - if (!mono_thread_test_state (mono_thread_internal_current (), (MonoThreadState)(ThreadState_StopRequested | ThreadState_SuspendRequested | ThreadState_AbortRequested))) { - if (ms != INFINITE) { + if (!mono_thread_test_state (mono_thread_internal_current (), ThreadState_SuspendRequested | ThreadState_AbortRequested)) { + if (ms != MONO_INFINITE_WAIT) { now = mono_msec_ticks (); /* it should not overflow before ~30k years */ @@ -946,7 +947,7 @@ done_waiting: /* Timed out or interrupted */ mon_decrement_entry_count (mon); - mono_profiler_monitor_event (obj, MONO_PROFILER_MONITOR_FAIL); + MONO_PROFILER_RAISE (monitor_failed, (obj)); if (wait_ret == MONO_SEM_TIMEDWAIT_RET_ALERTED) { LOCK_DEBUG (g_message ("%s: (%d) interrupted waiting, returning -1", __func__, id)); @@ -1014,8 +1015,9 @@ mono_monitor_try_enter_internal (MonoObject *obj, guint32 ms, gboolean allow_int return -1; } -gboolean -mono_monitor_enter (MonoObject *obj) +/* This is an icall */ +MonoBoolean +mono_monitor_enter_internal (MonoObject *obj) { gint32 res; gboolean allow_interruption = TRUE; @@ -1032,7 +1034,7 @@ mono_monitor_enter (MonoObject *obj) * it will return NULL meaning we can't be aborted right now. Once that happens we switch to non-alertable. */ do { - res = mono_monitor_try_enter_internal (obj, INFINITE, allow_interruption); + res = mono_monitor_try_enter_internal (obj, MONO_INFINITE_WAIT, allow_interruption); /*This means we got interrupted during the wait and didn't got the monitor.*/ if (res == -1) { MonoException *exc = mono_thread_interruption_checkpoint (); @@ -1048,7 +1050,17 @@ mono_monitor_enter (MonoObject *obj) return TRUE; } -gboolean +/** + * mono_monitor_enter: + */ +gboolean +mono_monitor_enter (MonoObject *obj) +{ + return mono_monitor_enter_internal (obj); +} + +/* Called from JITted code so we return guint32 instead of gboolean */ +guint32 mono_monitor_enter_fast (MonoObject *obj) { if (G_UNLIKELY (!obj)) { @@ -1059,6 +1071,9 @@ mono_monitor_enter_fast (MonoObject *obj) return mono_monitor_try_enter_internal (obj, 0, FALSE) == 1; } +/** + * mono_monitor_try_enter: + */ gboolean mono_monitor_try_enter (MonoObject *obj, guint32 ms) { @@ -1069,6 +1084,9 @@ mono_monitor_try_enter (MonoObject *obj, guint32 ms) return mono_monitor_try_enter_internal (obj, ms, FALSE) == 1; } +/** + * mono_monitor_exit: + */ void mono_monitor_exit (MonoObject *obj) { @@ -1126,7 +1144,7 @@ mono_monitor_threads_sync_members_offset (int *status_offset, int *nest_offset) } void -ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObject *obj, guint32 ms, char *lockTaken) +ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObject *obj, guint32 ms, MonoBoolean *lockTaken) { gint32 res; gboolean allow_interruption = TRUE; @@ -1152,6 +1170,9 @@ ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObject *lockTaken = res == 1; } +/** + * mono_monitor_enter_v4: + */ void mono_monitor_enter_v4 (MonoObject *obj, char *lock_taken) { @@ -1160,7 +1181,22 @@ mono_monitor_enter_v4 (MonoObject *obj, char *lock_taken) return; } - ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (obj, INFINITE, lock_taken); + MonoBoolean taken; + + ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (obj, MONO_INFINITE_WAIT, &taken); + *lock_taken = taken; +} + +/* Called from JITted code */ +void +mono_monitor_enter_v4_internal (MonoObject *obj, MonoBoolean *lock_taken) +{ + if (*lock_taken == 1) { + mono_set_pending_exception (mono_get_exception_argument ("lockTaken", "lockTaken is already true")); + return; + } + + ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (obj, MONO_INFINITE_WAIT, lock_taken); } /* @@ -1169,9 +1205,10 @@ mono_monitor_enter_v4 (MonoObject *obj, char *lock_taken) * Same as mono_monitor_enter_v4, but return immediately if the * monitor cannot be acquired. * Returns TRUE if the lock was acquired, FALSE otherwise. + * Called from JITted code so we return guint32 instead of gboolean. */ -gboolean -mono_monitor_enter_v4_fast (MonoObject *obj, char *lock_taken) +guint32 +mono_monitor_enter_v4_fast (MonoObject *obj, MonoBoolean *lock_taken) { if (*lock_taken == 1) return FALSE; @@ -1182,7 +1219,7 @@ mono_monitor_enter_v4_fast (MonoObject *obj, char *lock_taken) return res == 1; } -gboolean +MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_owner (MonoObject *obj) { LockWord lw; @@ -1200,7 +1237,7 @@ ves_icall_System_Threading_Monitor_Monitor_test_owner (MonoObject *obj) return(FALSE); } -gboolean +MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_synchronised (MonoObject *obj) { LockWord lw; @@ -1287,14 +1324,14 @@ ves_icall_System_Threading_Monitor_Monitor_pulse_all (MonoObject *obj) } } -gboolean +MonoBoolean ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) { LockWord lw; MonoThreadsSync *mon; HANDLE event; guint32 nest; - guint32 ret; + MonoW32HandleWaitRet ret; gboolean success = FALSE; gint32 regain; MonoInternalThread *thread = mono_thread_internal_current (); @@ -1328,7 +1365,7 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) /* This looks superfluous */ if (mono_thread_current_check_pending_interrupt ()) { - CloseHandle (event); + mono_w32event_close (event); return FALSE; } @@ -1350,7 +1387,11 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) * signalled before we wait, we still succeed. */ MONO_ENTER_GC_SAFE; - ret = WaitForSingleObjectEx (event, ms, TRUE); +#ifdef HOST_WIN32 + ret = mono_w32handle_convert_wait_ret (mono_win32_wait_for_single_object_ex (event, ms, TRUE), 1); +#else + ret = mono_w32handle_wait_one (event, ms, TRUE); +#endif /* HOST_WIN32 */ MONO_EXIT_GC_SAFE; /* Reset the thread state fairly early, so we don't have to worry @@ -1360,7 +1401,7 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) /* Regain the lock with the previous nest count */ do { - regain = mono_monitor_try_enter_inflated (obj, INFINITE, TRUE, id); + regain = mono_monitor_try_enter_inflated (obj, MONO_INFINITE_WAIT, TRUE, id); /* We must regain the lock before handling interruption requests */ } while (regain == -1); @@ -1370,12 +1411,16 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) LOCK_DEBUG (g_message ("%s: (%d) Regained %p lock %p", __func__, mono_thread_info_get_small_id (), obj, mon)); - if (ret == WAIT_TIMEOUT) { + if (ret == MONO_W32HANDLE_WAIT_RET_TIMEOUT) { /* Poll the event again, just in case it was signalled * while we were trying to regain the monitor lock */ MONO_ENTER_GC_SAFE; - ret = WaitForSingleObjectEx (event, 0, FALSE); +#ifdef HOST_WIN32 + ret = mono_w32handle_convert_wait_ret (mono_win32_wait_for_single_object_ex (event, 0, FALSE), 1); +#else + ret = mono_w32handle_wait_one (event, 0, FALSE); +#endif /* HOST_WIN32 */ MONO_EXIT_GC_SAFE; } @@ -1389,7 +1434,7 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) * thread. */ - if (ret == WAIT_OBJECT_0) { + if (ret == MONO_W32HANDLE_WAIT_RET_SUCCESS_0) { LOCK_DEBUG (g_message ("%s: (%d) Success", __func__, mono_thread_info_get_small_id ())); success = TRUE; } else { @@ -1399,7 +1444,7 @@ ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms) */ mon->wait_list = g_slist_remove (mon->wait_list, event); } - CloseHandle (event); + mono_w32event_close (event); return success; }