client(py): move hopper client methods onto hopper pipe object

Author: OldUser101

client/py/hoppermodule.c

@@ -15,9 +15,10 @@ Hopper_Pipe_SETSTR(endpoint)
 Hopper_Pipe_SETSTR(hopper);
 // clang-format on
 
-static PyObject *_hopper_pipe_new(PyTypeObject *type, PyObject *args,
-                                  PyObject *kwds) {
-    struct _hopper_pipe *self = (struct _hopper_pipe *)type->tp_alloc(type, 0);
+static PyObject *hopper_pipe_new(PyTypeObject *type, PyObject *args,
+                                 PyObject *kwds) {
+    struct py_hopper_pipe *self =
+        (struct py_hopper_pipe *)type->tp_alloc(type, 0);
     if (!self)
         return NULL;
 
@@ -40,8 +41,8 @@ static PyObject *_hopper_pipe_new(PyTypeObject *type, PyObject *args,
     return (PyObject *)self;
 }
 
-static int _hopper_pipe_init(struct _hopper_pipe *self, PyObject *args,
-                             PyObject *kwds) {
+static int hopper_pipe_init(struct py_hopper_pipe *self, PyObject *args,
+                            PyObject *kwds) {
     static char *kwlist[] = {"name", "endpoint", "hopper", "fd", "flags", NULL};
     PyObject *name = NULL, *endpoint = NULL, *hopper = NULL;
 
@@ -61,7 +62,7 @@ static int _hopper_pipe_init(struct _hopper_pipe *self, PyObject *args,
     return 0;
 }
 
-static void _hopper_pipe_dealloc(struct _hopper_pipe *self) {
+static void hopper_pipe_dealloc(struct py_hopper_pipe *self) {
     assert(self->name);
     assert(self->endpoint);
     assert(self->hopper);
@@ -72,14 +73,20 @@ static void _hopper_pipe_dealloc(struct _hopper_pipe *self) {
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyMemberDef _hopper_pipe_members[] = {
-    {"fd", Py_T_INT, offsetof(struct _hopper_pipe, fd), 0,
+static PyObject *hopper_pipe_open(PyObject *self, PyObject *args) {}
+static PyObject *hopper_pipe_close(PyObject *self, PyObject *args) {}
+static PyObject *hopper_pipe_read(PyObject *self, PyObject *args) {}
+static PyObject *hopper_pipe_write(PyObject *self, PyObject *args) {}
+
+static PyMemberDef hopper_pipe_members[] = {
+    {"fd", Py_T_INT, offsetof(struct py_hopper_pipe, fd), 0,
      "pipe file descriptor"},
-    {"flags", Py_T_INT, offsetof(struct _hopper_pipe, flags), 0, "pipe flags"},
+    {"flags", Py_T_INT, offsetof(struct py_hopper_pipe, flags), 0,
+     "pipe flags"},
     {NULL},
 };
 
-static PyGetSetDef _hopper_get_set[] = {
+static PyGetSetDef hopper_pipe_get_set[] = {
     {"name", (getter)_hopper_pipe_getname, (setter)_hopper_pipe_setname,
      "pipe name", NULL},
     {"endpoint", (getter)_hopper_pipe_getendpoint,
@@ -88,46 +95,42 @@ static PyGetSetDef _hopper_get_set[] = {
      "pipe hopper", NULL},
 };
 
+static PyMethodDef hopper_pipe_methods[] = {
+    {"open", hopper_pipe_open, METH_VARARGS, ""},
+    {"close", hopper_pipe_close, METH_VARARGS, ""},
+    {"read", hopper_pipe_read, METH_VARARGS, ""},
+    {"write", hopper_pipe_write, METH_VARARGS, ""},
+    {NULL, NULL, 0, NULL},
+};
+
 // clang-format off
-static PyTypeObject _hopper_pipe_object = {
+static PyTypeObject hopper_pipe_type = {
     .ob_base = PyVarObject_HEAD_INIT(NULL, 0)
     .tp_name = "hopper.HopperPipe",
     .tp_doc = PyDoc_STR("A object representing a Hopper pipe"),
-    .tp_basicsize = sizeof(struct _hopper_pipe),
+    .tp_basicsize = sizeof(struct py_hopper_pipe),
     .tp_itemsize = 0,
     .tp_flags = Py_TPFLAGS_DEFAULT,
-    .tp_new = _hopper_pipe_new,
-    .tp_init = (initproc)_hopper_pipe_init,
-    .tp_dealloc = (destructor)_hopper_pipe_dealloc,
-    .tp_members = _hopper_pipe_members,
-    .tp_getset = _hopper_get_set,
+    .tp_new = hopper_pipe_new,
+    .tp_init = (initproc)hopper_pipe_init,
+    .tp_dealloc = (destructor)hopper_pipe_dealloc,
+    .tp_members = hopper_pipe_members,
+    .tp_getset = hopper_pipe_get_set,
+    .tp_methods = hopper_pipe_methods,
 };
 // clang-format on
 
-static PyObject *hopper_open_pipe(PyObject *self, PyObject *args) {}
-static PyObject *hopper_close_pipe(PyObject *self, PyObject *args) {}
-static PyObject *hopper_read_pipe(PyObject *self, PyObject *args) {}
-static PyObject *hopper_write_pipe(PyObject *self, PyObject *args) {}
-
 static int hopper_module_exec(PyObject *m) {
-    if (PyType_Ready(&_hopper_pipe_object) < 0)
+    if (PyType_Ready(&hopper_pipe_type) < 0)
         return -1;
 
-    if (PyModule_AddObjectRef(m, "HopperPipe",
-                              (PyObject *)&_hopper_pipe_object) < 0)
+    if (PyModule_AddObjectRef(m, "HopperPipe", (PyObject *)&hopper_pipe_type) <
+        0)
         return -1;
 
     return 0;
 }
 
-static PyMethodDef hopper_methods[] = {
-    {"open", hopper_open_pipe, METH_VARARGS, ""},
-    {"close", hopper_close_pipe, METH_VARARGS, ""},
-    {"read", hopper_read_pipe, METH_VARARGS, ""},
-    {"write", hopper_write_pipe, METH_VARARGS, ""},
-    {NULL, NULL, 0, NULL},
-};
-
 static PyModuleDef_Slot hopper_slots[] = {
     {Py_mod_exec, hopper_module_exec},
     {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_NOT_SUPPORTED},
@@ -138,7 +141,6 @@ static struct PyModuleDef hoppermodule = {
     .m_base = PyModuleDef_HEAD_INIT,
     .m_name = "hopper",
     .m_doc = NULL,
-    .m_methods = hopper_methods,
     .m_slots = hopper_slots,
 };
 

include/hopper/client/py/hoppermodule.h

@@ -5,7 +5,7 @@
 #include <Python.h>
 
 // clang-format off
-struct _hopper_pipe {
+struct py_hopper_pipe {
     PyObject_HEAD
     PyObject *name;
     PyObject *endpoint;
@@ -17,13 +17,13 @@ struct _hopper_pipe {
 
 // These macros are horrible, but hard to replace :(
 #define Hopper_Pipe_GET(field)                                                 \
-    static PyObject *_hopper_pipe_get##field(struct _hopper_pipe *self,        \
+    static PyObject *_hopper_pipe_get##field(struct py_hopper_pipe *self,      \
                                              void *closure) {                  \
         return Py_NewRef(self->field);                                         \
     }
 
 #define Hopper_Pipe_SETSTR(field)                                              \
-    static int _hopper_pipe_set##field(struct _hopper_pipe *self,              \
+    static int _hopper_pipe_set##field(struct py_hopper_pipe *self,            \
                                        PyObject *value, void *closure) {       \
         if (!value) {                                                          \
             PyErr_SetString(PyExc_TypeError, "cannot delete " #field);         \