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 #3487 from marek-safar/rs-Threading
[mono.git]
/
mono
/
metadata
/
sgen-stw.c
diff --git
a/mono/metadata/sgen-stw.c
b/mono/metadata/sgen-stw.c
index 17f4d6e7f7d60769ee643adc29a289d444c9dd1d..60e5933450fba844a1888577df232f4255102127 100644
(file)
--- a/
mono/metadata/sgen-stw.c
+++ b/
mono/metadata/sgen-stw.c
@@
-209,6
+209,8
@@
sgen_client_stop_world (int generation)
acquire_gc_locks ();
acquire_gc_locks ();
+ mono_profiler_gc_event (MONO_GC_EVENT_PRE_STOP_WORLD_LOCKED, generation);
+
/* We start to scan after locks are taking, this ensures we won't be interrupted. */
sgen_process_togglerefs ();
/* We start to scan after locks are taking, this ensures we won't be interrupted. */
sgen_process_togglerefs ();
@@
-240,7
+242,7
@@
sgen_client_stop_world (int generation)
/* LOCKING: assumes the GC lock is held */
void
/* LOCKING: assumes the GC lock is held */
void
-sgen_client_restart_world (int generation,
GGTimingInfo *timing
)
+sgen_client_restart_world (int generation,
gint64 *stw_time
)
{
TV_DECLARE (end_sw);
TV_DECLARE (start_handshake);
{
TV_DECLARE (end_sw);
TV_DECLARE (start_handshake);
@@
-283,9
+285,9
@@
sgen_client_restart_world (int generation, GGTimingInfo *timing)
*/
release_gc_locks ();
*/
release_gc_locks ();
- if (timing) {
- timing [0].stw_time = usec;
- }
+ mono_profiler_gc_event (MONO_GC_EVENT_POST_START_WORLD_UNLOCKED, generation);
+
+ *stw_time = usec;
}
void
}
void