Merge branch 'ballygarvan' into HEAD

Replacing the old 3.0-alpha0 cork mechanism with another one inside the
routing table. This version should be simpler and also quite clear what
it does, why and when.

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/event_test.c b/lib/event_test.c
index 9dda3e2a..612deb25 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -15,7 +15,7 @@
 #include "nest/locks.h"
 #include "sysdep/unix/unix.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 
 #define MAX_NUM 4
 
@@ -48,19 +48,14 @@ init_event_check_points(void)
     event_check_points[i] = 0;
 }
 
-void resource_sys_init(void);
-
 static int
 t_ev_run_list(void)
 {
   int i;
 
-  resource_sys_init();
-  resource_init();
   olock_init();
-  birdloop_init();
-  io_init();
   rt_init();
+  io_init();
   if_init();
 //  roa_init();
   config_init();
@@ -85,9 +80,7 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
 
-  the_bird_lock();
   bt_test_suite(t_ev_run_list, "Schedule and run 3 events in right order.");
-  the_bird_unlock();
 
   return bt_exit_value();
 }