stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Thomas Schatzl 2016-04-01 12:46:06 +02:00
commit 9be0552a61
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/gc/g1/g1FromCardCache.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -37,8 +37,8 @@ void G1FromCardCache::initialize(uint num_par_rem_sets, uint max_num_regions) {
guarantee(_cache == NULL, "Should not call this multiple times"); guarantee(_cache == NULL, "Should not call this multiple times");
_max_regions = max_num_regions; _max_regions = max_num_regions;
_cache = Padded2DArray<int, mtGC>::create_unfreeable(num_par_rem_sets, _cache = Padded2DArray<int, mtGC>::create_unfreeable(_max_regions,
_max_regions, num_par_rem_sets,
&_static_mem_size); &_static_mem_size);
invalidate(0, _max_regions); invalidate(0, _max_regions);

11
hotspot/src/share/vm/gc/g1/g1FromCardCache.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,8 +32,11 @@
// a per-region and per-thread basis. // a per-region and per-thread basis.
class G1FromCardCache : public AllStatic { class G1FromCardCache : public AllStatic {
private: private:
// Array of card indices. Indexed by thread X and heap region to minimize // Array of card indices. Indexed by heap region (rows) and thread (columns) to minimize
// thread contention. // thread contention.
// This order minimizes the time to clear all entries for a given region during region
// freeing. I.e. a single clear of a single memory area instead of multiple separate
// accesses with a large stride per region.
static int** _cache; static int** _cache;
static uint _max_regions; static uint _max_regions;
static size_t _static_mem_size; static size_t _static_mem_size;
@ -58,11 +61,11 @@ class G1FromCardCache : public AllStatic {
} }
static int at(uint worker_id, uint region_idx) { static int at(uint worker_id, uint region_idx) {
return _cache[worker_id][region_idx]; return _cache[region_idx][worker_id];
} }
static void set(uint worker_id, uint region_idx, int val) { static void set(uint worker_id, uint region_idx, int val) {
_cache[worker_id][region_idx] = val; _cache[region_idx][worker_id] = val;
} }
static void initialize(uint num_par_rem_sets, uint max_num_regions); static void initialize(uint num_par_rem_sets, uint max_num_regions);

4
hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,8 @@
#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP #ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP #define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
#include "memory/allocation.hpp"
class HeapRegionBounds : public AllStatic { class HeapRegionBounds : public AllStatic {
private: private:
// Minimum region size; we won't go lower than that. // Minimum region size; we won't go lower than that.

1
hotspot/src/share/vm/logging/logPrefix.hpp
View File

@ -58,6 +58,7 @@ DEBUG_ONLY(size_t Test_log_prefix_prefixer(char* buf, size_t len);)
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap, region)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, heap, region)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, freelist)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, freelist)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, humongous)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ihop)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, ihop)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, liveness)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, liveness)) \
LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, marking)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, marking)) \