Changeset 16655

Timestamp:

06/18/08 22:31:18 (4 months ago)

Author:

piotras

Message:

Define methods' structure per class type. It seems to be safer on 64bit systems.

Files:

• trunk/midgard/apis/python/py_midgard_object.c (modified) (7 diffs)

trunk/midgard/apis/python/py_midgard_object.c

@@ -1 +1 @@
-/* 
--> Pokora <piot->
+r Pokora <piotr
- *
- * This program is free software; you can redistribute it and/or modify it
@@ -425 +425 @@
-
-static PyMethodDef pymidgard_object_methods[] = {
-
-
-
-
-
-
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
-        { "is_in_parent_tree", (PyCFunction)pymidgard_object_is_in_parent_tree, METH_VARARGS },
-        { "is_in_tree", (PyCFunction)pymidgard_object_is_in_tree, METH_VARARGS },
@@ -438 +438 @@
-        { "list_children", (PyCFunction)pymidgard_object_list_children, METH_VARARGS },
-        { "get_languages", (PyCFunction)pymidgard_object_get_languages, METH_VARARGS },
-languages
+by_path
-        { "get_parameter", (PyCFunction)pymidgard_object_get_parameter, METH_VARARGS },
-        { "set_parameter", (PyCFunction)pymidgard_object_set_parameter, METH_VARARGS },
@@ -453 +453 @@
-};
-
+static PyMethodDef *__midgard_object_methods_pmd()
+{
+        PyMethodDef *pmd = g_new0(PyMethodDef, 25);
+        
+        pmd[0].ml_name = "get_by_id";
+        pmd[0].ml_meth = (PyCFunction)pymidgard_object_get_by_id;
+        pmd[0].ml_flags = METH_VARARGS;
+        pmd[0].ml_doc = NULL;
+
+        pmd[1].ml_name = "get_by_guid"; 
+        pmd[1].ml_meth = (PyCFunction)pymidgard_object_get_by_guid;
+        pmd[1].ml_flags = METH_VARARGS;
+        pmd[1].ml_doc = NULL;
+
+        pmd[2].ml_name = "create";
+        pmd[2].ml_meth = (PyCFunction)pymidgard_object_create;
+        pmd[2].ml_flags = METH_VARARGS;
+        pmd[2].ml_doc = NULL;
+
+        pmd[3].ml_name = "update";
+        pmd[3].ml_meth = (PyCFunction)pymidgard_object_update;
+        pmd[3].ml_flags = METH_VARARGS;
+        pmd[3].ml_doc = NULL;
+
+        pmd[4].ml_name = "delete";
+        pmd[4].ml_meth = (PyCFunction)pymidgard_object_delete;
+        pmd[4].ml_flags = METH_VARARGS;
+        pmd[4].ml_doc = NULL;
+
+        pmd[5].ml_name = "purge";
+        pmd[5].ml_meth = (PyCFunction)pymidgard_object_purge;
+        pmd[5].ml_flags = METH_VARARGS;
+        pmd[5].ml_doc = NULL;
+
+        pmd[6].ml_name = "is_in_parent_tree";
+        pmd[6].ml_meth = (PyCFunction)pymidgard_object_is_in_parent_tree;
+        pmd[6].ml_flags = METH_VARARGS;
+        pmd[6].ml_doc = NULL;
+
+        pmd[7].ml_name = "is_in_tree";
+        pmd[7].ml_meth = (PyCFunction)pymidgard_object_is_in_tree;
+        pmd[7].ml_flags = METH_VARARGS;
+        pmd[7].ml_doc = NULL;
+
+        pmd[8].ml_name = "get_parent";
+        pmd[8].ml_meth = (PyCFunction)pymidgard_object_get_parent;
+        pmd[8].ml_flags = METH_VARARGS;
+        pmd[8].ml_doc = NULL;
+
+        pmd[9].ml_name = "parent";
+        pmd[9].ml_meth = (PyCFunction)pymidgard_object_parent;
+        pmd[9].ml_flags = METH_VARARGS;
+        pmd[9].ml_doc = NULL;
+
+        pmd[10].ml_name = "list";
+        pmd[10].ml_meth = (PyCFunction)pymidgard_object_list;
+        pmd[10].ml_flags = METH_VARARGS;
+        pmd[10].ml_doc = NULL;
+
+        pmd[11].ml_name = "list_children";
+        pmd[11].ml_meth = (PyCFunction)pymidgard_object_list_children;
+        pmd[11].ml_flags = METH_VARARGS;
+        pmd[11].ml_doc = NULL;
+
+        pmd[12].ml_name = "get_languages";
+        pmd[12].ml_meth = (PyCFunction)pymidgard_object_get_languages;
+        pmd[12].ml_flags = METH_VARARGS;
+        pmd[12].ml_doc = NULL;
+
+        pmd[13].ml_name = "get_by_path";
+        pmd[13].ml_meth = (PyCFunction)pymidgard_object_get_by_path;
+        pmd[13].ml_flags = METH_VARARGS;
+        pmd[13].ml_doc = NULL;
+
+        pmd[14].ml_name = "get_parameter";
+        pmd[14].ml_meth = (PyCFunction)pymidgard_object_get_parameter;
+        pmd[14].ml_flags = METH_VARARGS;
+        pmd[14].ml_doc = NULL;
+
+        pmd[15].ml_name = "set_parameter";
+        pmd[15].ml_meth = (PyCFunction)pymidgard_object_set_parameter;
+        pmd[15].ml_flags = METH_VARARGS;
+        pmd[15].ml_doc = NULL;
+
+        pmd[15].ml_name = "delete_parameters";
+        pmd[15].ml_meth = (PyCFunction)pymidgard_object_delete_parameters;
+        pmd[15].ml_flags = METH_VARARGS;
+        pmd[15].ml_doc = NULL;
+
+        pmd[16].ml_name = "purge_parameters";
+        pmd[16].ml_meth = (PyCFunction)pymidgard_object_purge_parameters;
+        pmd[16].ml_flags = METH_VARARGS;
+        pmd[16].ml_doc = NULL;
+
+        pmd[17].ml_name = "list_parameters";
+        pmd[17].ml_meth = (PyCFunction)pymidgard_object_list_parameters;
+        pmd[17].ml_flags = METH_VARARGS;
+        pmd[17].ml_doc = NULL;
+
+        pmd[18].ml_name = "find_parameters";
+        pmd[18].ml_meth = (PyCFunction)pymidgard_object_find_parameters;
+        pmd[18].ml_flags = METH_VARARGS;
+        pmd[18].ml_doc = NULL;
+
+        pmd[19].ml_name = "delete_attachments";
+        pmd[19].ml_meth = (PyCFunction)pymidgard_object_delete_attachments;
+        pmd[19].ml_flags = METH_VARARGS;
+        pmd[19].ml_doc = NULL;
+
+        pmd[20].ml_name = "purge_attachments";
+        pmd[20].ml_meth = (PyCFunction)pymidgard_object_purge_attachments;
+        pmd[20].ml_flags = METH_VARARGS;
+        pmd[20].ml_doc = NULL;
+
+        pmd[21].ml_name = "list_attachments";
+        pmd[21].ml_meth = (PyCFunction)pymidgard_object_list_attachments;
+        pmd[21].ml_flags = METH_VARARGS;
+        pmd[21].ml_doc = NULL;
+
+        pmd[22].ml_name = "find_attachments";
+        pmd[22].ml_meth = (PyCFunction)pymidgard_object_find_attachments;
+        pmd[22].ml_flags = METH_VARARGS;
+        pmd[22].ml_doc = NULL;
+
+        pmd[23].ml_name = "create_attachment";
+        pmd[23].ml_meth = (PyCFunction)pymidgard_object_create_attachment;
+        pmd[23].ml_flags = METH_VARARGS;
+        pmd[23].ml_doc = NULL;
+
+        pmd[24].ml_name = NULL;
+        pmd[24].ml_meth = NULL;
+        pmd[24].ml_flags = 0;
+        pmd[24].ml_doc = NULL;
+
+        return pmd;
+}
+
-PyTypeObject *__new_object_struct(const gchar *typename)
-{
-        /* initialize object type */
-        PyTypeObject *ot = g_new(PyTypeObject, 1);
+
+#ifdef Py_TRACE_REFS
+        ot->_ob_next = NULL;
+        ot->_ob_prev = NULL
+#endif
-        ot->ob_refcnt = 1;
-        ot->ob_type = NULL;
@@ -486 +628 @@
-        ot->tp_iter = 0;
-        ot->tp_iternext = 0;
-
+
+
+
-        ot->tp_members = 0;
-        ot->tp_getset = 0;
@@ -506 +650 @@
-        ot->tp_weaklist = 0;
-        ot->tp_del = 0;
-
+
-        return ot;
-}
@@ -527 +671 @@
-                typename = g_type_name(all_types[i]);
-                PyTypeObject *ot = __new_object_struct(typename);
-
+
+
-                                typename, all_types[i], ot, 
-                                Py_BuildValue("(O)", pygobject_type));
+                
-                g_hash_table_insert(_pytype_hash, 
-                                (gpointer*)typename, (gpointer *)ot);