hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-09 12:56:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault induced by getting more than 200k objects (#333)

Browse source 
* [RAY-567]: allocate memory on the heap for large gets

* linting
This commit is contained in:
Alexey Tumanov 2017-03-02 01:35:10 -08:00 • committed by Stephanie Wang
parent 6a4bde54dc
commit 4f9e74469e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/plasma/plasma_extension.cc
View file

@ -135,8 +135,9 @@ PyObject *PyPlasma_get(PyObject *self, PyObject *args) {
} }
Py_ssize_t num_object_ids = PyList_Size(object_id_list); Py_ssize_t num_object_ids = PyList_Size(object_id_list);
ObjectID object_ids[num_object_ids]; ObjectID *object_ids = (ObjectID *) malloc(sizeof(ObjectID) * num_object_ids);
ObjectBuffer object_buffers[num_object_ids]; ObjectBuffer *object_buffers =
(ObjectBuffer *) malloc(sizeof(ObjectBuffer) * num_object_ids);
for (int i = 0; i < num_object_ids; ++i) { for (int i = 0; i < num_object_ids; ++i) {
PyStringToUniqueID(PyList_GetItem(object_id_list, i), &object_ids[i]); PyStringToUniqueID(PyList_GetItem(object_id_list, i), &object_ids[i]);
@ -145,6 +146,7 @@ PyObject *PyPlasma_get(PyObject *self, PyObject *args) {
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
plasma_get(conn, object_ids, num_object_ids, timeout_ms, object_buffers); plasma_get(conn, object_ids, num_object_ids, timeout_ms, object_buffers);
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
free(object_ids);
PyObject *returns = PyList_New(num_object_ids); PyObject *returns = PyList_New(num_object_ids);
for (int i = 0; i < num_object_ids; ++i) { for (int i = 0; i < num_object_ids; ++i) {
@ -176,6 +178,7 @@ PyObject *PyPlasma_get(PyObject *self, PyObject *args) {
PyList_SetItem(returns, i, Py_None); PyList_SetItem(returns, i, Py_None);
} }
} }
free(object_buffers);
return returns; return returns;
} }