Skip to content
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

Jump to bottom

Modernize DECREF (part 5). #3209

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Modernize DECREF (part 5). #3209

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1fa4a6c
Modernize DECREF in `hocobj_new` (subself).
1uc Nov 14, 2024
0a49ea8
Modernize DECREF in `hocobj_new` (r).
1uc Nov 14, 2024
543c81b
Modernize DECREF in `hocobj_pushargs` (pn).
1uc Nov 14, 2024
ffc2f81
Modernize DECREF in `nrnpy_numbercheck` (tmp).
1uc Nov 14, 2024
a9f9436
Modernize DECREF in `symlist2dict`.
1uc Nov 14, 2024
9f59062
Modernize DECREF in `toplevel_get`.
1uc Nov 14, 2024
ca12a96
Modernize DECREF in `hocobj_getattr`.
1uc Nov 14, 2024
9d72f10
Localize variable in `hocobj_getattr` (result).
1uc Nov 14, 2024
65d8a80
Localize variable in `hocobj_getattr` (result).
1uc Nov 14, 2024
23f2760
Modernize DECREF in `hocobj_getattr` (ret_ho_).
1uc Nov 14, 2024
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
83 changes: 36 additions & 47 deletions src/nrnpython/nrnpy_hoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,15 @@
}

static PyObject* hocobj_new(PyTypeObject* subtype, PyObject* args, PyObject* kwds) {
PyObject* subself;
PyObject* base;
PyHocObject* hbase = nullptr;

subself = subtype->tp_alloc(subtype, 0);
// printf("hocobj_new %s %p %p\n", subtype->tp_name, subtype, subself);
if (subself == NULL) {
return NULL;
auto subself = nb::steal(subtype->tp_alloc(subtype, 0));
// printf("hocobj_new %s %p %p\n", subtype->tp_name, subtype, subself.ptr());
if (!subself) {
return nullptr;

Check warning on line 264 in src/nrnpython/nrnpy_hoc.cpp

View check run for this annotation

Codecov / codecov/patch

src/nrnpython/nrnpy_hoc.cpp#L264 

Added line #L264 was not covered by tests
}
PyHocObject* self = (PyHocObject*) subself;
PyHocObject* self = (PyHocObject*) subself.ptr();
self->ho_ = NULL;
self->u.x_ = 0.;
self->sym_ = NULL;
Expand All @@ -291,8 +290,7 @@
hbase = (PyHocObject*) base;
} else {
PyErr_SetString(PyExc_TypeError, "HOC base class not valid");
Py_DECREF(subself);
return NULL;
return nullptr;

Check warning on line 293 in src/nrnpython/nrnpy_hoc.cpp

View check run for this annotation

Codecov / codecov/patch

src/nrnpython/nrnpy_hoc.cpp#L293 

Added line #L293 was not covered by tests
}
PyDict_DelItemString(kwds, "hocbase");
}
Expand All @@ -301,19 +299,17 @@
// printf("hocobj_new base %s\n", hbase->sym_->name);
// remove the hocbase keyword since hocobj_call only allows
// the "sec" keyword argument
PyObject* r = hocobj_call(hbase, args, kwds);
auto r = nb::steal(hocobj_call(hbase, args, kwds));
if (!r) {
Py_DECREF(subself);
return NULL;
return nullptr;
}
PyHocObject* rh = (PyHocObject*) r;
PyHocObject* rh = (PyHocObject*) r.ptr();
self->type_ = rh->type_;
self->ho_ = rh->ho_;
hoc_obj_ref(self->ho_);
Py_DECREF(r);
}

return subself;
return subself.release().ptr();
}

