Changeset 740 for vendor/current/lib/talloc/pytalloc.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/talloc/pytalloc.c (modified) (2 diffs)

vendor/current/lib/talloc/pytalloc.c

@@ -1 +1 @@
 /* 
    Unix SMB/CIFS implementation.
-   Python/Talloc glue
-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
-   
+   Python Talloc Module
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2010
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "replace.h"
+#include <Python.h>
 #include <talloc.h>
 #include <pytalloc.h>
 
-/**
- * Simple dealloc for talloc-wrapping PyObjects
- */
-void py_talloc_dealloc(PyObject* self)
+void inittalloc(void);
+
+/* print a talloc tree report for a talloc python object */
+static PyObject *py_talloc_report_full(PyObject *self, PyObject *args)
 {
-        py_talloc_Object *obj = (py_talloc_Object *)self;
-        talloc_free(obj->talloc_ctx);
-        obj->talloc_ctx = NULL;
-        self->ob_type->tp_free(self);
+        PyObject *py_obj = Py_None;
+        PyTypeObject *type;
+
+        if (!PyArg_ParseTuple(args, "|O", &py_obj))
+                return NULL;
+
+        if (py_obj == Py_None) {
+                talloc_report_full(NULL, stdout);
+        } else {
+                type = (PyTypeObject*)PyObject_Type(py_obj);
+                talloc_report_full(py_talloc_get_mem_ctx(py_obj), stdout);
+        }
+        return Py_None;
 }
 
-/**
- * Import an existing talloc pointer into a Python object.
- */
-PyObject *py_talloc_steal_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
-                                                   void *ptr)
+/* enable null tracking */
+static PyObject *py_talloc_enable_null_tracking(PyObject *self)
 {
-        py_talloc_Object *ret = (py_talloc_Object *)py_type->tp_alloc(py_type, 0);
-        ret->talloc_ctx = talloc_new(NULL);
-        if (ret->talloc_ctx == NULL) {
-                return NULL;
-        }
-        if (talloc_steal(ret->talloc_ctx, mem_ctx) == NULL) {
-                return NULL;
-        }
-        ret->ptr = ptr;
-        return (PyObject *)ret;
+        talloc_enable_null_tracking();
+        return Py_None;
 }
 
+/* return the number of talloc blocks */
+static PyObject *py_talloc_total_blocks(PyObject *self, PyObject *args)
+{
+        PyObject *py_obj = Py_None;
+        PyTypeObject *type;
+
+        if (!PyArg_ParseTuple(args, "|O", &py_obj))
+                return NULL;
+
+        if (py_obj == Py_None) {
+                return PyLong_FromLong(talloc_total_blocks(NULL));
+        }
+
+        type = (PyTypeObject*)PyObject_Type(py_obj);
+
+        return PyLong_FromLong(talloc_total_blocks(py_talloc_get_mem_ctx(py_obj)));
+}
+
+static PyMethodDef talloc_methods[] = {
+        { "report_full", (PyCFunction)py_talloc_report_full, METH_VARARGS,
+                "show a talloc tree for an object"},
+        { "enable_null_tracking", (PyCFunction)py_talloc_enable_null_tracking, METH_NOARGS,
+                "enable tracking of the NULL object"},
+        { "total_blocks", (PyCFunction)py_talloc_total_blocks, METH_VARARGS,
+                "return talloc block count"},
+        { NULL }
+};
 
 /**
- * Import an existing talloc pointer into a Python object, leaving the
- * original parent, and creating a reference to the object in the python
- * object
+ * Default (but only slightly more useful than the default) implementation of Repr().
  */
-PyObject *py_talloc_reference_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr)
-{
-        py_talloc_Object *ret = (py_talloc_Object *)py_type->tp_alloc(py_type, 0);
-        ret->talloc_ctx = talloc_new(NULL);
-        if (ret->talloc_ctx == NULL) {
-                return NULL;
-        }
-        if (talloc_reference(ret->talloc_ctx, mem_ctx) == NULL) {
-                return NULL;
-        }
-        ret->ptr = ptr;
-        return (PyObject *)ret;
-}
-
-/**
- * Default (but slightly more useful than the default) implementation of Repr().
- */
-PyObject *py_talloc_default_repr(PyObject *obj)
+static PyObject *py_talloc_default_repr(PyObject *obj)
 {
         py_talloc_Object *talloc_obj = (py_talloc_Object *)obj;
@@ -83 +89 @@
 }
 
-static void py_cobject_talloc_free(void *ptr)
+/**
+ * Simple dealloc for talloc-wrapping PyObjects
+ */
+static void py_talloc_dealloc(PyObject* self)
 {
-        talloc_free(ptr);
+        py_talloc_Object *obj = (py_talloc_Object *)self;
+        assert(talloc_unlink(NULL, obj->talloc_ctx) != -1);
+        obj->talloc_ctx = NULL;
+        self->ob_type->tp_free(self);
 }
 
-PyObject *PyCObject_FromTallocPtr(void *ptr)
+/**
+ * Default (but only slightly more useful than the default) implementation of cmp.
+ */
+static int py_talloc_default_cmp(PyObject *_obj1, PyObject *_obj2)
 {
-        return PyCObject_FromVoidPtr(ptr, py_cobject_talloc_free);
+        py_talloc_Object *obj1 = (py_talloc_Object *)_obj1,
+                                         *obj2 = (py_talloc_Object *)_obj2;
+        if (obj1->ob_type != obj2->ob_type)
+                return (obj1->ob_type - obj2->ob_type);
+
+        return ((char *)py_talloc_get_ptr(obj1) - (char *)py_talloc_get_ptr(obj2));
 }
+
+static PyTypeObject TallocObject_Type = {
+        .tp_name = "talloc.Object",
+        .tp_doc = "Python wrapper for a talloc-maintained object.",
+        .tp_basicsize = sizeof(py_talloc_Object),
+        .tp_dealloc = (destructor)py_talloc_dealloc,
+        .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+        .tp_repr = py_talloc_default_repr,
+        .tp_compare = py_talloc_default_cmp,
+};
+
+void inittalloc(void)
+{
+        PyObject *m;
+
+        if (PyType_Ready(&TallocObject_Type) < 0)
+                return;
+
+        m = Py_InitModule3("talloc", talloc_methods,
+                                           "Python wrapping of talloc-maintained objects.");
+        if (m == NULL)
+                return;
+
+        Py_INCREF(&TallocObject_Type);
+        PyModule_AddObject(m, "Object", (PyObject *)&TallocObject_Type);
+}