hotspot/src/share/vm/memory/permGen.cpp
author ysr
Thu, 17 Mar 2011 10:32:46 -0700
changeset 8688 493d12ccc6db
parent 7397 5b173b4ca846
permissions -rw-r--r--
6668573: CMS: reference processing crash if ParallelCMSThreads > ParallelGCThreads Summary: Use _max_num_q = max(discovery_degree, processing_degree), and let balance_queues() redistribute from discovery_degree to processing_degree of queues. This should also allow a more dynamic and flexible parallelism policy in the future. Reviewed-by: jmasa, johnc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
6765
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
     2
 * Copyright (c) 2000, 2010, 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: 2105
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 2105
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: 2105
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: 6765
diff changeset
    25
#include "precompiled.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    26
#include "gc_implementation/shared/cSpaceCounters.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    27
#include "gc_implementation/shared/vmGCOperations.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    28
#include "gc_interface/collectedHeap.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    29
#include "memory/blockOffsetTable.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    30
#include "memory/compactPermGen.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    31
#include "memory/gcLocker.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    32
#include "memory/gcLocker.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    33
#include "memory/genCollectedHeap.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    34
#include "memory/generation.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    35
#include "memory/permGen.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    36
#include "memory/universe.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    37
#include "oops/oop.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    38
#include "runtime/java.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 6765
diff changeset
    39
#include "runtime/vmThread.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
6765
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    41
HeapWord* PermGen::request_expand_and_allocate(Generation* gen, size_t size,
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    42
                                               GCCause::Cause prev_cause) {
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    43
  if (gen->capacity() < _capacity_expansion_limit ||
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    44
      prev_cause != GCCause::_no_gc || UseG1GC) {  // last disjunct is a temporary hack for G1
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    45
    return gen->expand_and_allocate(size, false);
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    46
  }
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    47
  // We have reached the limit of capacity expansion where
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    48
  // we will not expand further until a GC is done; request denied.
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    49
  return NULL;
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    50
}
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    51
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    52
HeapWord* PermGen::mem_allocate_in_gen(size_t size, Generation* gen) {
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    53
  GCCause::Cause next_cause = GCCause::_permanent_generation_full;
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    54
  GCCause::Cause prev_cause = GCCause::_no_gc;
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    55
  unsigned int gc_count_before, full_gc_count_before;
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    56
  HeapWord* obj;
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    57
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    58
  for (;;) {
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    59
    {
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    60
      MutexLocker ml(Heap_lock);
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    61
      if ((obj = gen->allocate(size, false)) != NULL) {
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    62
        return obj;
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    63
      }
6765
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    64
      // Attempt to expand and allocate the requested space:
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    65
      // specific subtypes may use specific policy to either expand
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    66
      // or not. The default policy (see above) is to expand until
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    67
      // _capacity_expansion_limit, and no further unless a GC is done.
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    68
      // Concurrent collectors may decide to kick off a concurrent
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    69
      // collection under appropriate conditions.
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    70
      obj = request_expand_and_allocate(gen, size, prev_cause);
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
    71
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    72
      if (obj != NULL || prev_cause == GCCause::_last_ditch_collection) {
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    73
        return obj;
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    74
      }
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    75
      if (GC_locker::is_active_and_needs_gc()) {
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    76
        // If this thread is not in a jni critical section, we stall
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    77
        // the requestor until the critical section has cleared and
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    78
        // GC allowed. When the critical section clears, a GC is
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    79
        // initiated by the last thread exiting the critical section; so
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    80
        // we retry the allocation sequence from the beginning of the loop,
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    81
        // rather than causing more, now probably unnecessary, GC attempts.
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    82
        JavaThread* jthr = JavaThread::current();
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    83
        if (!jthr->in_critical()) {
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    84
          MutexUnlocker mul(Heap_lock);
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    85
          // Wait for JNI critical section to be exited
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    86
          GC_locker::stall_until_clear();
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    87
          continue;
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    88
        } else {
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    89
          if (CheckJNICalls) {
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    90
            fatal("Possible deadlock due to allocating while"
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    91
                  " in jni critical section");
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    92
          }
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    93
          return NULL;
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    94
        }
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
    95
      }
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    96
      // Read the GC count while holding the Heap_lock
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    97
      gc_count_before      = SharedHeap::heap()->total_collections();
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    98
      full_gc_count_before = SharedHeap::heap()->total_full_collections();
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
    99
    }
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   100
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   101
    // Give up heap lock above, VMThread::execute below gets it back
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   102
    VM_GenCollectForPermanentAllocation op(size, gc_count_before, full_gc_count_before,
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   103
                                           next_cause);
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   104
    VMThread::execute(&op);
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   105
    if (!op.prologue_succeeded() || op.gc_locked()) {
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   106
      assert(op.result() == NULL, "must be NULL if gc_locked() is true");
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   107
      continue;  // retry and/or stall as necessary
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   108
    }
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   109
    obj = op.result();
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   110
    assert(obj == NULL || SharedHeap::heap()->is_in_reserved(obj),
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   111
           "result not in heap");
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   112
    if (obj != NULL) {
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   113
      return obj;
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   114
    }
1667
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   115
    prev_cause = next_cause;
fc79935c3055 6782457: CMS: Livelock in CompactibleFreeListSpace::block_size()
ysr
parents: 670
diff changeset
   116
    next_cause = GCCause::_last_ditch_collection;
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   117
  }
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   118
}
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   119
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
CompactingPermGen::CompactingPermGen(ReservedSpace rs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
                                     ReservedSpace shared_rs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
                                     size_t initial_byte_size,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   123
                                     GenRemSet* remset,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
                                     PermanentGenerationSpec* perm_spec)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
{
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
  CompactingPermGenGen* g =
489c9b5090e2 Initial load
duke
parents:
diff changeset
   127
    new CompactingPermGenGen(rs, shared_rs, initial_byte_size, -1, remset,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
                             NULL, perm_spec);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
  if (g == NULL)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
    vm_exit_during_initialization("Could not allocate a CompactingPermGen");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
  _gen = g;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
  g->initialize_performance_counters();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   134
489c9b5090e2 Initial load
duke
parents:
diff changeset
   135
  _capacity_expansion_limit = g->capacity() + MaxPermHeapExpansion;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   136
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   137
489c9b5090e2 Initial load
duke
parents:
diff changeset
   138
HeapWord* CompactingPermGen::mem_allocate(size_t size) {
386
7f121b1192f2 6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen
apetrusenko
parents: 1
diff changeset
   139
  return mem_allocate_in_gen(size, _gen);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   140
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   141
489c9b5090e2 Initial load
duke
parents:
diff changeset
   142
void CompactingPermGen::compute_new_size() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   143
  size_t desired_capacity = align_size_up(_gen->used(), MinPermHeapExpansion);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
  if (desired_capacity < PermSize) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   145
    desired_capacity = PermSize;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   146
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   147
  if (_gen->capacity() > desired_capacity) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   148
    _gen->shrink(_gen->capacity() - desired_capacity);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
  }
6765
f8d7d46aa4ff 6794422: Perm gen expansion policy for concurrent collectors
ysr
parents: 5547
diff changeset
   150
  set_capacity_expansion_limit(_gen->capacity() + MaxPermHeapExpansion);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
}