added a reset() method to Dumm and each client
identation cleanups
This commit is contained in:
+33
-2
@@ -24,6 +24,7 @@
|
||||
#include <library.h>
|
||||
#include <dumm.h>
|
||||
#include <debug.h>
|
||||
#include <utils/linked_list.h>
|
||||
|
||||
#undef PACKAGE_NAME
|
||||
#undef PACKAGE_TARNAME
|
||||
@@ -84,8 +85,6 @@ static void sigchld_handler(int signal, siginfo_t *info, void* ptr)
|
||||
enumerator->destroy(enumerator);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Guest bindings
|
||||
*/
|
||||
@@ -300,11 +299,42 @@ static VALUE guest_each_iface(int argc, VALUE *argv, VALUE self)
|
||||
return self;
|
||||
}
|
||||
|
||||
static VALUE guest_reset(VALUE self)
|
||||
{
|
||||
linked_list_t *list;
|
||||
enumerator_t *enumerator;
|
||||
guest_t *guest;
|
||||
iface_t *iface;
|
||||
|
||||
Data_Get_Struct(self, guest_t, guest);
|
||||
if (!guest->get_pid(guest))
|
||||
{
|
||||
rb_raise(rb_eRuntimeError, "guest is not running");
|
||||
}
|
||||
list = linked_list_create();
|
||||
enumerator = guest->create_iface_enumerator(guest);
|
||||
while (enumerator->enumerate(enumerator, &iface))
|
||||
{
|
||||
list->insert_last(list, iface);
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
while (list->remove_last(list, (void**)&iface) == SUCCESS)
|
||||
{
|
||||
guest->destroy_iface(guest, iface);
|
||||
}
|
||||
list->destroy(list);
|
||||
return self;
|
||||
}
|
||||
|
||||
static VALUE guest_delete(VALUE self)
|
||||
{
|
||||
guest_t *guest;
|
||||
|
||||
Data_Get_Struct(self, guest_t, guest);
|
||||
if (guest->get_pid(guest))
|
||||
{
|
||||
rb_raise(rb_eRuntimeError, "guest is running");
|
||||
}
|
||||
dumm->delete_guest(dumm, guest);
|
||||
return Qnil;
|
||||
}
|
||||
@@ -332,6 +362,7 @@ static void guest_init()
|
||||
rb_define_method(rbc_guest, "each", guest_each_iface, -1);
|
||||
rb_define_method(rbc_guest, "include?", guest_find_iface, 1);
|
||||
rb_define_method(rbc_guest, "iface?", guest_find_iface, 1);
|
||||
rb_define_method(rbc_guest, "reset", guest_reset, 0);
|
||||
rb_define_method(rbc_guest, "delete", guest_delete, 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -18,4 +18,17 @@
|
||||
require 'dumm.so'
|
||||
require 'dumm/guest'
|
||||
|
||||
module Dumm
|
||||
# unload templates, reset all guests and delete bridges
|
||||
def reset
|
||||
Template.unload
|
||||
Guest.each { |guest|
|
||||
guest.reset if guest.running?
|
||||
}
|
||||
Bridge.each { |bridge|
|
||||
bridge.delete
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
# vim:sw=2 ts=2 et
|
||||
|
||||
Reference in New Issue
Block a user