RFR (XXS): (7u60) 8033443: Test8000311 fails after latest changes to parallelize string and symbol table unlink

[Mikael Gerdin]

Thomas,

On Thursday 06 February 2014 17.28.19 Thomas Schatzl wrote:
> Hi all,
> 
>   could I get reviews for the backport of JDK-8033443 to 7u60?
> 
> There was a merge error due to a single additional empty line (: , so
> per rules I would like you to have another look at it.
> 
> In this backport I decided to remove that line.
> 
> I.e.
> @@ -5218,21 +5221,20 @@
>        SymbolTable::clear_parallel_claimed_index();
>      }
>    }
> 
>    ~G1StringSymbolTableUnlinkTask() {
> -    guarantee(!_process_strings || StringTable::parallel_claimed_index() >=
> _initial_string_table_size, +    guarantee(!_process_strings ||
> !_do_in_parallel || StringTable::parallel_claimed_index() >=
> _initial_string_table_size, err_msg("claim value "INT32_FORMAT" after
> unlink less than initial string table size "INT32_FORMAT,
> StringTable::parallel_claimed_index(), _initial_string_table_size)); -   
> guarantee(!_process_symbols || SymbolTable::parallel_claimed_index() >=
> _initial_symbol_table_size, +    guarantee(!_process_symbols ||
> !_do_in_parallel || SymbolTable::parallel_claimed_index() >=
> _initial_symbol_table_size, err_msg("claim value "INT32_FORMAT" after
> unlink less than initial symbol table size "INT32_FORMAT,
> SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); -
>    }
> ^^^^-- that single additional line.
> 
> Webrev:
> http://cr.openjdk.java.net/~tschatzl/8033545/webrev.7u60/

Ok, reviewed.
/Mikael

> 
> Original webrev:
> http://cr.openjdk.java.net/~tschatzl/8033545/webrev/
> 
> CR:
> https://bugs.openjdk.java.net/browse/JDK-8033443
> 
> Testing:
> local compilation.
> 
> Thanks,
>   Thomas