hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
author brutisso
Fri, 09 Oct 2015 20:31:56 +0200
changeset 33152 6ad7fe735042
parent 30764 fec48bf5a827
child 35061 be6025ebffea
permissions -rw-r--r--
8139293: TestGCEventMixedWithG1ConcurrentMark.java fails after JDK-8134953 Reviewed-by: ecaspole, jwilhelm
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 29800
diff changeset
     2
 * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4636
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4636
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4636
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    25
#include "precompiled.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 29800
diff changeset
    26
#include "gc/shared/genCollectedHeap.hpp"
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 29800
diff changeset
    27
#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    28
#include "memory/resourceArea.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "memory/universe.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    30
#include "oops/oop.inline.hpp"
14583
d70ee55535f4 8003935: Simplify the needed includes for using Thread::current()
stefank
parents: 10565
diff changeset
    31
#include "runtime/thread.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    32
#include "utilities/copy.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    33
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    34
// Thread-Local Edens support
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    35
489c9b5090e2 Initial load
duke
parents:
diff changeset
    36
// static member initialization
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    37
size_t           ThreadLocalAllocBuffer::_max_size       = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    38
unsigned         ThreadLocalAllocBuffer::_target_refills = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    39
GlobalTLABStats* ThreadLocalAllocBuffer::_global_stats   = NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
489c9b5090e2 Initial load
duke
parents:
diff changeset
    41
void ThreadLocalAllocBuffer::clear_before_allocation() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    42
  _slow_refill_waste += (unsigned)remaining();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    43
  make_parsable(true);   // also retire the TLAB
489c9b5090e2 Initial load
duke
parents:
diff changeset
    44
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    45
489c9b5090e2 Initial load
duke
parents:
diff changeset
    46