static int hocobj_init(PyObject* subself, PyObject* args, PyObject* kwds) {
Expand Down Expand Up @@ -419,9 +415,8 @@
// PyObject_Print(po, stdout, 0);
// printf(" pushargs %d\n", i);
if (nrnpy_numbercheck(po)) {
PyObject* pn = PyNumber_Float(po);
hoc_pushx(PyFloat_AsDouble(pn));
Py_XDECREF(pn);
auto pn = nb::steal(PyNumber_Float(po));
hoc_pushx(PyFloat_AsDouble(pn.ptr()));
} else if (is_python_string(po)) {
char** ts = hoc_temp_charptr();
Py2NRNString str(po, /* disable_release */ true);
Expand Down Expand Up @@ -569,10 +564,8 @@
// or things that fail when float(po) fails. ARGGH! This
// is a lot more expensive than I would like.
if (rval == 1) {
PyObject* tmp = PyNumber_Float(po);
if (tmp) {
Py_DECREF(tmp);
} else {
auto tmp = nb::steal(PyNumber_Float(po));
if (!tmp) {
PyErr_Clear();
rval = 0;
}
Expand Down Expand Up @@ -996,20 +989,19 @@
}

static void symlist2dict(Symlist* sl, PyObject* dict) {
PyObject* nn = Py_BuildValue("");
auto nn = nb::steal(Py_BuildValue(""));
for (Symbol* s = sl->first; s; s = s->next) {
if (s->type == UNDEF) {
continue;
}
if (s->cpublic == 1 || sl == hoc_built_in_symlist || sl == hoc_top_level_symlist) {
if (strcmp(s->name, "del") == 0) {
PyDict_SetItemString(dict, "delay", nn);
PyDict_SetItemString(dict, "delay", nn.ptr());

Check warning on line 999 in src/nrnpython/nrnpy_hoc.cpp

View check run for this annotation

Codecov / codecov/patch

src/nrnpython/nrnpy_hoc.cpp#L999 

Added line #L999 was not covered by tests
} else {
PyDict_SetItemString(dict, s->name, nn);
PyDict_SetItemString(dict, s->name, nn.ptr());
}
}
}
Py_DECREF(nn);
}

static int setup_doc_system() {
Expand All @@ -1036,13 +1028,11 @@
PyHocObject* self = (PyHocObject*) subself;
PyObject* result = NULL;
if (self->type_ == PyHoc::HocTopLevelInterpreter) {
PyObject* descr = PyDict_GetItemString(topmethdict, n);
auto descr = nb::borrow(PyDict_GetItemString(topmethdict, n));
if (descr) {
Py_INCREF(descr);
descrgetfunc f = descr->ob_type->tp_descr_get;
descrgetfunc f = descr.ptr()->ob_type->tp_descr_get;
assert(f);
result = f(descr, subself, (PyObject*) Py_TYPE(subself));
Py_DECREF(descr);
result = f(descr.ptr(), subself, (PyObject*) Py_TYPE(subself));
}
}
return result;
Expand Down Expand Up @@ -1168,22 +1158,21 @@
return PyObject_CallFunctionObjArgs(plotshape_plot, (PyObject*) self, NULL);
} else if (strcmp(n, "__doc__") == 0) {
if (setup_doc_system()) {
PyObject* docobj = NULL;
nb::object docobj;
if (self->ho_) {
docobj = Py_BuildValue("s s",
self->ho_->ctemplate->sym->name,
self->sym_ ? self->sym_->name : "");
docobj = nb::steal(Py_BuildValue("s s",
self->ho_->ctemplate->sym->name,
self->sym_ ? self->sym_->name : ""));
} else if (self->sym_) {
// Symbol
docobj = Py_BuildValue("s s", "", self->sym_->name);
docobj = nb::steal(Py_BuildValue("s s", "", self->sym_->name));
} else {
// Base HocObject

docobj = Py_BuildValue("s s", "", "");
docobj = nb::steal(Py_BuildValue("s s", "", ""));
}

result = PyObject_CallObject(pfunc_get_docstring, docobj);
Py_DECREF(docobj);
result = PyObject_CallObject(pfunc_get_docstring, docobj.ptr());
return result;
} else {
return NULL;
Expand Down Expand Up @@ -1235,8 +1224,10 @@
return NULL;
}
if (self->ho_) { // use the component fork.
result = hocobj_new(hocobject_type, 0, 0);
PyHocObject* po = (PyHocObject*) result;
// We use the convention that `ret_ho_` own the Python object,
// and `po` is just a (casted) pointer/view.
auto ret_ho_ = nb::steal(hocobj_new(hocobject_type, 0, 0));
PyHocObject* po = (PyHocObject*) ret_ho_.ptr();
po->ho_ = self->ho_;
hoc_obj_ref(po->ho_);
po->sym_ = sym;
Expand All @@ -1252,16 +1243,14 @@
if (nrn_inpython_ == 2) { // error in component
nrn_inpython_ = 0;
PyErr_SetString(PyExc_TypeError, "No value");
Py_DECREF(po);
return NULL;
return nullptr;
}
nrn_inpython_ = 0;
Py_DECREF(po);
if (t == SECTION || t == SECTIONREF) {
section_object_seen = 0;
result = nrnpy_cas(0, 0);
PyObject* ret = nrnpy_cas(0, 0);
nrn_popsec();
return result;
return ret;
} else {
if (isptr) {
auto handle = hoc_pop_handle<double>();
Expand All @@ -1276,11 +1265,11 @@
} else {
po->type_ = PyHoc::HocArray;
}
return result;
return ret_ho_.release().ptr();
}
} else {
po->type_ = PyHoc::HocFunction;
return result;
return ret_ho_.release().ptr();
}
}
// top level interpreter fork
Expand Down
Loading