Skip to content

Add type-safe wrappers for upb_inttable and upb_strtable. #28212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+1,385 −169
Draft

Add type-safe wrappers for upb_inttable and upb_strtable. #28212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions python/protobuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ PyObject* PyUpb_GetWktBases(PyUpb_ModuleState* state) {

struct PyUpb_WeakMap {
FreeThreadingMutex mutex;
upb_inttable table;
upb_inttable_ptr_ptr table;
upb_Arena* arena;
};

Expand All @@ -159,7 +159,7 @@ PyUpb_WeakMap* PyUpb_WeakMap_New(void) {
#ifdef ENABLE_MUTEX
pthread_mutex_init(&map->mutex.mutex, NULL);
#endif
upb_inttable_init(&map->table, map->arena);
upb_inttable_ptr_ptr_init(&map->table, map->arena);
return map;
}

Expand All @@ -185,16 +185,16 @@ void PyUpb_WeakMap_Add(PyUpb_WeakMap* map, const void* key, PyObject* py_obj) {
PyUnstable_EnableTryIncRef(py_obj);
#endif
FreeThreadingLock(&map->mutex);
upb_inttable_insert(&map->table, PyUpb_WeakMap_GetKey(key),
upb_value_ptr(py_obj), map->arena);
upb_inttable_ptr_ptr_insert(
&map->table, (const void*)PyUpb_WeakMap_GetKey(key), py_obj, map->arena);
FreeThreadingUnlock(&map->mutex);
}

void PyUpb_WeakMap_Delete(PyUpb_WeakMap* map, const void* key) {
FreeThreadingLock(&map->mutex);
upb_value val;
bool removed =
upb_inttable_remove(&map->table, PyUpb_WeakMap_GetKey(key), &val);
const void* val;
bool removed = upb_inttable_ptr_ptr_remove(
&map->table, (const void*)PyUpb_WeakMap_GetKey(key), &val);
(void)removed;
#ifndef Py_GIL_DISABLED
assert(removed);
Expand All @@ -204,22 +204,25 @@ void PyUpb_WeakMap_Delete(PyUpb_WeakMap* map, const void* key) {

void PyUpb_WeakMap_TryDelete(PyUpb_WeakMap* map, const void* key) {
FreeThreadingLock(&map->mutex);
upb_inttable_remove(&map->table, PyUpb_WeakMap_GetKey(key), NULL);
upb_inttable_ptr_ptr_remove(&map->table,
(const void*)PyUpb_WeakMap_GetKey(key), NULL);
FreeThreadingUnlock(&map->mutex);
}

PyObject* PyUpb_WeakMap_Get(PyUpb_WeakMap* map, const void* key) {
FreeThreadingLock(&map->mutex);
upb_value val;
if (upb_inttable_lookup(&map->table, PyUpb_WeakMap_GetKey(key), &val)) {
PyObject* ret = upb_value_getptr(val);
const void* val;
if (upb_inttable_ptr_ptr_lookup(
&map->table, (const void*)PyUpb_WeakMap_GetKey(key), &val)) {
PyObject* ret = (PyObject*)val;
#ifdef Py_GIL_DISABLED
if (PyUnstable_TryIncRef(ret)) {
FreeThreadingUnlock(&map->mutex);
return ret;
}
// Object is deallocating, remove it from the map.
upb_inttable_remove(&map->table, PyUpb_WeakMap_GetKey(key), NULL);
upb_inttable_ptr_ptr_remove(&map->table,
(const void*)PyUpb_WeakMap_GetKey(key), NULL);
FreeThreadingUnlock(&map->mutex);
return NULL;
#else
Expand All @@ -237,22 +240,22 @@ bool PyUpb_WeakMap_Next(PyUpb_WeakMap* map, const void** key, PyObject** obj,
if (*iter == PYUPB_WEAKMAP_BEGIN) {
FreeThreadingLock(&map->mutex);
}
uintptr_t u_key;
upb_value val;
while (upb_inttable_next(&map->table, &u_key, &val, iter)) {
PyObject* py_obj = upb_value_getptr(val);
const void* u_key;
const void* val;
while (upb_inttable_ptr_ptr_next(&map->table, &u_key, &val, iter)) {
PyObject* py_obj = (PyObject*)val;
#ifdef Py_GIL_DISABLED
if (PyUnstable_TryIncRef(py_obj)) {
Py_DECREF(py_obj);
*key = (void*)(u_key << PyUpb_PtrShift);
*key = (void*)((uintptr_t)u_key << PyUpb_PtrShift);
*obj = py_obj;
return true;
} else {
// Object is dying, remove it from the table and continue.
upb_inttable_removeiter(&map->table, iter);
upb_inttable_ptr_ptr_removeiter(&map->table, iter);
}
#else
*key = (void*)(u_key << PyUpb_PtrShift);
*key = (void*)((uintptr_t)u_key << PyUpb_PtrShift);
*obj = py_obj;
return true;
#endif
Expand All @@ -262,7 +265,7 @@ bool PyUpb_WeakMap_Next(PyUpb_WeakMap* map, const void** key, PyObject** obj,
}

void PyUpb_WeakMap_DeleteIter(PyUpb_WeakMap* map, intptr_t* iter) {
upb_inttable_removeiter(&map->table, iter);
upb_inttable_ptr_ptr_removeiter(&map->table, iter);
}

// -----------------------------------------------------------------------------
Expand Down
Loading
Loading