Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Fix memory leaks (thanks @amlweems) #75

Merged
juanjux merged 2 commits into from
Feb 1, 2018
Merged

Fix memory leaks (thanks @amlweems) #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b07ac39
Fix memory leaks (thanks @amlweems)
Jan 31, 2018
0fd9105
Store and defer allocations of problematic pyobjects to the end of fi…
Feb 1, 2018
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
63 changes: 55 additions & 8 deletions bblfsh/pyuast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@

#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>

#include "uast.h"

// Used to store references to the Pyobjects instanced in String() and
// ItemAt() methods. Those can't be DECREF'ed to 0 because libuast uses the
// so we pass ownership to these lists and free them at the end of filter()
static PyObject *stringAllocsList;
static PyObject *itemAtAllocsList;

static PyObject *Attribute(const void *node, const char *prop) {
PyObject *n = (PyObject *)node;
return PyObject_GetAttrString(n, prop);
Expand All @@ -16,20 +24,38 @@ static PyObject *AttributeValue(const void *node, const char *prop) {
}

static const char *String(const void *node, const char *prop) {
const char *retval = NULL;
PyObject *o = Attribute(node, prop);
return o ? PyUnicode_AsUTF8(o) : NULL;
if (o != NULL) {
retval = PyUnicode_AsUTF8(o);
PyList_Append(stringAllocsList, o);
Py_DECREF(o);
}
return retval;
}

static size_t Size(const void *node, const char *prop) {
size_t retval = 0;
PyObject *o = Attribute(node, prop);
return o ? PySequence_Size(o) : 0;
if (o != NULL) {
retval = PySequence_Size(o);
Py_DECREF(o);
}

return retval;
}

static PyObject *ItemAt(PyObject *object, int index) {
PyObject *retval = NULL;
PyObject *seq = PySequence_Fast(object, "expected a sequence");
return PyList_GET_ITEM(seq, index);
}
if (seq != NULL) {
retval = PyList_GET_ITEM(seq, index);
PyList_Append(itemAtAllocsList, seq);
Py_DECREF(seq);
}

return retval;
}

static const char *InternalType(const void *node) {
return String(node, "internal_type");
Expand Down Expand Up @@ -68,8 +94,13 @@ static const char *PropertyKeyAt(const void *node, int index) {
return NULL;
}

const char *retval = NULL;
PyObject *keys = PyMapping_Keys(properties);
return keys ? PyUnicode_AsUTF8(ItemAt(keys, index)) : NULL;
if (keys != NULL) {
retval = PyUnicode_AsUTF8(ItemAt(keys, index));
Py_DECREF(keys);
}
return retval;
}

static const char *PropertyValueAt(const void *node, int index) {
Expand All @@ -78,8 +109,13 @@ static const char *PropertyValueAt(const void *node, int index) {
return NULL;
}

const char *retval = NULL;
PyObject *values = PyMapping_Values(properties);
return values ? PyUnicode_AsUTF8(ItemAt(values, index)) : NULL;
if (values != NULL) {
retval = PyUnicode_AsUTF8(ItemAt(values, index));
Py_DECREF(values);
}
return retval;
}

static uint32_t PositionValue(const void* node, const char *prop, const char *field) {
Expand Down Expand Up @@ -256,14 +292,20 @@ static PyObject *PyFilter(PyObject *self, PyObject *args)
PyObject *obj = NULL;
const char *query = NULL;

if (!PyArg_ParseTuple(args, "Os", &obj, &query))
if (!PyArg_ParseTuple(args, "Os", &obj, &query)) {
return NULL;
}

itemAtAllocsList = PyList_New(0);
stringAllocsList = PyList_New(0);

Nodes *nodes = UastFilter(ctx, obj, query);
if (!nodes) {
char *error = LastError();
PyErr_SetString(PyExc_RuntimeError, error);
free(error);
Py_DECREF(stringAllocsList);
Py_DECREF(itemAtAllocsList);
return NULL;
}
size_t len = NodesSize(nodes);
Expand All @@ -275,7 +317,12 @@ static PyObject *PyFilter(PyObject *self, PyObject *args)
PyList_SET_ITEM(list, i, node);
}
NodesFree(nodes);
return PySeqIter_New(list);
PyObject *iter = PySeqIter_New(list);
Py_DECREF(list);

Py_DECREF(itemAtAllocsList);
Py_DECREF(stringAllocsList);
return iter;
}

static PyMethodDef extension_methods[] = {
Expand Down
14 changes: 14 additions & 0 deletions bblfsh/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,20 @@ def _validate_resp(self, resp):
# Sometimes its fully qualified, sometimes is just "Node"... ditto
assert(resp.uast.__class__.__name__.endswith('Node'))

def testManyFilters(self):
root = self.client.parse(__file__).uast
root.properties['k1'] = 'v2'
root.properties['k2'] = 'v1'

import resource
before = resource.getrusage(resource.RUSAGE_SELF)
for _ in range(100):
filter(root, "//*[@roleIdentifier]")
after = resource.getrusage(resource.RUSAGE_SELF)

# Check that memory usage has not doubled after running the filter
self.assertLess(after[2] / before[2], 2.0)

def _validate_filter(self, resp):
results = filter(resp.uast, "//Import[@roleImport and @roleDeclaration]//alias")
self.assertEqual(next(results).token, "os")
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import setup, find_packages, Extension
from setuptools.command.build_ext import build_ext

LIBUAST_VERSION = "v1.6.0"
LIBUAST_VERSION = "v1.8.2"
SDK_VERSION = "v1.8.0"
SDK_MAJOR = SDK_VERSION.split('.')[0]
PYTHON = "python3"
Expand Down Expand Up @@ -134,7 +134,7 @@ def main():
},
name="bblfsh",
description="Fetches Universal Abstract Syntax Trees from Babelfish.",
version="2.8.1",
version="2.8.2",
license="Apache 2.0",
author="source{d}",
author_email="[email protected]",
Expand Down