1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Fri Dec 21 11:45:34 2012 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jan 03 16:28:22 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -478,15 +478,18 @@
1.11 // It resets the global marking data structures, as well as the
1.12 // task local ones; should be called during initial mark.
1.13 void reset();
1.14 - // It resets all the marking data structures.
1.15 - void clear_marking_state(bool clear_overflow = true);
1.16 +
1.17 + // Resets all the marking data structures. Called when we have to restart
1.18 + // marking or when marking completes (via set_non_marking_state below).
1.19 + void reset_marking_state(bool clear_overflow = true);
1.20 +
1.21 + // We do this after we're done with marking so that the marking data
1.22 + // structures are initialised to a sensible and predictable state.
1.23 + void set_non_marking_state();
1.24
1.25 // It should be called to indicate which phase we're in (concurrent
1.26 // mark or remark) and how many threads are currently active.
1.27 void set_phase(uint active_tasks, bool concurrent);
1.28 - // We do this after we're done with marking so that the marking data
1.29 - // structures are initialised to a sensible and predictable state.
1.30 - void set_non_marking_state();
1.31
1.32 // prints all gathered CM-related statistics
1.33 void print_stats();
