#include "config.h"
#ifdef HAVE_SGEN_GC
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-memory-governor.h"
-#include "metadata/sgen-thread-pool.h"
+#include "sgen/sgen-gc.h"
+#include "sgen/sgen-protocol.h"
+#include "sgen/sgen-memory-governor.h"
+#include "sgen/sgen-thread-pool.h"
#include "metadata/profiler-private.h"
-#include "utils/mono-time.h"
-#include "utils/dtrace.h"
-#include "utils/mono-counters.h"
-#include "utils/mono-threads.h"
-
-static gboolean world_is_stopped = FALSE;
+#include "sgen/sgen-client.h"
+#include "metadata/sgen-bridge-internals.h"
+#include "metadata/gc-internals.h"
#define TV_DECLARE SGEN_TV_DECLARE
#define TV_GETTIME SGEN_TV_GETTIME
#define TV_ELAPSED SGEN_TV_ELAPSED
-static int sgen_unified_suspend_restart_world (void);
-static int sgen_unified_suspend_stop_world (void);
+static void sgen_unified_suspend_restart_world (void);
+static void sgen_unified_suspend_stop_world (void);
+
+unsigned int sgen_global_stop_count = 0;
inline static void*
align_pointer (void *ptr)
#endif
SgenThreadInfo *info = mono_thread_info_current ();
- info->stack_start = align_pointer (&stack_guard);
- g_assert (info->stack_start >= info->stack_start_limit && info->stack_start < info->stack_end);
+ info->client_info.stack_start = align_pointer (&stack_guard);
+ g_assert (info->client_info.stack_start >= info->client_info.stack_start_limit && info->client_info.stack_start < info->client_info.stack_end);
#ifdef USE_MONO_CTX
MONO_CONTEXT_GET_CURRENT (cur_thread_ctx);
- memcpy (&info->ctx, &cur_thread_ctx, sizeof (MonoContext));
+ memcpy (&info->client_info.ctx, &cur_thread_ctx, sizeof (MonoContext));
if (mono_gc_get_gc_callbacks ()->thread_suspend_func)
- mono_gc_get_gc_callbacks ()->thread_suspend_func (info->runtime_data, NULL, &info->ctx);
+ mono_gc_get_gc_callbacks ()->thread_suspend_func (info->client_info.runtime_data, NULL, &info->client_info.ctx);
#else
ARCH_STORE_REGS (reg_ptr);
- memcpy (&info->regs, reg_ptr, sizeof (info->regs));
+ memcpy (&info->client_info.regs, reg_ptr, sizeof (info->client_info.regs));
if (mono_gc_get_gc_callbacks ()->thread_suspend_func)
- mono_gc_get_gc_callbacks ()->thread_suspend_func (info->runtime_data, NULL, NULL);
+ mono_gc_get_gc_callbacks ()->thread_suspend_func (info->client_info.runtime_data, NULL, NULL);
#endif
}
* missing methods (#13951). To work around this, we disable the AOT fallback. For this to work, the JIT needs
* to register the jit info for all GC critical methods after they are JITted/loaded.
*/
- ji = mono_jit_info_table_find_internal (domain, ip, FALSE, FALSE);
+ ji = mono_jit_info_table_find_internal (domain, (char *)ip, FALSE, FALSE);
if (!ji)
return FALSE;
allocator */
FOREACH_THREAD_SAFE (info) {
gboolean result;
- if (info->skip || info->gc_disabled || info->suspend_done)
+ if (info->client_info.skip || info->client_info.gc_disabled || info->client_info.suspend_done)
continue;
- if (mono_thread_info_is_live (info) && (!info->stack_start || info->in_critical_region || info->info.inside_critical_region ||
- is_ip_in_managed_allocator (info->stopped_domain, info->stopped_ip))) {
+ if (mono_thread_info_is_live (info) &&
+ (!info->client_info.stack_start || info->client_info.in_critical_region || info->client_info.info.inside_critical_region ||
+ is_ip_in_managed_allocator (info->client_info.stopped_domain, info->client_info.stopped_ip))) {
binary_protocol_thread_restart ((gpointer)mono_thread_info_get_tid (info));
- SGEN_LOG (3, "thread %p resumed.", (void*) (size_t) info->info.native_handle);
+ SGEN_LOG (3, "thread %p resumed.", (void*) (size_t) info->client_info.info.native_handle);
result = sgen_resume_thread (info);
if (result) {
++restart_count;
} else {
- info->skip = 1;
+ info->client_info.skip = 1;
}
} else {
/* we set the stopped_ip to
we're not restarting so
that we can easily identify
the others */
- info->stopped_ip = NULL;
- info->stopped_domain = NULL;
- info->suspend_done = TRUE;
+ info->client_info.stopped_ip = NULL;
+ info->client_info.stopped_domain = NULL;
+ info->client_info.suspend_done = TRUE;
}
} END_FOREACH_THREAD_SAFE
/* if no threads were restarted, we're done */
/* stop them again */
FOREACH_THREAD (info) {
gboolean result;
- if (info->skip || info->stopped_ip == NULL)
+ if (info->client_info.skip || info->client_info.stopped_ip == NULL)
continue;
result = sgen_suspend_thread (info);
if (result) {
++restarted_count;
} else {
- info->skip = 1;
+ info->client_info.skip = 1;
}
} END_FOREACH_THREAD
/* some threads might have died */
UNLOCK_INTERRUPTION;
}
-static void
-count_cards (long long *major_total, long long *major_marked, long long *los_total, long long *los_marked)
-{
- sgen_get_major_collector ()->count_cards (major_total, major_marked);
- sgen_los_count_cards (los_total, los_marked);
-}
-
static TV_DECLARE (stop_world_time);
static unsigned long max_pause_usec = 0;
static guint64 time_restart_world;
/* LOCKING: assumes the GC lock is held */
-int
-sgen_stop_world (int generation)
+void
+sgen_client_stop_world (int generation)
{
TV_DECLARE (end_handshake);
- int count, dead;
- SGEN_ASSERT (0, !world_is_stopped, "Why are we stopping a stopped world?");
+ /* notify the profiler of the leftovers */
+ /* FIXME this is the wrong spot at we can STW for non collection reasons. */
+ if (G_UNLIKELY (mono_profiler_events & MONO_PROFILE_GC_MOVES))
+ mono_sgen_gc_event_moves ();
- mono_profiler_gc_event (MONO_GC_EVENT_PRE_STOP_WORLD, generation);
- MONO_GC_WORLD_STOP_BEGIN ();
- binary_protocol_world_stopping (sgen_timestamp ());
acquire_gc_locks ();
/* We start to scan after locks are taking, this ensures we won't be interrupted. */
sgen_process_togglerefs ();
- update_current_thread_stack (&count);
+ update_current_thread_stack (&generation);
sgen_global_stop_count++;
SGEN_LOG (3, "stopping world n %d from %p %p", sgen_global_stop_count, mono_thread_info_current (), (gpointer)mono_native_thread_id_get ());
TV_GETTIME (stop_world_time);
if (mono_thread_info_unified_management_enabled ()) {
- count = sgen_unified_suspend_stop_world ();
+ sgen_unified_suspend_stop_world ();
} else {
+ int count, dead;
count = sgen_thread_handshake (TRUE);
dead = restart_threads_until_none_in_managed_allocator ();
if (count < dead)
g_error ("More threads have died (%d) that been initialy suspended %d", dead, count);
- count -= dead;
}
- world_is_stopped = TRUE;
-
- SGEN_LOG (3, "world stopped %d thread(s)", count);
- mono_profiler_gc_event (MONO_GC_EVENT_POST_STOP_WORLD, generation);
- MONO_GC_WORLD_STOP_END ();
- if (binary_protocol_is_enabled ()) {
- long long major_total = -1, major_marked = -1, los_total = -1, los_marked = -1;
- if (binary_protocol_is_heavy_enabled ())
- count_cards (&major_total, &major_marked, &los_total, &los_marked);
- binary_protocol_world_stopped (sgen_timestamp (), major_total, major_marked, los_total, los_marked);
- }
+ SGEN_LOG (3, "world stopped");
TV_GETTIME (end_handshake);
time_stop_world += TV_ELAPSED (stop_world_time, end_handshake);
sgen_memgov_collection_start (generation);
if (sgen_need_bridge_processing ())
sgen_bridge_reset_data ();
-
- return count;
}
/* LOCKING: assumes the GC lock is held */
-int
-sgen_restart_world (int generation, GGTimingInfo *timing)
+void
+sgen_client_restart_world (int generation, GGTimingInfo *timing)
{
- int count;
SgenThreadInfo *info;
TV_DECLARE (end_sw);
TV_DECLARE (start_handshake);
TV_DECLARE (end_bridge);
unsigned long usec, bridge_usec;
- SGEN_ASSERT (0, world_is_stopped, "Why are we restarting a running world?");
-
- if (binary_protocol_is_enabled ()) {
- long long major_total = -1, major_marked = -1, los_total = -1, los_marked = -1;
- if (binary_protocol_is_heavy_enabled ())
- count_cards (&major_total, &major_marked, &los_total, &los_marked);
- binary_protocol_world_restarting (generation, sgen_timestamp (), major_total, major_marked, los_total, los_marked);
- }
-
/* notify the profiler of the leftovers */
/* FIXME this is the wrong spot at we can STW for non collection reasons. */
if (G_UNLIKELY (mono_profiler_events & MONO_PROFILE_GC_MOVES))
- sgen_gc_event_moves ();
- mono_profiler_gc_event (MONO_GC_EVENT_PRE_START_WORLD, generation);
- MONO_GC_WORLD_RESTART_BEGIN (generation);
+ mono_sgen_gc_event_moves ();
+
FOREACH_THREAD (info) {
- info->stack_start = NULL;
+ info->client_info.stack_start = NULL;
#ifdef USE_MONO_CTX
- memset (&info->ctx, 0, sizeof (MonoContext));
+ memset (&info->client_info.ctx, 0, sizeof (MonoContext));
#else
- memset (&info->regs, 0, sizeof (info->regs));
+ memset (&info->client_info.regs, 0, sizeof (info->client_info.regs));
#endif
} END_FOREACH_THREAD
TV_GETTIME (start_handshake);
if (mono_thread_info_unified_management_enabled ())
- count = sgen_unified_suspend_restart_world ();
+ sgen_unified_suspend_restart_world ();
else
- count = sgen_thread_handshake (FALSE);
-
+ sgen_thread_handshake (FALSE);
TV_GETTIME (end_sw);
time_restart_world += TV_ELAPSED (start_handshake, end_sw);
usec = TV_ELAPSED (stop_world_time, end_sw);
max_pause_usec = MAX (usec, max_pause_usec);
- world_is_stopped = FALSE;
-
- SGEN_LOG (2, "restarted %d thread(s) (pause time: %d usec, max: %d)", count, (int)usec, (int)max_pause_usec);
- mono_profiler_gc_event (MONO_GC_EVENT_POST_START_WORLD, generation);
- MONO_GC_WORLD_RESTART_END (generation);
- binary_protocol_world_restarted (generation, sgen_timestamp ());
+ SGEN_LOG (2, "restarted (pause time: %d usec, max: %d)", (int)usec, (int)max_pause_usec);
/*
* We must release the thread info suspend lock after doing
*/
release_gc_locks ();
- sgen_try_free_some_memory = TRUE;
-
- if (sgen_need_bridge_processing ())
- sgen_bridge_processing_finish (generation);
-
TV_GETTIME (end_bridge);
bridge_usec = TV_ELAPSED (end_sw, end_bridge);
timing [0].stw_time = usec;
timing [0].bridge_time = bridge_usec;
}
-
- sgen_memgov_collection_end (generation, timing, timing ? 2 : 0);
-
- return count;
-}
-
-gboolean
-sgen_is_world_stopped (void)
-{
- return world_is_stopped;
}
void
-sgen_init_stw (void)
+mono_sgen_init_stw (void)
{
mono_counters_register ("World stop", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_stop_world);
mono_counters_register ("World restart", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_restart_world);
This is used by TP and finalizer threads.
FIXME Use an atomic variable for this to avoid everyone taking the GC LOCK.
*/
- if (info->gc_disabled) {
+ if (info->client_info.gc_disabled) {
return FALSE;
}
We have detected that this thread is failing/dying, ignore it.
FIXME: can't we merge this with thread_is_dying?
*/
- if (info->skip) {
+ if (info->client_info.skip) {
return FALSE;
}
char *stack_start;
/* Once we remove the old suspend code, we should move sgen to directly access the state in MonoThread */
- info->stopped_domain = mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
- info->stopped_ip = (gpointer) MONO_CONTEXT_GET_IP (&mono_thread_info_get_suspend_state (info)->ctx);
+ info->client_info.stopped_domain = (MonoDomain *)mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
+ info->client_info.stopped_ip = (gpointer) MONO_CONTEXT_GET_IP (&mono_thread_info_get_suspend_state (info)->ctx);
stack_start = (char*)MONO_CONTEXT_GET_SP (&mono_thread_info_get_suspend_state (info)->ctx) - REDZONE_SIZE;
/* altstack signal handler, sgen can't handle them, mono-threads should have handled this. */
- if (stack_start < (char*)info->stack_start_limit || stack_start >= (char*)info->stack_end)
+ if (stack_start < (char*)info->client_info.stack_start_limit || stack_start >= (char*)info->client_info.stack_end)
g_error ("BAD STACK");
- info->stack_start = stack_start;
+ info->client_info.stack_start = stack_start;
#ifdef USE_MONO_CTX
- info->ctx = mono_thread_info_get_suspend_state (info)->ctx;
+ info->client_info.ctx = mono_thread_info_get_suspend_state (info)->ctx;
#else
g_assert_not_reached ();
#endif
}
-static int
+static void
sgen_unified_suspend_stop_world (void)
{
int restart_counter;
SgenThreadInfo *info;
- int count = 0;
int sleep_duration = -1;
mono_threads_begin_global_suspend ();
THREADS_STW_DEBUG ("[GC-STW-BEGIN] *** BEGIN SUSPEND *** \n");
FOREACH_THREAD_SAFE (info) {
- info->skip = FALSE;
- info->suspend_done = FALSE;
+ info->client_info.skip = FALSE;
+ info->client_info.suspend_done = FALSE;
if (sgen_is_thread_in_current_stw (info)) {
- info->skip = !mono_thread_info_begin_suspend (info, FALSE);
- THREADS_STW_DEBUG ("[GC-STW-BEGIN-SUSPEND] SUSPEND thread %p skip %d\n", mono_thread_info_get_tid (info), info->skip);
- if (!info->skip)
- ++count;
+ info->client_info.skip = !mono_thread_info_begin_suspend (info, FALSE);
+ THREADS_STW_DEBUG ("[GC-STW-BEGIN-SUSPEND] SUSPEND thread %p skip %d\n", mono_thread_info_get_tid (info), info->client_info.skip);
} else {
- THREADS_STW_DEBUG ("[GC-STW-BEGIN-SUSPEND] IGNORE thread %p skip %d\n", mono_thread_info_get_tid (info), info->skip);
+ THREADS_STW_DEBUG ("[GC-STW-BEGIN-SUSPEND] IGNORE thread %p skip %d\n", mono_thread_info_get_tid (info), info->client_info.skip);
}
} END_FOREACH_THREAD_SAFE
- mono_thread_info_current ()->suspend_done = TRUE;
+ mono_thread_info_current ()->client_info.suspend_done = TRUE;
mono_threads_wait_pending_operations ();
for (;;) {
restart_counter = 0;
FOREACH_THREAD_SAFE (info) {
- if (info->suspend_done || !sgen_is_thread_in_current_stw (info)) {
- THREADS_STW_DEBUG ("[GC-STW-RESTART] IGNORE thread %p not been processed done %d current %d\n", mono_thread_info_get_tid (info), info->suspend_done, !sgen_is_thread_in_current_stw (info));
+ if (info->client_info.suspend_done || !sgen_is_thread_in_current_stw (info)) {
+ THREADS_STW_DEBUG ("[GC-STW-RESTART] IGNORE thread %p not been processed done %d current %d\n", mono_thread_info_get_tid (info), info->client_info.suspend_done, !sgen_is_thread_in_current_stw (info));
continue;
}
- We haven't accepted the previous suspend as good.
- We haven't gave up on it for this STW (it's either bad or asked not to)
*/
- if (!mono_threads_core_check_suspend_result (info)) {
+ if (!mono_thread_info_check_suspend_result (info)) {
THREADS_STW_DEBUG ("[GC-STW-RESTART] SKIP thread %p failed to finish to suspend\n", mono_thread_info_get_tid (info));
- info->skip = TRUE;
+ info->client_info.skip = TRUE;
} else if (mono_thread_info_in_critical_location (info)) {
gboolean res;
g_assert (mono_thread_info_suspend_count (info) == 1);
if (res)
++restart_counter;
else
- info->skip = TRUE;
+ info->client_info.skip = TRUE;
} else {
THREADS_STW_DEBUG ("[GC-STW-RESTART] DONE thread %p deemed fully suspended\n", mono_thread_info_get_tid (info));
- g_assert (!info->in_critical_region);
- info->suspend_done = TRUE;
+ g_assert (!info->client_info.in_critical_region);
+ info->client_info.suspend_done = TRUE;
}
} END_FOREACH_THREAD_SAFE
gboolean res = mono_thread_info_begin_suspend (info, FALSE);
THREADS_STW_DEBUG ("[GC-STW-RESTART] SUSPEND thread %p skip %d\n", mono_thread_info_get_tid (info), res);
if (!res)
- info->skip = TRUE;
+ info->client_info.skip = TRUE;
}
} END_FOREACH_THREAD_SAFE
FOREACH_THREAD_SAFE (info) {
if (sgen_is_thread_in_current_stw (info)) {
THREADS_STW_DEBUG ("[GC-STW-SUSPEND-END] thread %p is suspended\n", mono_thread_info_get_tid (info));
- g_assert (info->suspend_done);
+ g_assert (info->client_info.suspend_done);
update_sgen_info (info);
} else {
- g_assert (!info->suspend_done || info == mono_thread_info_current ());
+ g_assert (!info->client_info.suspend_done || info == mono_thread_info_current ());
}
} END_FOREACH_THREAD_SAFE
-
- return count;
}
-static int
+static void
sgen_unified_suspend_restart_world (void)
{
SgenThreadInfo *info;
- int count = 0;
THREADS_STW_DEBUG ("[GC-STW-END] *** BEGIN RESUME ***\n");
FOREACH_THREAD_SAFE (info) {
if (sgen_is_thread_in_current_stw (info)) {
g_assert (mono_thread_info_begin_resume (info));
THREADS_STW_DEBUG ("[GC-STW-RESUME-WORLD] RESUME thread %p\n", mono_thread_info_get_tid (info));
- ++count;
} else {
THREADS_STW_DEBUG ("[GC-STW-RESUME-WORLD] IGNORE thread %p\n", mono_thread_info_get_tid (info));
}
mono_threads_wait_pending_operations ();
mono_threads_end_global_suspend ();
- return count;
}
#endif
projects / mono.git / blobdiff