void ThreadLocalAllocBuffer::accumulate_statistics_before_gc() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    47
  global_stats()->initialize();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    48
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    49
  for (JavaThread *thread = Threads::first(); thread != NULL; thread = thread->next()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    50
    thread->tlab().accumulate_statistics();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    51
    thread->tlab().initialize_statistics();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    52
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    53
489c9b5090e2 Initial load
duke
parents:
diff changeset
    54
  // Publish new stats if some allocation occurred.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    55
  if (global_stats()->allocation() != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    56
    global_stats()->publish();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    57
    if (PrintTLAB) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    58
      global_stats()->print();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    60
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    61
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    62
489c9b5090e2 Initial load
duke
parents:
diff changeset
    63
void ThreadLocalAllocBuffer::accumulate_statistics() {
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    64
  Thread* thread = myThread();
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    65
  size_t capacity = Universe::heap()->tlab_capacity(thread);
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    66
  size_t used     = Universe::heap()->tlab_used(thread);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    67
489c9b5090e2 Initial load
duke
parents:
diff changeset
    68
  _gc_waste += (unsigned)remaining();
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    69
  size_t total_allocated = thread->allocated_bytes();
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    70
  size_t allocated_since_last_gc = total_allocated - _allocated_before_last_gc;
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    71
  _allocated_before_last_gc = total_allocated;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    72
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
  if (PrintTLAB && (_number_of_refills > 0 || Verbose)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
    print_stats("gc");
489c9b5090e2 Initial load
duke
parents:
diff changeset
    75
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
489c9b5090e2 Initial load
duke
parents:
diff changeset
    77
  if (_number_of_refills > 0) {
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    78
    // Update allocation history if a reasonable amount of eden was allocated.
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    79
    bool update_allocation_history = used > 0.5 * capacity;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    80
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
    if (update_allocation_history) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
      // Average the fraction of eden allocated in a tlab by this
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
      // thread for use in the next resize operation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    84
      // _gc_waste is not subtracted because it's included in
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
      // "used".
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    86
      // The result can be larger than 1.0 due to direct to old allocations.
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    87
      // These allocations should ideally not be counted but since it is not possible
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    88
      // to filter them out here we just cap the fraction to be at most 1.0.
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
    89
      double alloc_frac = MIN2(1.0, (double) allocated_since_last_gc / used);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
      _allocation_fraction.sample(alloc_frac);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
    global_stats()->update_allocating_threads();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
    global_stats()->update_number_of_refills(_number_of_refills);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
    global_stats()->update_allocation(_number_of_refills * desired_size());
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
    global_stats()->update_gc_waste(_gc_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    96
    global_stats()->update_slow_refill_waste(_slow_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
    global_stats()->update_fast_refill_waste(_fast_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
489c9b5090e2 Initial load
duke
parents:
diff changeset
    99
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   100
    assert(_number_of_refills == 0 && _fast_refill_waste == 0 &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   101
           _slow_refill_waste == 0 && _gc_waste          == 0,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   102
           "tlab stats == 0");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   103
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   104
  global_stats()->update_slow_allocations(_slow_allocations);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   105
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   106
489c9b5090e2 Initial load
duke
parents:
diff changeset
   107
// Fills the current tlab with a dummy filler array to create
489c9b5090e2 Initial load
duke
parents:
diff changeset
   108
// an illusion of a contiguous Eden and optionally retires the tlab.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   109
// Waste accounting should be done in caller as appropriate; see,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   110
// for example, clear_before_allocation().
489c9b5090e2 Initial load
duke
parents:
diff changeset
   111
void ThreadLocalAllocBuffer::make_parsable(bool retire) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   112
  if (end() != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   113
    invariants();
7724
a92d706dbdd5 7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis
phh
parents: 7397
diff changeset
   114
a92d706dbdd5 7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis
phh
parents: 7397
diff changeset
   115
    if (retire) {
a92d706dbdd5 7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis
phh
parents: 7397
diff changeset
   116
      myThread()->incr_allocated_bytes(used_bytes());
a92d706dbdd5 7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis
phh
parents: 7397
diff changeset
   117
    }
a92d706dbdd5 7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis
phh
parents: 7397
diff changeset
   118
4636
90e004691873 6902115: G1:assert(ignore_max_completed||thread->is_Java_thread()||SafepointSynchronize::is_at_safepoint())
johnc
parents: 2105
diff changeset
   119
    CollectedHeap::fill_with_object(top(), hard_end(), retire);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
    if (retire || ZeroTLAB) {  // "Reset" the TLAB
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
      set_start(NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   123
      set_top(NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
      set_pf_top(NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
      set_end(NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   127
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
  assert(!(retire || ZeroTLAB)  ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
         (start() == NULL && end() == NULL && top() == NULL),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
         "TLAB must be reset");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
void ThreadLocalAllocBuffer::resize_all_tlabs() {
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   134
  if (ResizeTLAB) {
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   135
    for (JavaThread *thread = Threads::first(); thread != NULL; thread = thread->next()) {
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   136
      thread->tlab().resize();
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   137
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   138
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   139
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   140
489c9b5090e2 Initial load
duke
parents:
diff changeset
   141
void ThreadLocalAllocBuffer::resize() {
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   142
  // Compute the next tlab size using expected allocation amount
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   143
  assert(ResizeTLAB, "Should not call this otherwise");
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   144
  size_t alloc = (size_t)(_allocation_fraction.average() *
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   145
                          (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize));
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   146
  size_t new_size = alloc / _target_refills;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   147
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   148
  new_size = MIN2(MAX2(new_size, min_size()), max_size());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   150
  size_t aligned_new_size = align_object_size(new_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   152
  if (PrintTLAB && Verbose) {
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   153
    gclog_or_tty->print("TLAB new size: thread: " INTPTR_FORMAT " [id: %2d]"
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   154
                        " refills %d  alloc: %8.6f desired_size: " SIZE_FORMAT " -> " SIZE_FORMAT "\n",
29800
fa5f7a2bf717 8076073: shared: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 28511
diff changeset
   155
                        p2i(myThread()), myThread()->osthread()->thread_id(),
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   156
                        _target_refills, _allocation_fraction.average(), desired_size(), aligned_new_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   157
  }
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   158
  set_desired_size(aligned_new_size);
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   159
  set_refill_waste_limit(initial_refill_waste_limit());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   160
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   161
489c9b5090e2 Initial load
duke
parents:
diff changeset
   162
void ThreadLocalAllocBuffer::initialize_statistics() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   163
    _number_of_refills = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   164
    _fast_refill_waste = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
    _slow_refill_waste = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   166
    _gc_waste          = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
    _slow_allocations  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   168
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   169
489c9b5090e2 Initial load
duke
parents:
diff changeset
   170
void ThreadLocalAllocBuffer::fill(HeapWord* start,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   171
                                  HeapWord* top,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   172
                                  size_t    new_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
  _number_of_refills++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
  if (PrintTLAB && Verbose) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
    print_stats("fill");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   176
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   177
  assert(top <= start + new_size - alignment_reserve(), "size too small");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   178
  initialize(start, top, start + new_size - alignment_reserve());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
  // Reset amount of internal fragmentation
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
  set_refill_waste_limit(initial_refill_waste_limit());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   182
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
489c9b5090e2 Initial load
duke
parents:
diff changeset
   184
void ThreadLocalAllocBuffer::initialize(HeapWord* start,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   185
                                        HeapWord* top,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
                                        HeapWord* end) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
  set_start(start);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
  set_top(top);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   189
  set_pf_top(top);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   190
  set_end(end);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
  invariants();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   192
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
489c9b5090e2 Initial load
duke
parents:
diff changeset
   194
void ThreadLocalAllocBuffer::initialize() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   195
  initialize(NULL,                    // start
489c9b5090e2 Initial load
duke
parents:
diff changeset
   196
             NULL,                    // top
489c9b5090e2 Initial load
duke
parents:
diff changeset
   197
             NULL);                   // end
489c9b5090e2 Initial load
duke
parents:
diff changeset
   198
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
  set_desired_size(initial_desired_size());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
489c9b5090e2 Initial load
duke
parents:
diff changeset
   201
  // Following check is needed because at startup the main (primordial)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   202
  // thread is initialized before the heap is.  The initialization for
489c9b5090e2 Initial load
duke
parents:
diff changeset
   203
  // this thread is redone in startup_initialization below.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   204
  if (Universe::heap() != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   205
    size_t capacity   = Universe::heap()->tlab_capacity(myThread()) / HeapWordSize;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   206
    double alloc_frac = desired_size() * target_refills() / (double) capacity;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   207
    _allocation_fraction.sample(alloc_frac);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   208
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   209
489c9b5090e2 Initial load
duke
parents:
diff changeset
   210
  set_refill_waste_limit(initial_refill_waste_limit());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   211
489c9b5090e2 Initial load
duke
parents:
diff changeset
   212
  initialize_statistics();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   213
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   214
489c9b5090e2 Initial load
duke
parents:
diff changeset
   215
void ThreadLocalAllocBuffer::startup_initialization() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   216
489c9b5090e2 Initial load
duke
parents:
diff changeset
   217
  // Assuming each thread's active tlab is, on average,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   218
  // 1/2 full at a GC
489c9b5090e2 Initial load
duke
parents:
diff changeset
   219
  _target_refills = 100 / (2 * TLABWasteTargetPercent);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   220
  _target_refills = MAX2(_target_refills, (unsigned)1U);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   221
489c9b5090e2 Initial load
duke
parents:
diff changeset
   222
  _global_stats = new GlobalTLABStats();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   223
489c9b5090e2 Initial load
duke
parents:
diff changeset
   224
  // During jvm startup, the main (primordial) thread is initialized
489c9b5090e2 Initial load
duke
parents:
diff changeset
   225
  // before the heap is initialized.  So reinitialize it now.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   226
  guarantee(Thread::current()->is_Java_thread(), "tlab initialization thread not Java thread");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   227
  Thread::current()->tlab().initialize();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   228
489c9b5090e2 Initial load
duke
parents:
diff changeset
   229
  if (PrintTLAB && Verbose) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   230
    gclog_or_tty->print("TLAB min: " SIZE_FORMAT " initial: " SIZE_FORMAT " max: " SIZE_FORMAT "\n",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   231
                        min_size(), Thread::current()->tlab().initial_desired_size(), max_size());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   234
489c9b5090e2 Initial load
duke
parents:
diff changeset
   235
size_t ThreadLocalAllocBuffer::initial_desired_size() {
28511
3de39f0478f8 8055479: TLAB stability
mgerdin
parents: 24424
diff changeset
   236
  size_t init_sz = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
  if (TLABSize > 0) {
28511
3de39f0478f8 8055479: TLAB stability
mgerdin
parents: 24424
diff changeset
   239
    init_sz = TLABSize / HeapWordSize;
3de39f0478f8 8055479: TLAB stability
mgerdin
parents: 24424
diff changeset
   240
  } else if (global_stats() != NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   241
    // Initial size is a function of the average number of allocating threads.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   242
    unsigned nof_threads = global_stats()->allocating_threads_avg();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   243
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
    init_sz  = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
                      (nof_threads * target_refills());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   246
    init_sz = align_object_size(init_sz);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   247
  }
28511
3de39f0478f8 8055479: TLAB stability
mgerdin
parents: 24424
diff changeset
   248
  init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   249
  return init_sz;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   250
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   251
489c9b5090e2 Initial load
duke
parents:
diff changeset
   252
void ThreadLocalAllocBuffer::print_stats(const char* tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   253
  Thread* thrd = myThread();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   254
  size_t waste = _gc_waste + _slow_refill_waste + _fast_refill_waste;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   255
  size_t alloc = _number_of_refills * _desired_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   256
  double waste_percent = alloc == 0 ? 0.0 :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
                      100.0 * waste / alloc;
22552
a29022212180 8030177: G1: Enable TLAB resizing
brutisso
parents: 14583
diff changeset
   258
  size_t tlab_used  = Universe::heap()->tlab_used(thrd);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   259
  gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   260
                      " desired_size: " SIZE_FORMAT "KB"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   261
                      " slow allocs: %d  refill waste: " SIZE_FORMAT "B"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   262
                      " alloc:%8.5f %8.0fKB refills: %d waste %4.1f%% gc: %dB"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
                      " slow: %dB fast: %dB\n",
29800
fa5f7a2bf717 8076073: shared: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 28511
diff changeset
   264
                      tag, p2i(thrd), thrd->osthread()->thread_id(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   265
                      _desired_size / (K / HeapWordSize),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   266
                      _slow_allocations, _refill_waste_limit * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   267
                      _allocation_fraction.average(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   268
                      _allocation_fraction.average() * tlab_used / K,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   269
                      _number_of_refills, waste_percent,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   270
                      _gc_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   271
                      _slow_refill_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
                      _fast_refill_waste * HeapWordSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   273
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   274
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
void ThreadLocalAllocBuffer::verify() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
  HeapWord* p = start();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   277
  HeapWord* t = top();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   278
  HeapWord* prev_p = NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   279
  while (p < t) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   280
    oop(p)->verify();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   281
    prev_p = p;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   282
    p += oop(p)->size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   283
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   284
  guarantee(p == top(), "end of last object must match end of space");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   285
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   286
489c9b5090e2 Initial load
duke
parents:
diff changeset
   287
Thread* ThreadLocalAllocBuffer::myThread() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   288
  return (Thread*)(((char *)this) +
489c9b5090e2 Initial load
duke
parents:
diff changeset
   289
                   in_bytes(start_offset()) -
489c9b5090e2 Initial load
duke
parents:
diff changeset
   290
                   in_bytes(Thread::tlab_start_offset()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   291
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   292
489c9b5090e2 Initial load
duke
parents:
diff changeset
   293
489c9b5090e2 Initial load
duke
parents:
diff changeset
   294
GlobalTLABStats::GlobalTLABStats() :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   295
  _allocating_threads_avg(TLABAllocationWeight) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   296
489c9b5090e2 Initial load
duke
parents:
diff changeset
   297
  initialize();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   298
489c9b5090e2 Initial load
duke
parents:
diff changeset
   299
  _allocating_threads_avg.sample(1); // One allocating thread at startup
489c9b5090e2 Initial load
duke
parents:
diff changeset
   300
489c9b5090e2 Initial load
duke
parents:
diff changeset
   301
  if (UsePerfData) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
    EXCEPTION_MARK;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   304
    ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   305
489c9b5090e2 Initial load
duke
parents:
diff changeset
   306
    char* cname = PerfDataManager::counter_name("tlab", "allocThreads");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   307
    _perf_allocating_threads =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   308
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_None, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
489c9b5090e2 Initial load
duke
parents:
diff changeset
   310
    cname = PerfDataManager::counter_name("tlab", "fills");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   311
    _perf_total_refills =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   312
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_None, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   313
489c9b5090e2 Initial load
duke
parents:
diff changeset
   314
    cname = PerfDataManager::counter_name("tlab", "maxFills");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   315
    _perf_max_refills =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   316
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_None, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   317
489c9b5090e2 Initial load
duke
parents:
diff changeset
   318
    cname = PerfDataManager::counter_name("tlab", "alloc");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   319
    _perf_allocation =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   320
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   321
489c9b5090e2 Initial load
duke
parents:
diff changeset
   322
    cname = PerfDataManager::counter_name("tlab", "gcWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   323
    _perf_gc_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
489c9b5090e2 Initial load
duke
parents:
diff changeset
   326
    cname = PerfDataManager::counter_name("tlab", "maxGcWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   327
    _perf_max_gc_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   328
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   329
489c9b5090e2 Initial load
duke
parents:
diff changeset
   330
    cname = PerfDataManager::counter_name("tlab", "slowWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   331
    _perf_slow_refill_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   332
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   333
489c9b5090e2 Initial load
duke
parents:
diff changeset
   334
    cname = PerfDataManager::counter_name("tlab", "maxSlowWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   335
    _perf_max_slow_refill_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   336
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   337
489c9b5090e2 Initial load
duke
parents:
diff changeset
   338
    cname = PerfDataManager::counter_name("tlab", "fastWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   339
    _perf_fast_refill_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   340
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   341
489c9b5090e2 Initial load
duke
parents:
diff changeset
   342
    cname = PerfDataManager::counter_name("tlab", "maxFastWaste");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   343
    _perf_max_fast_refill_waste =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   344
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   345
489c9b5090e2 Initial load
duke
parents:
diff changeset
   346
    cname = PerfDataManager::counter_name("tlab", "slowAlloc");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   347
    _perf_slow_allocations =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   348
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_None, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   349
489c9b5090e2 Initial load
duke
parents:
diff changeset
   350
    cname = PerfDataManager::counter_name("tlab", "maxSlowAlloc");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   351
    _perf_max_slow_allocations =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   352
      PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_None, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   353
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   354
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   355
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
void GlobalTLABStats::initialize() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   357
  // Clear counters summarizing info from all threads
489c9b5090e2 Initial load
duke
parents:
diff changeset
   358
  _allocating_threads      = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   359
  _total_refills           = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   360
  _max_refills             = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   361
  _total_allocation        = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   362
  _total_gc_waste          = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   363
  _max_gc_waste            = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   364
  _total_slow_refill_waste = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   365
  _max_slow_refill_waste   = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   366
  _total_fast_refill_waste = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
  _max_fast_refill_waste   = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
  _total_slow_allocations  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   369
  _max_slow_allocations    = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   370
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
void GlobalTLABStats::publish() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   373
  _allocating_threads_avg.sample(_allocating_threads);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
  if (UsePerfData) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   375
    _perf_allocating_threads   ->set_value(_allocating_threads);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   376
    _perf_total_refills        ->set_value(_total_refills);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   377
    _perf_max_refills          ->set_value(_max_refills);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   378
    _perf_allocation           ->set_value(_total_allocation);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   379
    _perf_gc_waste             ->set_value(_total_gc_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   380
    _perf_max_gc_waste         ->set_value(_max_gc_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   381
    _perf_slow_refill_waste    ->set_value(_total_slow_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   382
    _perf_max_slow_refill_waste->set_value(_max_slow_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   383
    _perf_fast_refill_waste    ->set_value(_total_fast_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   384
    _perf_max_fast_refill_waste->set_value(_max_fast_refill_waste);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   385
    _perf_slow_allocations     ->set_value(_total_slow_allocations);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   386
    _perf_max_slow_allocations ->set_value(_max_slow_allocations);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   387
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   388
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   389
489c9b5090e2 Initial load
duke
parents:
diff changeset
   390
void GlobalTLABStats::print() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   391
  size_t waste = _total_gc_waste + _total_slow_refill_waste + _total_fast_refill_waste;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   392
  double waste_percent = _total_allocation == 0 ? 0.0 :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   393
                         100.0 * waste / _total_allocation;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   394
  gclog_or_tty->print("TLAB totals: thrds: %d  refills: %d max: %d"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   395
                      " slow allocs: %d max %d waste: %4.1f%%"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   396
                      " gc: " SIZE_FORMAT "B max: " SIZE_FORMAT "B"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   397
                      " slow: " SIZE_FORMAT "B max: " SIZE_FORMAT "B"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   398
                      " fast: " SIZE_FORMAT "B max: " SIZE_FORMAT "B\n",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   399
                      _allocating_threads,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   400
                      _total_refills, _max_refills,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   401
                      _total_slow_allocations, _max_slow_allocations,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   402
                      waste_percent,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   403
                      _total_gc_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   404
                      _max_gc_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   405
                      _total_slow_refill_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   406
                      _max_slow_refill_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   407
                      _total_fast_refill_waste * HeapWordSize,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   408
                      _max_fast_refill_waste * HeapWordSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   409
}