afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

netns: Have VCmdWait objects hold a reference to the corresponding Vcmd.

Browse source 
Also have VCmdWait methods check if the object is associated with an
actual command.
This commit is contained in:
Tom Goff 2016-02-19 17:41:53 -05:00
parent d42d54a477
commit d7bce43e42
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
daemon/src/vcmdmodule.c
View file

@ -37,6 +37,7 @@ typedef struct {
int _status; int _status;
pthread_mutex_t _mutex; pthread_mutex_t _mutex;
pthread_cond_t _cv; pthread_cond_t _cv;
VCmd *_vcmd;
} VCmdWait; } VCmdWait;
int verbose; int verbose;
@ -216,6 +217,7 @@ static PyObject *VCmdWait_new(PyTypeObject *type,
self->_status = -1; self->_status = -1;
pthread_mutex_init(&self->_mutex, NULL); pthread_mutex_init(&self->_mutex, NULL);
pthread_cond_init(&self->_cv, NULL); pthread_cond_init(&self->_cv, NULL);
self->_vcmd = NULL;
#ifdef DEBUG #ifdef DEBUG
WARNX("%p: exit", self); WARNX("%p: exit", self);
@ -232,6 +234,8 @@ static void VCmdWait_dealloc(VCmdWait *self)
pthread_mutex_destroy(&self->_mutex); pthread_mutex_destroy(&self->_mutex);
pthread_cond_destroy(&self->_cv); pthread_cond_destroy(&self->_cv);
if (self->_vcmd != NULL)
Py_DECREF(self->_vcmd);
self->ob_type->tp_free((PyObject *)self); self->ob_type->tp_free((PyObject *)self);
@ -242,6 +246,12 @@ static PyObject *VCmdWait_wait(VCmdWait *self)
{ {
int status; int status;
if (self->_vcmd == NULL)
{
PyErr_SetString(PyExc_ValueError, "unstarted command");
return NULL;
}
pthread_mutex_lock(&self->_mutex); pthread_mutex_lock(&self->_mutex);
#ifdef DEBUG #ifdef DEBUG
@ -269,6 +279,12 @@ Py_END_ALLOW_THREADS
static PyObject *VCmdWait_complete(VCmdWait *self, static PyObject *VCmdWait_complete(VCmdWait *self,
PyObject *args, PyObject *kwds) PyObject *args, PyObject *kwds)
{ {
if (self->_vcmd == NULL)
{
PyErr_SetString(PyExc_ValueError, "unstarted command");
return NULL;
}
if (self->_complete) if (self->_complete)
Py_RETURN_TRUE; Py_RETURN_TRUE;
else else
@ -278,6 +294,12 @@ static PyObject *VCmdWait_complete(VCmdWait *self,
static PyObject *VCmdWait_status(VCmdWait *self, static PyObject *VCmdWait_status(VCmdWait *self,
PyObject *args, PyObject *kwds) PyObject *args, PyObject *kwds)
{ {
if (self->_vcmd == NULL)
{
PyErr_SetString(PyExc_ValueError, "unstarted command");
return NULL;
}
if (self->_complete) if (self->_complete)
return Py_BuildValue("i", self->_status); return Py_BuildValue("i", self->_status);
else else
@ -285,6 +307,9 @@ static PyObject *VCmdWait_status(VCmdWait *self,
} }
static PyMemberDef VCmdWait_members[] = { static PyMemberDef VCmdWait_members[] = {
{"vcmd", T_OBJECT, offsetof(VCmdWait, _vcmd), READONLY,
"VCmd instance that created this object"},
{NULL, 0, 0, 0, NULL}, {NULL, 0, 0, 0, NULL},
}; };
@ -712,6 +737,9 @@ static PyObject *_VCmd_cmd(VCmd *self, PyObject *args, PyObject *kwds,
* there's an error below since cmddonecb should still get called * there's an error below since cmddonecb should still get called
*/ */
Py_INCREF(self);
cmdwait->_vcmd = self;
switch (iotype) switch (iotype)
{ {
case VCMD_IO_NONE: case VCMD_IO_NONE: