/*
* Allowed transitions:
*
- * | from \ to | NOT WORKING | WORKING | WORK ENQUEUED | NURSERY COLLECTION |
- * |--------------------+-------------+---------+---------------+--------------------|
- * | NOT WORKING | - | - | main | main |
- * | WORKING | worker | - | main | main |
- * | WORK ENQUEUED | - | worker | - | main |
- * | NURSERY COLLECTION | - | - | main | - |
+ * | from \ to | NOT WORKING | WORKING | WORK ENQUEUED |
+ * |--------------------+-------------+---------+---------------+
+ * | NOT WORKING | - | - | main |
+ * | WORKING | worker | - | main |
+ * | WORK ENQUEUED | - | worker | - |
*
* The WORK ENQUEUED state guarantees that the worker thread will inspect the queue again at
* least once. Only after looking at the queue will it go back to WORKING, and then,
enum {
STATE_NOT_WORKING,
STATE_WORKING,
- STATE_WORK_ENQUEUED,
- STATE_NURSERY_COLLECTION
+ STATE_WORK_ENQUEUED
};
typedef gint32 State;
return InterlockedCompareExchange (&workers_state, new_state, old_state) == old_state;
}
-static void
-assert_nursery_collection (State state)
-{
- SGEN_ASSERT (0, state == STATE_NURSERY_COLLECTION, "Must be in the nursery collection state");
-}
-
static gboolean
state_is_working_or_enqueued (State state)
{
return state == STATE_WORKING || state == STATE_WORK_ENQUEUED;
}
-static void
-workers_signal_enqueue_work (gboolean from_nursery_collection)
+void
+sgen_workers_ensure_awake (void)
{
State old_state;
gboolean did_set_state;
do {
old_state = workers_state;
- if (from_nursery_collection)
- assert_nursery_collection (old_state);
- else
- SGEN_ASSERT (0, old_state != STATE_NURSERY_COLLECTION, "If we're not in a nursery collection, how come the state is NURSERY COLLECTION?");
-
if (old_state == STATE_WORK_ENQUEUED)
break;
did_set_state = set_state (old_state, STATE_WORK_ENQUEUED);
- if (from_nursery_collection)
- SGEN_ASSERT (0, did_set_state, "Nobody else should be mutating the state");
} while (!did_set_state);
if (!state_is_working_or_enqueued (old_state))
sgen_thread_pool_idle_signal ();
}
-void
-sgen_workers_ensure_awake (void)
-{
- SGEN_ASSERT (0, workers_state != STATE_NURSERY_COLLECTION, "Can't wake workers during nursery collection");
- workers_signal_enqueue_work (FALSE);
-}
-
static void
worker_try_finish (void)
{
old_state = workers_state;
SGEN_ASSERT (0, old_state != STATE_NOT_WORKING, "How did we get from doing idle work to NOT WORKING without setting it ourselves?");
- if (old_state == STATE_NURSERY_COLLECTION)
- return;
if (old_state == STATE_WORK_ENQUEUED)
return;
SGEN_ASSERT (0, old_state == STATE_WORKING, "What other possibility is there?");
sgen_workers_ensure_awake ();
}
-void
-sgen_workers_signal_start_nursery_collection_and_wait (void)
-{
- State old_state;
-
- do {
- old_state = workers_state;
-
- if (old_state != STATE_NOT_WORKING)
- SGEN_ASSERT (0, old_state != STATE_NURSERY_COLLECTION, "Why are we transitioning to NURSERY COLLECTION when we're already there?");
- } while (!set_state (old_state, STATE_NURSERY_COLLECTION));
-
- sgen_thread_pool_idle_wait ();
-
- assert_nursery_collection (workers_state);
-}
-
-void
-sgen_workers_signal_finish_nursery_collection (void)
-{
- assert_nursery_collection (workers_state);
- workers_signal_enqueue_work (TRUE);
-}
-
static gboolean
workers_get_work (WorkerData *data)
{
}
static void
-concurrent_enqueue_check (char *obj)
+concurrent_enqueue_check (GCObject *obj)
{
g_assert (sgen_concurrent_collection_in_progress ());
g_assert (!sgen_ptr_in_nursery (obj));
{
WorkerData *data = data_untyped;
- if (!continue_idle_func ())
- return;
-
+ SGEN_ASSERT (0, continue_idle_func (), "Why are we called when we're not supposed to work?");
SGEN_ASSERT (0, sgen_concurrent_collection_in_progress (), "The worker should only mark in concurrent collections.");
- SGEN_ASSERT (0, sgen_get_current_collection_generation () != GENERATION_NURSERY, "Why are we doing work while there's a nursery collection happening?");
if (workers_state == STATE_WORK_ENQUEUED) {
set_state (STATE_WORK_ENQUEUED, STATE_WORKING);
sgen_workers_init (int num_workers)
{
int i;
- void *workers_data_ptrs [num_workers];
+ void **workers_data_ptrs = alloca(num_workers * sizeof(void *));
if (!sgen_get_major_collector ()->is_concurrent) {
sgen_thread_pool_init (num_workers, thread_pool_init_func, NULL, NULL, NULL);
init_distribute_gray_queue ();
for (i = 0; i < workers_num; ++i)
- workers_data_ptrs [i] = &workers_data [i];
+ workers_data_ptrs [i] = (void *) &workers_data [i];
sgen_thread_pool_init (num_workers, thread_pool_init_func, marker_idle_func, continue_idle_func, workers_data_ptrs);
idle_func_object_ops = object_ops;
mono_memory_write_barrier ();
- workers_signal_enqueue_work (FALSE);
+ sgen_workers_ensure_awake ();
}
void
{
int i;
- SGEN_ASSERT (0, workers_state != STATE_NURSERY_COLLECTION, "Can't be in nursery collection when joining");
-
if (!collection_needs_workers ())
return;