Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
d0cc9a74
Unverified
Commit
d0cc9a74
authored
May 18, 2020
by
Rémi Verschelde
Committed by
GitHub
May 18, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38827 from RandomShaper/fix_oa_hash_map
Fix leaks and crashes in OAHashMap
parents
37efaad8
b720a018
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
16 deletions
+87
-16
oa_hash_map.h
core/oa_hash_map.h
+29
-16
test_oa_hash_map.cpp
main/tests/test_oa_hash_map.cpp
+58
-0
No files found.
core/oa_hash_map.h
View file @
d0cc9a74
...
...
@@ -45,6 +45,9 @@
*
* The entries are stored inplace, so huge keys or values might fill cache lines
* a lot faster.
*
* Only used keys and values are constructed. For free positions there's space
* in the arrays for each, but that memory is kept uninitialized.
*/
template
<
class
TKey
,
class
TValue
,
class
Hasher
=
HashMapHasherDefault
,
...
...
@@ -146,9 +149,9 @@ private:
uint32_t
*
old_hashes
=
hashes
;
num_elements
=
0
;
keys
=
memnew_arr
(
TKey
,
capacity
);
values
=
memnew_arr
(
TValue
,
capacity
);
hashes
=
memnew_arr
(
uint32_t
,
capacity
);
keys
=
static_cast
<
TKey
*>
(
Memory
::
alloc_static
(
sizeof
(
TKey
)
*
capacity
)
);
values
=
static_cast
<
TValue
*>
(
Memory
::
alloc_static
(
sizeof
(
TValue
)
*
capacity
)
);
hashes
=
static_cast
<
uint32_t
*>
(
Memory
::
alloc_static
(
sizeof
(
uint32_t
)
*
capacity
)
);
for
(
uint32_t
i
=
0
;
i
<
capacity
;
i
++
)
{
hashes
[
i
]
=
0
;
...
...
@@ -160,11 +163,14 @@ private:
}
_insert_with_hash
(
old_hashes
[
i
],
old_keys
[
i
],
old_values
[
i
]);
old_keys
[
i
].
~
TKey
();
old_values
[
i
].
~
TValue
();
}
memdelete_arr
(
old_keys
);
memdelete_arr
(
old_values
);
memdelete_arr
(
old_hashes
);
Memory
::
free_static
(
old_keys
);
Memory
::
free_static
(
old_values
);
Memory
::
free_static
(
old_hashes
);
}
void
_resize_and_rehash
()
{
...
...
@@ -208,8 +214,7 @@ public:
bool
exists
=
_lookup_pos
(
p_key
,
pos
);
if
(
exists
)
{
values
[
pos
].
~
TValue
();
memnew_placement
(
&
values
[
pos
],
TValue
(
p_data
));
values
[
pos
]
=
p_data
;
}
else
{
insert
(
p_key
,
p_data
);
}
...
...
@@ -226,8 +231,7 @@ public:
bool
exists
=
_lookup_pos
(
p_key
,
pos
);
if
(
exists
)
{
r_data
.
~
TValue
();
memnew_placement
(
&
r_data
,
TValue
(
values
[
pos
]));
r_data
=
values
[
pos
];
return
true
;
}
...
...
@@ -343,9 +347,9 @@ public:
OAHashMap
(
uint32_t
p_initial_capacity
=
64
)
{
capacity
=
p_initial_capacity
;
keys
=
memnew_arr
(
TKey
,
p_initial_capacity
);
values
=
memnew_arr
(
TValue
,
p_initial_capacity
);
hashes
=
memnew_arr
(
uint32_t
,
p_initial_capacity
);
keys
=
static_cast
<
TKey
*>
(
Memory
::
alloc_static
(
sizeof
(
TKey
)
*
capacity
)
);
values
=
static_cast
<
TValue
*>
(
Memory
::
alloc_static
(
sizeof
(
TValue
)
*
capacity
)
);
hashes
=
static_cast
<
uint32_t
*>
(
Memory
::
alloc_static
(
sizeof
(
uint32_t
)
*
capacity
)
);
for
(
uint32_t
i
=
0
;
i
<
p_initial_capacity
;
i
++
)
{
hashes
[
i
]
=
EMPTY_HASH
;
...
...
@@ -353,9 +357,18 @@ public:
}
~
OAHashMap
()
{
memdelete_arr
(
keys
);
memdelete_arr
(
values
);
memdelete_arr
(
hashes
);
for
(
uint32_t
i
=
0
;
i
<
capacity
;
i
++
)
{
if
(
hashes
[
i
]
==
EMPTY_HASH
)
{
continue
;
}
values
[
i
].
~
TValue
();
keys
[
i
].
~
TKey
();
}
Memory
::
free_static
(
keys
);
Memory
::
free_static
(
values
);
Memory
::
free_static
(
hashes
);
}
};
...
...
main/tests/test_oa_hash_map.cpp
View file @
d0cc9a74
...
...
@@ -35,6 +35,37 @@
namespace
TestOAHashMap
{
struct
CountedItem
{
static
int
count
;
int
id
=
-
1
;
bool
destroyed
=
false
;
CountedItem
()
{
count
++
;
}
CountedItem
(
int
p_id
)
:
id
(
p_id
)
{
count
++
;
}
CountedItem
(
const
CountedItem
&
p_other
)
:
id
(
p_other
.
id
)
{
count
++
;
}
CountedItem
&
operator
=
(
const
CountedItem
&
p_other
)
=
default
;
~
CountedItem
()
{
CRASH_COND
(
destroyed
);
count
--
;
destroyed
=
true
;
}
};
int
CountedItem
::
count
;
MainLoop
*
test
()
{
OS
::
get_singleton
()
->
print
(
"
\n\n\n
Hello from test
\n
"
);
...
...
@@ -152,6 +183,33 @@ MainLoop *test() {
map
.
set
(
5
,
1
);
}
// test memory management of items, should not crash or leak items
{
// Exercise different patterns of removal
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
{
OAHashMap
<
String
,
CountedItem
>
map
;
int
id
=
0
;
for
(
int
j
=
0
;
j
<
100
;
++
j
)
{
map
.
insert
(
itos
(
j
),
CountedItem
(
id
));
}
if
(
i
<=
1
)
{
for
(
int
j
=
0
;
j
<
100
;
++
j
)
{
map
.
remove
(
itos
(
j
));
}
}
if
(
i
%
2
==
0
)
{
map
.
clear
();
}
}
if
(
CountedItem
::
count
!=
0
)
{
OS
::
get_singleton
()
->
print
(
"%d != 0 (not performing the other test sub-cases, breaking...)
\n
"
,
CountedItem
::
count
);
break
;
}
}
}
return
nullptr
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment