Commit f59fb013 authored by Mat's avatar Mat
Browse files

Add the array name to the numpy array base object 

Given an array it is now possible to see the name of the SHM block or
the name of the file that owns its memory. This name can be fed to
SharedArray.delete() directly.
parent 817043da

src/map_owner.c

+23 −47
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
 */



#include <sys/mman.h>

#include <stddef.h>

#include <stdlib.h>

#include <Python.h>

#include <structmember.h>

#include "map_owner.h"



/*
@@ -28,12 +31,15 @@ static void do_dealloc(PyMapOwnerObject *self) 
	/* Unmap the data */

	if (munmap(self->map_addr, self->map_size) < 0)

		PyErr_SetFromErrno(PyExc_RuntimeError);



	/* Free the file name */

	free(self->name);

}



/*

 * List of methods

 */

static PyMethodDef methods[] = {

static struct PyMethodDef methods[] = {

	{ "msync", (PyCFunction) map_owner_msync,

	  METH_VARARGS | METH_KEYWORDS,

	  "Synchronise a file with a memory map (msync(2) wrapper)" },
@@ -49,55 +55,25 @@ static PyMethodDef methods[] = { 
	{ NULL, NULL, 0, NULL }

};



/*

 * List of members

 */

static struct PyMemberDef members[] = {

	{ "name", T_STRING, offsetof (PyMapOwnerObject, name), 0,

	  "Name of the file used to back this array" },



	{ NULL, 0, 0, 0, NULL }

};



/*

 * MapOwner type definition

 */

PyTypeObject PyMapOwner_Type = {

	PyVarObject_HEAD_INIT(NULL, 0)

	"shared_array.map_owner",		/* tp_name		*/

	sizeof (PyMapOwnerObject),		/* tp_basicsize		*/

	0,					/* tp_itemsize		*/

	(destructor) do_dealloc,		/* tp_dealloc		*/

	0,					/* tp_print		*/

	0,					/* tp_getattr		*/

	0,					/* tp_setattr		*/

	0,					/* tp_reserved		*/

	0,					/* tp_repr		*/

	0,					/* tp_as_number		*/

	0,					/* tp_as_sequence	*/

	0,					/* tp_as_mapping	*/

	0,					/* tp_hash		*/

	0,					/* tp_call		*/

	0,					/* tp_str		*/

	0,					/* tp_getattro		*/

	0,					/* tp_setattro		*/

	0,					/* tp_as_buffer		*/

	Py_TPFLAGS_DEFAULT,			/* tp_flags		*/

	0,					/* tp_doc		*/

	0,					/* tp_traverse		*/

	0,					/* tp_clear		*/

	0,					/* tp_richcompare	*/

	0,					/* tp_weaklistoffset	*/

	0,					/* tp_iter		*/

	0,					/* tp_iternext		*/

	methods,				/* tp_methods		*/

	0,					/* tp_members		*/

	0,					/* tp_getset		*/

	0,					/* tp_base		*/

	0,					/* tp_dict		*/

	0,					/* tp_descr_get		*/

	0,					/* tp_descr_set		*/

	0,					/* tp_dictoffset	*/

	0,					/* tp_init		*/

	0,					/* tp_alloc		*/

	0,					/* tp_new		*/

	0,					/* tp_free		*/

	0,					/* tp_is_gc		*/

	0,					/* tp_bases		*/

	0,					/* tp_mro		*/

	0,					/* tp_cache		*/

	0,					/* tp_subclasses	*/

	0,					/* tp_weaklist		*/

	0,					/* tp_del		*/

	0,					/* tp_version_tag	*/

	tp_name           : "shared_array.map_owner",

	tp_basicsize      : sizeof (PyMapOwnerObject),

	tp_dealloc        : (destructor) do_dealloc,

	tp_flags          : Py_TPFLAGS_DEFAULT,

	tp_methods        : methods,

	tp_members        : members,

};

src/map_owner.h

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ typedef struct { 
	PyObject_HEAD

	void	*map_addr;

	size_t	 map_size;

	char    *name;

} PyMapOwnerObject;



/* Class type definition */

src/shared_array_attach.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sys/stat.h>

#include <fcntl.h>

#include <unistd.h>

#include <string.h>

#include "shared_array.h"

#include "map_owner.h"
@@ -88,6 +89,7 @@ static PyObject *do_attach(const char *name) 
	PyObject_INIT((PyObject *) map_owner, &PyMapOwner_Type);

	map_owner->map_addr = map_addr;

	map_owner->map_size = map_size;

	map_owner->name = strdup(name);



	/* Create the array object */

	array = PyArray_SimpleNewFromData(meta->ndims, meta->dims, meta->typenum, map_addr);

src/shared_array_create.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sys/stat.h>

#include <fcntl.h>

#include <unistd.h>

#include <string.h>

#include "shared_array.h"

#include "map_owner.h"
@@ -98,6 +99,7 @@ static PyObject *do_create(const char *name, int ndims, npy_intp *dims, PyArray_ 
	PyObject_INIT((PyObject *) map_owner, &PyMapOwner_Type);

	map_owner->map_addr = map_addr;

	map_owner->map_size = map_size;

	map_owner->name = strdup(name);



	/* Create the array object */

	array = PyArray_SimpleNewFromData(ndims, dims, dtype->type_num, map_addr);