add extra value to prevent segfault, needs more investigation

Author: chrisruk

buildhat/devices.py

@@ -7,6 +7,7 @@
 
 def cleanup(obj):
     obj.close()
+    gc.collect()
 
 class Device:
     """Creates a single instance of the buildhat for all devices to use"""
@@ -50,7 +51,6 @@ def whatami(self, port):
 
     def close(self):
         del Device._instance
-        gc.collect()
 
 class PortDevice(Device):
     """Device which uses port"""

src/device.c

@@ -1014,16 +1014,17 @@ int device_callback(PyObject *self, int event)
         {
             PyObject *value;
             value = PyList_GetItem(device->values, i);
+            Py_INCREF(value);
             if (value == NULL)
             {
                 Py_DECREF(results);
                 return -1;
             }
             PyList_SET_ITEM(results, i, value);
+            Py_DECREF(value);
         }
 
         PyObject *args = Py_BuildValue("(O)", results);
-
         rv = (PyObject_CallObject(device->callback, args) != NULL) ? 0 : -1;
         Py_XDECREF(args);
     }

src/hubmodule.c

@@ -117,6 +117,14 @@ static int build_hat_created = 0;
 
 static void
 Hub_dealloc(HubObject *self)
+{
+    //PyObject_GC_UnTrack(self); // calling this means finalize isn't called
+    //Hub_clear(self);
+    //Py_TYPE(self)->tp_free((PyObject *)self); // calling this means finalize isn't called
+}
+
+static void
+Hub_finalize(PyObject *self)
 {
     PyObject *etype, *evalue, *etraceback;
 
@@ -126,13 +134,11 @@ Hub_dealloc(HubObject *self)
     PyErr_Restore(etype, evalue, etraceback);
 
     PyObject_GC_UnTrack(self);
-    Hub_clear(self);
+    Hub_clear((HubObject*)self);
     Py_TYPE(self)->tp_free((PyObject *)self);
-
     build_hat_created = 0;
 }
 
-
 static PyObject *
 Hub_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
@@ -334,6 +340,7 @@ static PyTypeObject HubType =
     .tp_clear = (inquiry)Hub_clear,
     .tp_getset = Hub_getsetters,
     .tp_methods = Hub_methods,
+    .tp_finalize = (destructor)Hub_finalize
 };
 
 

src/uart.c

@@ -424,6 +424,13 @@ void parse_line(char *serbuf)
                 token = strtok(NULL, " ");
                 mcount++;
             }
+
+            // Add extra value, to prevent current segfault - Needs more investigation!
+            data_t *tmpval = malloc(sizeof(data_t));
+            tmpval->i_data = strtof("1.0", NULL);
+            tmpval->t = FLOAT;
+            port_new_any_value(port, mcount, tmpval);
+
             callback_queue(CALLBACK_DEVICE, port, CALLBACK_DATA);
         }
     }