*** old/src/share/vm/classfile/symbolTable.hpp	Tue Apr 22 14:08:49 2014
--- new/src/share/vm/classfile/symbolTable.hpp	Tue Apr 22 14:08:49 2014

*** 40,49 ****
--- 40,51 ----
  //  - symbolTableEntrys are allocated in blocks to reduce the space overhead.
  
  class BoolObjectClosure;
  class outputStream;
  
+ // the number of buckets a thread claims
+ const int ClaimChunkSize = 32;
  
  // Class to hold a newly created or referenced Symbol* temporarily in scope.
  // new_symbol() and lookup() will create a Symbol* if not already in the
  // symbol table and add to the symbol's reference count.
  // probe() and lookup_only() will increment the refcount if symbol is found.

*** 250,385 ****
--- 252,257 ----
    // Parallel chunked scanning
    static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
    static int parallel_claimed_index()        { return _parallel_claimed_idx; }
  };
  
  class StringTable : public Hashtable<oop, mtSymbol> {
    friend class VMStructs;
  
  private:
    // The string table
    static StringTable* _the_table;
  
    // Set if one bucket is out of balance due to hash algorithm deficiency
    static bool _needs_rehashing;
  
    // Claimed high water mark for parallel chunked scanning
    static volatile int _parallel_claimed_idx;
  
    static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS);
    oop basic_add(int index, Handle string_or_null, jchar* name, int len,
                  unsigned int hashValue, TRAPS);
  
    oop lookup(int index, jchar* chars, int length, unsigned int hashValue);
  
    // Apply the give oop closure to the entries to the buckets
    // in the range [start_idx, end_idx).
    static void buckets_oops_do(OopClosure* f, int start_idx, int end_idx);
    // Unlink or apply the give oop closure to the entries to the buckets
    // in the range [start_idx, end_idx).
    static void buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, int* processed, int* removed);
  
    StringTable() : Hashtable<oop, mtSymbol>((int)StringTableSize,
                                sizeof (HashtableEntry<oop, mtSymbol>)) {}
  
    StringTable(HashtableBucket<mtSymbol>* t, int number_of_entries)
      : Hashtable<oop, mtSymbol>((int)StringTableSize, sizeof (HashtableEntry<oop, mtSymbol>), t,
                       number_of_entries) {}
  public:
    // The string table
    static StringTable* the_table() { return _the_table; }
  
    // Size of one bucket in the string table.  Used when checking for rollover.
    static uint bucket_size() { return sizeof(HashtableBucket<mtSymbol>); }
  
    static void create_table() {
      assert(_the_table == NULL, "One string table allowed.");
      _the_table = new StringTable();
    }
  
    // GC support
    //   Delete pointers to otherwise-unreachable objects.
    static void unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f) {
      int processed = 0;
      int removed = 0;
      unlink_or_oops_do(cl, f, &processed, &removed);
    }
    static void unlink(BoolObjectClosure* cl) {
      int processed = 0;
      int removed = 0;
      unlink_or_oops_do(cl, NULL, &processed, &removed);
    }
    static void unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f, int* processed, int* removed);
    static void unlink(BoolObjectClosure* cl, int* processed, int* removed) {
      unlink_or_oops_do(cl, NULL, processed, removed);
    }
    // Serially invoke "f->do_oop" on the locations of all oops in the table.
    static void oops_do(OopClosure* f);
  
    // Possibly parallel versions of the above
    static void possibly_parallel_unlink_or_oops_do(BoolObjectClosure* cl, OopClosure* f, int* processed, int* removed);
    static void possibly_parallel_unlink(BoolObjectClosure* cl, int* processed, int* removed) {
      possibly_parallel_unlink_or_oops_do(cl, NULL, processed, removed);
    }
    static void possibly_parallel_oops_do(OopClosure* f);
  
    // Hashing algorithm, used as the hash value used by the
    //     StringTable for bucket selection and comparison (stored in the
    //     HashtableEntry structures).  This is used in the String.intern() method.
    static unsigned int hash_string(const jchar* s, int len);
  
    // Internal test.
    static void test_alt_hash() PRODUCT_RETURN;
  
    // Probing
    static oop lookup(Symbol* symbol);
    static oop lookup(jchar* chars, int length);
  
    // Interning
    static oop intern(Symbol* symbol, TRAPS);
    static oop intern(oop string, TRAPS);
    static oop intern(const char *utf8_string, TRAPS);
  
    // Debugging
    static void verify();
    static void dump(outputStream* st);
  
    enum VerifyMesgModes {
      _verify_quietly    = 0,
      _verify_with_mesgs = 1
    };
  
    enum VerifyRetTypes {
      _verify_pass          = 0,
      _verify_fail_continue = 1,
      _verify_fail_done     = 2
    };
  
    static VerifyRetTypes compare_entries(int bkt1, int e_cnt1,
                                          HashtableEntry<oop, mtSymbol>* e_ptr1,
                                          int bkt2, int e_cnt2,
                                          HashtableEntry<oop, mtSymbol>* e_ptr2);
    static VerifyRetTypes verify_entry(int bkt, int e_cnt,
                                       HashtableEntry<oop, mtSymbol>* e_ptr,
                                       VerifyMesgModes mesg_mode);
    static int verify_and_compare_entries();
  
    // Sharing
    static void copy_buckets(char** top, char*end) {
      the_table()->Hashtable<oop, mtSymbol>::copy_buckets(top, end);
    }
    static void copy_table(char** top, char*end) {
      the_table()->Hashtable<oop, mtSymbol>::copy_table(top, end);
    }
    static void reverse() {
      the_table()->Hashtable<oop, mtSymbol>::reverse();
    }
  
    // Rehash the symbol table if it gets out of balance
    static void rehash_table();
    static bool needs_rehashing() { return _needs_rehashing; }
  
    // Parallel chunked scanning
    static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
    static int parallel_claimed_index() { return _parallel_claimed_idx; }
  };
  #endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP