/* Suspend all managed threads since the runtime is going away */
mono_thread_suspend_all_other_threads ();
- //FIXME shutdown is, weirdly enough, abortible in gc.c so we add this hack for now, see https://bugzilla.xamarin.com/show_bug.cgi?id=51653
- mono_threads_begin_abort_protected_block ();
- mono_thread_info_clear_self_interrupt ();
-
mono_runtime_quit ();
#endif
event = thread->suspended;
MONO_ENTER_GC_SAFE;
- res = mono_os_event_wait_one (event, MONO_INFINITE_WAIT);
+ res = mono_os_event_wait_one (event, MONO_INFINITE_WAIT, TRUE);
g_assert (res == MONO_OS_EVENT_WAIT_RET_SUCCESS_0 || res == MONO_OS_EVENT_WAIT_RET_ALERTED);
MONO_EXIT_GC_SAFE;
}
{
MonoOSEventWaitRet res;
- res = mono_os_event_wait_one (&thread_handle->event, timeout);
+ res = mono_os_event_wait_one (&thread_handle->event, timeout, alertable);
if (res == MONO_OS_EVENT_WAIT_RET_SUCCESS_0)
return MONO_THREAD_INFO_WAIT_RET_SUCCESS_0;
else if (res == MONO_OS_EVENT_WAIT_RET_ALERTED)
if (background_change_event)
thread_events [nhandles ++] = background_change_event;
- res = mono_os_event_wait_multiple (thread_events, nhandles, waitall, timeout);
+ res = mono_os_event_wait_multiple (thread_events, nhandles, waitall, timeout, alertable);
if (res >= MONO_OS_EVENT_WAIT_RET_SUCCESS_0 && res <= MONO_OS_EVENT_WAIT_RET_SUCCESS_0 + nhandles - 1)
return MONO_THREAD_INFO_WAIT_RET_SUCCESS_0 + (res - MONO_OS_EVENT_WAIT_RET_SUCCESS_0);
else if (res == MONO_OS_EVENT_WAIT_RET_ALERTED)
}
MonoOSEventWaitRet
-mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout)
+mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout, gboolean alertable)
{
- return mono_os_event_wait_multiple (&event, 1, TRUE, timeout);
+ return mono_os_event_wait_multiple (&event, 1, TRUE, timeout, alertable);
}
typedef struct {
}
MonoOSEventWaitRet
-mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout)
+mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout, gboolean alertable)
{
MonoOSEventWaitRet ret;
mono_cond_t signal_cond;
for (i = 0; i < nevents; ++i)
g_assert (events [i]);
- data = g_new0 (OSEventWaitData, 1);
- data->ref = 2;
- mono_os_event_init (&data->event, FALSE);
+ if (alertable) {
+ data = g_new0 (OSEventWaitData, 1);
+ data->ref = 2;
+ mono_os_event_init (&data->event, FALSE);
- alerted = FALSE;
- mono_thread_info_install_interrupt (signal_and_unref, data, &alerted);
- if (alerted) {
- mono_os_event_destroy (&data->event);
- g_free (data);
- return MONO_OS_EVENT_WAIT_RET_ALERTED;
+ alerted = FALSE;
+ mono_thread_info_install_interrupt (signal_and_unref, data, &alerted);
+ if (alerted) {
+ mono_os_event_destroy (&data->event);
+ g_free (data);
+ return MONO_OS_EVENT_WAIT_RET_ALERTED;
+ }
}
if (timeout != MONO_INFINITE_WAIT)
for (i = 0; i < nevents; ++i)
g_ptr_array_add (events [i]->conds, &signal_cond);
- g_ptr_array_add (data->event.conds, &signal_cond);
+ if (alertable)
+ g_ptr_array_add (data->event.conds, &signal_cond);
for (;;) {
gint count, lowest;
}
}
- if (mono_os_event_is_signalled (&data->event))
+ if (alertable && mono_os_event_is_signalled (&data->event))
signalled = TRUE;
else if (waitall)
signalled = (count == nevents);
for (i = 0; i < nevents; ++i)
g_ptr_array_remove (events [i]->conds, &signal_cond);
- g_ptr_array_remove (data->event.conds, &signal_cond);
+ if (alertable)
+ g_ptr_array_remove (data->event.conds, &signal_cond);
mono_os_mutex_unlock (&signal_mutex);
mono_os_cond_destroy (&signal_cond);
- mono_thread_info_uninstall_interrupt (&alerted);
- if (alerted) {
- if (InterlockedDecrement ((gint32*) &data->ref) == 0) {
- mono_os_event_destroy (&data->event);
- g_free (data);
+ if (alertable) {
+ mono_thread_info_uninstall_interrupt (&alerted);
+ if (alerted) {
+ if (InterlockedDecrement ((gint32*) &data->ref) == 0) {
+ mono_os_event_destroy (&data->event);
+ g_free (data);
+ }
+ return MONO_OS_EVENT_WAIT_RET_ALERTED;
}
- return MONO_OS_EVENT_WAIT_RET_ALERTED;
- }
- mono_os_event_destroy (&data->event);
- g_free (data);
+ mono_os_event_destroy (&data->event);
+ g_free (data);
+ }
return ret;
}
}
MonoOSEventWaitRet
-mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout)
+mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout, gboolean alertable)
{
DWORD res;
g_assert (event);
g_assert (event->handle);
- res = WaitForSingleObjectEx (event->handle, timeout, TRUE);
+ res = WaitForSingleObjectEx (event->handle, timeout, alertable);
if (res == WAIT_OBJECT_0)
return MONO_OS_EVENT_WAIT_RET_SUCCESS_0;
else if (res == WAIT_IO_COMPLETION)
}
MonoOSEventWaitRet
-mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout)
+mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout, gboolean alertable)
{
DWORD res;
gpointer handles [MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS];
g_assert (nevents <= MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS);
if (nevents == 1)
- return mono_os_event_wait_one (events [0], timeout);
+ return mono_os_event_wait_one (events [0], timeout, alertable);
for (i = 0; i < nevents; ++i) {
g_assert (events [i]);
handles [i] = events [i]->handle;
}
- res = WaitForMultipleObjectsEx (nevents, handles, waitall, timeout, TRUE);
+ res = WaitForMultipleObjectsEx (nevents, handles, waitall, timeout, alertable);
if (res >= WAIT_OBJECT_0 && res < WAIT_OBJECT_0 + MONO_OS_EVENT_WAIT_MAXIMUM_OBJECTS)
return MONO_OS_EVENT_WAIT_RET_SUCCESS_0 + (res - WAIT_OBJECT_0);
else if (res == WAIT_IO_COMPLETION)
mono_os_event_reset (MonoOSEvent *event);
MonoOSEventWaitRet
-mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout);
+mono_os_event_wait_one (MonoOSEvent *event, guint32 timeout, gboolean alertable);
MonoOSEventWaitRet
-mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout);
+mono_os_event_wait_multiple (MonoOSEvent **events, gsize nevents, gboolean waitall, guint32 timeout, gboolean alertable);
#endif /* _MONO_UTILS_OS_EVENT_H_ */