ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cutils: move hashmap to <pthread.h>."

Browse source
This commit is contained in:
Elliott Hughes 2018-07-13 19:58:45 +00:00 • committed by Gerrit Code Review
commit dda5fe46ac
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/Android.bp
View file

@ -20,6 +20,7 @@
libcutils_nonwindows_sources = [ libcutils_nonwindows_sources = [
"android_get_control_file.cpp", "android_get_control_file.cpp",
"fs.cpp", "fs.cpp",
"hashmap.cpp",
"multiuser.cpp", "multiuser.cpp",
"socket_inaddr_any_server_unix.cpp", "socket_inaddr_any_server_unix.cpp",
"socket_local_client_unix.cpp", "socket_local_client_unix.cpp",
@ -61,7 +62,6 @@ cc_library {
"config_utils.cpp", "config_utils.cpp",
"fs_config.cpp", "fs_config.cpp",
"canned_fs_config.cpp", "canned_fs_config.cpp",
"hashmap.cpp",
"iosched_policy.cpp", "iosched_policy.cpp",
"load_file.cpp", "load_file.cpp",
"native_handle.cpp", "native_handle.cpp",

12
libcutils/hashmap.cpp
View file

@ -18,7 +18,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <cutils/threads.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
@ -36,7 +36,7 @@ struct Hashmap {
size_t bucketCount; size_t bucketCount;
int (*hash)(void* key); int (*hash)(void* key);
bool (*equals)(void* keyA, void* keyB); bool (*equals)(void* keyA, void* keyB);
mutex_t lock; pthread_mutex_t lock;
size_t size; size_t size;
}; };
@ -69,7 +69,7 @@ Hashmap* hashmapCreate(size_t initialCapacity,
map->hash = hash; map->hash = hash;
map->equals = equals; map->equals = equals;
mutex_init(&map->lock); pthread_mutex_init(&map->lock, nullptr);
return map; return map;
} }
@ -129,11 +129,11 @@ static void expandIfNecessary(Hashmap* map) {
} }
void hashmapLock(Hashmap* map) { void hashmapLock(Hashmap* map) {
mutex_lock(&map->lock); pthread_mutex_lock(&map->lock);
} }
void hashmapUnlock(Hashmap* map) { void hashmapUnlock(Hashmap* map) {
mutex_unlock(&map->lock); pthread_mutex_unlock(&map->lock);
} }
void hashmapFree(Hashmap* map) { void hashmapFree(Hashmap* map) {
@ -147,7 +147,7 @@ void hashmapFree(Hashmap* map) {
} }
} }
free(map->buckets); free(map->buckets);
mutex_destroy(&map->lock); pthread_mutex_destroy(&map->lock);
free(map); free(map);
} }