Commit f4aa68ca authored by Timothy Stack's avatar Timothy Stack

Gah, forgot to regenerate the swig wrappers after my last change.

Hopefully this will fix the experiment.waitforactive problem, since
it's the only thing I can think of that fits the symptoms...
parent 2ab63e30
...@@ -88,7 +88,7 @@ event_wrap.o: $(SRCDIR)/event_wrap.c ...@@ -88,7 +88,7 @@ event_wrap.o: $(SRCDIR)/event_wrap.c
# Note: The python version of the wrappers do not seem to be afflicted by the # Note: The python version of the wrappers do not seem to be afflicted by the
# same problems as the perl one. # same problems as the perl one.
# #
swig-pywrappers: event.i event.c tbevent.py.tail swig-pywrappers: event.i event.h event.c tbevent.py.tail
swig -python -I$(SRCDIR) -o $(SRCDIR)/event_wrap_py.c -module tbevent \ swig -python -I$(SRCDIR) -o $(SRCDIR)/event_wrap_py.c -module tbevent \
$(SRCDIR)/event.i $(SRCDIR)/event.i
cat $(SRCDIR)/tbevent.py.tail >> $(SRCDIR)/tbevent.py cat $(SRCDIR)/tbevent.py.tail >> $(SRCDIR)/tbevent.py
......
...@@ -1039,6 +1039,40 @@ static PyObject *_wrap_event_handle_keylen_get(PyObject *self, PyObject *args) { ...@@ -1039,6 +1039,40 @@ static PyObject *_wrap_event_handle_keylen_get(PyObject *self, PyObject *args) {
} }
static PyObject *_wrap_event_handle_do_loop_set(PyObject *self, PyObject *args) {
PyObject *resultobj;
struct event_handle *arg1 = (struct event_handle *) 0 ;
int arg2 ;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"Oi:event_handle_do_loop_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_event_handle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->do_loop = arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_event_handle_do_loop_get(PyObject *self, PyObject *args) {
PyObject *resultobj;
struct event_handle *arg1 = (struct event_handle *) 0 ;
int result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:event_handle_do_loop_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_event_handle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = (int) ((arg1)->do_loop);
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_event_handle_init_set(PyObject *self, PyObject *args) { static PyObject *_wrap_event_handle_init_set(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
struct event_handle *arg1 = (struct event_handle *) 0 ; struct event_handle *arg1 = (struct event_handle *) 0 ;
...@@ -1763,6 +1797,47 @@ static PyObject *_wrap_address_tuple_scheduler_get(PyObject *self, PyObject *arg ...@@ -1763,6 +1797,47 @@ static PyObject *_wrap_address_tuple_scheduler_get(PyObject *self, PyObject *arg
} }
static PyObject *_wrap_address_tuple_timeline_set(PyObject *self, PyObject *args) {
PyObject *resultobj;
address_tuple *arg1 = (address_tuple *) 0 ;
char *arg2 ;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"Os:address_tuple_timeline_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_address_tuple,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
if (arg1->timeline) free((char*)arg1->timeline);
if (arg2) {
arg1->timeline = (char *) malloc(strlen(arg2)+1);
strcpy((char*)arg1->timeline,arg2);
} else {
arg1->timeline = 0;
}
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_address_tuple_timeline_get(PyObject *self, PyObject *args) {
PyObject *resultobj;
address_tuple *arg1 = (address_tuple *) 0 ;
char *result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:address_tuple_timeline_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_address_tuple,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = (char *) ((arg1)->timeline);
resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)"");
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_address_tuple(PyObject *self, PyObject *args) { static PyObject *_wrap_new_address_tuple(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
address_tuple *result; address_tuple *result;
...@@ -1956,6 +2031,23 @@ static PyObject *_wrap_dont_use_this_function_because_it_does_not_work(PyObject ...@@ -1956,6 +2031,23 @@ static PyObject *_wrap_dont_use_this_function_because_it_does_not_work(PyObject
} }
static PyObject *_wrap_event_stop_main(PyObject *self, PyObject *args) {
PyObject *resultobj;
event_handle_t arg1 = (event_handle_t) 0 ;
int result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:event_stop_main",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_event_handle_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = (int)event_stop_main(arg1);
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_event_notify(PyObject *self, PyObject *args) { static PyObject *_wrap_event_notify(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
event_handle_t arg1 = (event_handle_t) 0 ; event_handle_t arg1 = (event_handle_t) 0 ;
...@@ -3059,6 +3151,8 @@ static PyMethodDef SwigMethods[] = { ...@@ -3059,6 +3151,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"event_handle_keydata_get", _wrap_event_handle_keydata_get, METH_VARARGS }, { (char *)"event_handle_keydata_get", _wrap_event_handle_keydata_get, METH_VARARGS },
{ (char *)"event_handle_keylen_set", _wrap_event_handle_keylen_set, METH_VARARGS }, { (char *)"event_handle_keylen_set", _wrap_event_handle_keylen_set, METH_VARARGS },
{ (char *)"event_handle_keylen_get", _wrap_event_handle_keylen_get, METH_VARARGS }, { (char *)"event_handle_keylen_get", _wrap_event_handle_keylen_get, METH_VARARGS },
{ (char *)"event_handle_do_loop_set", _wrap_event_handle_do_loop_set, METH_VARARGS },
{ (char *)"event_handle_do_loop_get", _wrap_event_handle_do_loop_get, METH_VARARGS },
{ (char *)"event_handle_init_set", _wrap_event_handle_init_set, METH_VARARGS }, { (char *)"event_handle_init_set", _wrap_event_handle_init_set, METH_VARARGS },
{ (char *)"event_handle_init_get", _wrap_event_handle_init_get, METH_VARARGS }, { (char *)"event_handle_init_get", _wrap_event_handle_init_get, METH_VARARGS },
{ (char *)"event_handle_connect_set", _wrap_event_handle_connect_set, METH_VARARGS }, { (char *)"event_handle_connect_set", _wrap_event_handle_connect_set, METH_VARARGS },
...@@ -3099,6 +3193,8 @@ static PyMethodDef SwigMethods[] = { ...@@ -3099,6 +3193,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"address_tuple_eventtype_get", _wrap_address_tuple_eventtype_get, METH_VARARGS }, { (char *)"address_tuple_eventtype_get", _wrap_address_tuple_eventtype_get, METH_VARARGS },
{ (char *)"address_tuple_scheduler_set", _wrap_address_tuple_scheduler_set, METH_VARARGS }, { (char *)"address_tuple_scheduler_set", _wrap_address_tuple_scheduler_set, METH_VARARGS },
{ (char *)"address_tuple_scheduler_get", _wrap_address_tuple_scheduler_get, METH_VARARGS }, { (char *)"address_tuple_scheduler_get", _wrap_address_tuple_scheduler_get, METH_VARARGS },
{ (char *)"address_tuple_timeline_set", _wrap_address_tuple_timeline_set, METH_VARARGS },
{ (char *)"address_tuple_timeline_get", _wrap_address_tuple_timeline_get, METH_VARARGS },
{ (char *)"new_address_tuple", _wrap_new_address_tuple, METH_VARARGS }, { (char *)"new_address_tuple", _wrap_new_address_tuple, METH_VARARGS },
{ (char *)"delete_address_tuple", _wrap_delete_address_tuple, METH_VARARGS }, { (char *)"delete_address_tuple", _wrap_delete_address_tuple, METH_VARARGS },
{ (char *)"address_tuple_swigregister", address_tuple_swigregister, METH_VARARGS }, { (char *)"address_tuple_swigregister", address_tuple_swigregister, METH_VARARGS },
...@@ -3111,6 +3207,7 @@ static PyMethodDef SwigMethods[] = { ...@@ -3111,6 +3207,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"c_event_poll", _wrap_c_event_poll, METH_VARARGS }, { (char *)"c_event_poll", _wrap_c_event_poll, METH_VARARGS },
{ (char *)"c_event_poll_blocking", _wrap_c_event_poll_blocking, METH_VARARGS }, { (char *)"c_event_poll_blocking", _wrap_c_event_poll_blocking, METH_VARARGS },
{ (char *)"dont_use_this_function_because_it_does_not_work", _wrap_dont_use_this_function_because_it_does_not_work, METH_VARARGS }, { (char *)"dont_use_this_function_because_it_does_not_work", _wrap_dont_use_this_function_because_it_does_not_work, METH_VARARGS },
{ (char *)"event_stop_main", _wrap_event_stop_main, METH_VARARGS },
{ (char *)"event_notify", _wrap_event_notify, METH_VARARGS }, { (char *)"event_notify", _wrap_event_notify, METH_VARARGS },
{ (char *)"event_schedule", _wrap_event_schedule, METH_VARARGS }, { (char *)"event_schedule", _wrap_event_schedule, METH_VARARGS },
{ (char *)"event_notification_alloc", _wrap_event_notification_alloc, METH_VARARGS }, { (char *)"event_notification_alloc", _wrap_event_notification_alloc, METH_VARARGS },
......
...@@ -50,6 +50,9 @@ class event_handle(_object): ...@@ -50,6 +50,9 @@ class event_handle(_object):
__swig_setmethods__["keylen"] = _tbevent.event_handle_keylen_set __swig_setmethods__["keylen"] = _tbevent.event_handle_keylen_set
__swig_getmethods__["keylen"] = _tbevent.event_handle_keylen_get __swig_getmethods__["keylen"] = _tbevent.event_handle_keylen_get
if _newclass:keylen = property(_tbevent.event_handle_keylen_get, _tbevent.event_handle_keylen_set) if _newclass:keylen = property(_tbevent.event_handle_keylen_get, _tbevent.event_handle_keylen_set)
__swig_setmethods__["do_loop"] = _tbevent.event_handle_do_loop_set
__swig_getmethods__["do_loop"] = _tbevent.event_handle_do_loop_get
if _newclass:do_loop = property(_tbevent.event_handle_do_loop_get, _tbevent.event_handle_do_loop_set)
__swig_setmethods__["init"] = _tbevent.event_handle_init_set __swig_setmethods__["init"] = _tbevent.event_handle_init_set
__swig_getmethods__["init"] = _tbevent.event_handle_init_get __swig_getmethods__["init"] = _tbevent.event_handle_init_get
if _newclass:init = property(_tbevent.event_handle_init_get, _tbevent.event_handle_init_set) if _newclass:init = property(_tbevent.event_handle_init_get, _tbevent.event_handle_init_set)
...@@ -145,6 +148,9 @@ class address_tuple(_object): ...@@ -145,6 +148,9 @@ class address_tuple(_object):
__swig_setmethods__["scheduler"] = _tbevent.address_tuple_scheduler_set __swig_setmethods__["scheduler"] = _tbevent.address_tuple_scheduler_set
__swig_getmethods__["scheduler"] = _tbevent.address_tuple_scheduler_get __swig_getmethods__["scheduler"] = _tbevent.address_tuple_scheduler_get
if _newclass:scheduler = property(_tbevent.address_tuple_scheduler_get, _tbevent.address_tuple_scheduler_set) if _newclass:scheduler = property(_tbevent.address_tuple_scheduler_get, _tbevent.address_tuple_scheduler_set)
__swig_setmethods__["timeline"] = _tbevent.address_tuple_timeline_set
__swig_getmethods__["timeline"] = _tbevent.address_tuple_timeline_get
if _newclass:timeline = property(_tbevent.address_tuple_timeline_get, _tbevent.address_tuple_timeline_set)
def __init__(self, *args): def __init__(self, *args):
_swig_setattr(self, address_tuple, 'this', _tbevent.new_address_tuple(*args)) _swig_setattr(self, address_tuple, 'this', _tbevent.new_address_tuple(*args))
_swig_setattr(self, address_tuple, 'thisown', 1) _swig_setattr(self, address_tuple, 'thisown', 1)
...@@ -188,6 +194,8 @@ c_event_poll_blocking = _tbevent.c_event_poll_blocking ...@@ -188,6 +194,8 @@ c_event_poll_blocking = _tbevent.c_event_poll_blocking
dont_use_this_function_because_it_does_not_work = _tbevent.dont_use_this_function_because_it_does_not_work dont_use_this_function_because_it_does_not_work = _tbevent.dont_use_this_function_because_it_does_not_work
event_stop_main = _tbevent.event_stop_main
event_notify = _tbevent.event_notify event_notify = _tbevent.event_notify
event_schedule = _tbevent.event_schedule event_schedule = _tbevent.event_schedule
...@@ -385,6 +393,9 @@ class NotificationWrapper: ...@@ -385,6 +393,9 @@ class NotificationWrapper:
self.notification, self.notification,
args) args)
def getTimeline(self, args):
return event_notification_get_timeline(self.handle, self.notification)
def getSender(self): def getSender(self):
return event_notification_get_sender(self.handle, self.notification) return event_notification_get_sender(self.handle, self.notification)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment