projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5428 from kumpera/wasm-support-p2
[mono.git]
/
mono
/
sgen
/
sgen-gc.c
diff --git
a/mono/sgen/sgen-gc.c
b/mono/sgen/sgen-gc.c
index 1c54fc261f9ecd5133b5edc84f467de7169917ec..d5416f0df3630ee6a6bc5b4781bc0e9c5442873c 100644
(file)
--- a/
mono/sgen/sgen-gc.c
+++ b/
mono/sgen/sgen-gc.c
@@
-195,6
+195,7
@@
#include <mono/utils/memcheck.h>
#include <mono/utils/mono-mmap-internals.h>
#include <mono/utils/memcheck.h>
#include <mono/utils/mono-mmap-internals.h>
+#include <mono/utils/unlocked.h>
#undef pthread_create
#undef pthread_join
#undef pthread_create
#undef pthread_join
@@
-1855,7
+1856,7
@@
collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_
major_collector.finish_nursery_collection ();
TV_GETTIME (last_minor_collection_end_tv);
major_collector.finish_nursery_collection ();
TV_GETTIME (last_minor_collection_end_tv);
-
Inter
lockedAdd64 (&gc_stats.minor_gc_time, TV_ELAPSED (last_minor_collection_start_tv, last_minor_collection_end_tv));
+
Un
lockedAdd64 (&gc_stats.minor_gc_time, TV_ELAPSED (last_minor_collection_start_tv, last_minor_collection_end_tv));
sgen_debug_dump_heap ("minor", InterlockedRead (&gc_stats.minor_gc_count) - 1, NULL);
sgen_debug_dump_heap ("minor", InterlockedRead (&gc_stats.minor_gc_count) - 1, NULL);
@@
-2349,7
+2350,7
@@
major_do_collection (const char *reason, gboolean is_overflow, gboolean forced)
sgen_gray_object_queue_dispose (&gc_thread_gray_queue);
TV_GETTIME (time_end);
sgen_gray_object_queue_dispose (&gc_thread_gray_queue);
TV_GETTIME (time_end);
-
Inter
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end));
+
Un
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end));
/* FIXME: also report this to the user, preferably in gc-end. */
if (major_collector.get_and_reset_num_major_objects_marked)
/* FIXME: also report this to the user, preferably in gc-end. */
if (major_collector.get_and_reset_num_major_objects_marked)
@@
-2385,7
+2386,7
@@
major_start_concurrent_collection (const char *reason)
num_objects_marked = major_collector.get_and_reset_num_major_objects_marked ();
TV_GETTIME (time_end);
num_objects_marked = major_collector.get_and_reset_num_major_objects_marked ();
TV_GETTIME (time_end);
-
Inter
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end));
+
Un
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end));
current_collection_generation = -1;
}
current_collection_generation = -1;
}
@@
-2413,7
+2414,7
@@
major_update_concurrent_collection (void)
sgen_los_update_cardtable_mod_union ();
TV_GETTIME (total_end);
sgen_los_update_cardtable_mod_union ();
TV_GETTIME (total_end);
-
Inter
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end));
+
Un
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end));
}
static void
}
static void
@@
-2435,7
+2436,7
@@
major_finish_concurrent_collection (gboolean forced)
sgen_workers_stop_all_workers (GENERATION_OLD);
SGEN_TV_GETTIME (time_major_conc_collection_end);
sgen_workers_stop_all_workers (GENERATION_OLD);
SGEN_TV_GETTIME (time_major_conc_collection_end);
-
Inter
lockedAdd64 (&gc_stats.major_gc_time_concurrent, SGEN_TV_ELAPSED (time_major_conc_collection_start, time_major_conc_collection_end));
+
Un
lockedAdd64 (&gc_stats.major_gc_time_concurrent, SGEN_TV_ELAPSED (time_major_conc_collection_start, time_major_conc_collection_end));
major_collector.update_cardtable_mod_union ();
sgen_los_update_cardtable_mod_union ();
major_collector.update_cardtable_mod_union ();
sgen_los_update_cardtable_mod_union ();
@@
-2450,7
+2451,7
@@
major_finish_concurrent_collection (gboolean forced)
sgen_gray_object_queue_dispose (&gc_thread_gray_queue);
TV_GETTIME (total_end);
sgen_gray_object_queue_dispose (&gc_thread_gray_queue);
TV_GETTIME (total_end);
-
Inter
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end));
+
Un
lockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end));
current_collection_generation = -1;
}
current_collection_generation = -1;
}