1.1 --- a/src/share/vm/memory/generationSpec.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/memory/generationSpec.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2012, 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 @@ -26,7 +26,6 @@
1.11 #define SHARE_VM_MEMORY_GENERATIONSPEC_HPP
1.12
1.13 #include "memory/generation.hpp"
1.14 -#include "memory/permGen.hpp"
1.15
1.16 // The specification of a generation. This class also encapsulates
1.17 // some generation-specific behavior. This is done here rather than as a
1.18 @@ -68,63 +67,4 @@
1.19
1.20 typedef GenerationSpec* GenerationSpecPtr;
1.21
1.22 -// The specification of a permanent generation. This class is very
1.23 -// similar to GenerationSpec in use. Due to PermGen's not being a
1.24 -// true Generation, we cannot combine the spec classes either.
1.25 -class PermanentGenerationSpec : public CHeapObj<mtGC> {
1.26 - friend class VMStructs;
1.27 -private:
1.28 - PermGen::Name _name;
1.29 - size_t _init_size;
1.30 - size_t _max_size;
1.31 - size_t _read_only_size;
1.32 - size_t _read_write_size;
1.33 - size_t _misc_data_size;
1.34 - size_t _misc_code_size;
1.35 - bool _enable_shared_spaces;
1.36 -
1.37 - enum {
1.38 - _n_spaces = 2
1.39 - };
1.40 -
1.41 -public:
1.42 - PermanentGenerationSpec(PermGen::Name name, size_t init_size,
1.43 - size_t max_size, size_t read_only_size,
1.44 - size_t read_write_size, size_t misc_data_size,
1.45 - size_t misc_code_size);
1.46 -
1.47 - PermGen* init(ReservedSpace rs, size_t init_size, GenRemSet* remset);
1.48 -
1.49 - void disable_sharing() {
1.50 - _enable_shared_spaces = false;
1.51 - _read_only_size = 0;
1.52 - _read_write_size = 0;
1.53 - _misc_data_size = 0;
1.54 - _misc_code_size = 0;
1.55 - }
1.56 -
1.57 - // Accessors
1.58 - PermGen::Name name() const { return _name; }
1.59 - size_t init_size() const { return _init_size; }
1.60 - void set_init_size(size_t size) { _init_size = size; }
1.61 -
1.62 - // Max size for user DOES NOT include shared spaces.
1.63 - // Max size for space allocation DOES include shared spaces.
1.64 - size_t max_size() const {
1.65 - return _max_size + _read_only_size + _read_write_size;
1.66 - }
1.67 -
1.68 - // Need one covered region for the main space, and one for the shared
1.69 - // spaces (together).
1.70 - int n_covered_regions() const { return 2; }
1.71 -
1.72 - void align(size_t alignment);
1.73 -
1.74 - size_t read_only_size() const { return _read_only_size; }
1.75 - size_t read_write_size() const { return _read_write_size; }
1.76 - size_t misc_data_size() const { return _misc_data_size; }
1.77 - size_t misc_code_size() const { return _misc_code_size; }
1.78 - bool enable_shared_spaces() const { return _enable_shared_spaces; }
1.79 -};
1.80 -
1.81 #endif // SHARE_VM_MEMORY_GENERATIONSPEC_HPP
