jdk8-mips64-public/hotspot: comparison src/share/vm/utilities/resourceHash.hpp

-:6a809b1ac0a8
+:68172de2a0d7
 /*
-* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 typedef bool (*equals_fn)(K const&, K const&);
 };
 template<typename K> unsigned primitive_hash(const K& k) {
 unsigned hash = (unsigned)((uintptr_t)k);
-return hash ^ (hash > 3); // just in case we're dealing with aligned ptrs
+return hash ^ (hash >> 3); // just in case we're dealing with aligned ptrs
 }
 template<typename K> bool primitive_equals(const K& k0, const K& k1) {
 return k0 == k1;
 }
 // http://stackoverflow.com/questions/8532961/template-argument-of-type-that-is-defined-by-inner-typedef-from-other-template-c
 //typename ResourceHashtableFns<K>::hash_fn   HASH   = primitive_hash<K>,
 //typename ResourceHashtableFns<K>::equals_fn EQUALS = primitive_equals<K>,
 unsigned (*HASH)  (K const&)           = primitive_hash<K>,
 bool     (*EQUALS)(K const&, K const&) = primitive_equals<K>,
-unsigned SIZE = 256
+unsigned SIZE = 256,
+ResourceObj::allocation_type ALLOC_TYPE = ResourceObj::RESOURCE_AREA,
+MEMFLAGS MEM_TYPE = mtInternal
 >
 class ResourceHashtable : public ResourceObj {
 private:
 class Node : public ResourceObj {
 }
 public:
 ResourceHashtable() { memset(_table, 0, SIZE * sizeof(Node*)); }
+~ResourceHashtable() {
+if (ALLOC_TYPE == C_HEAP) {
+Node* const* bucket = _table;
+while (bucket < &_table[SIZE]) {
+Node* node = *bucket;
+while (node != NULL) {
+Node* cur = node;
+node = node->_next;
+delete cur;
+}
+++bucket;
+}
+}
+}
 bool contains(K const& key) const {
 return get(key) != NULL;
 }
 V* get(K const& key) const {
 } else {
 return NULL;
 }
 }
-// Inserts or replaces a value in the table
+/**
-void put(K const& key, V const& value) {
+* Inserts or replaces a value in the table.
+* @return: true:  if a new item is added
+*          false: if the item already existed and the value is updated
+*/
+bool put(K const& key, V const& value) {
 unsigned hv = HASH(key);
 Node** ptr = lookup_node(hv, key);
 if (*ptr != NULL) {
 (*ptr)->_value = value;
+return false;
 } else {
-*ptr = new Node(hv, key, value);
+*ptr = new (ALLOC_TYPE, MEM_TYPE) Node(hv, key, value);
+return true;
 }
+}
+bool remove(K const& key) {
+unsigned hv = HASH(key);
+Node** ptr = lookup_node(hv, key);
+Node* node = *ptr;
+if (node != NULL) {
+*ptr = node->_next;
+if (ALLOC_TYPE == C_HEAP) {
+delete node;
+}
+return true;
+}
+return false;
 }
 // ITER contains bool do_entry(K const&, V const&), which will be
 // called for each entry in the table.  If do_entry() returns false,
 // the iteration is cancelled.
 node = node->_next;
 }
 ++bucket;
 }
 }
+static size_t node_size() {
+return sizeof(Node);
+}
 };
 #endif // SHARE_VM_UTILITIES_RESOURCEHASH_HPP

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/utilities/resourceHash.hpp

src/share/vm/utilities/resourceHash.hpp