Added new event obj type and event types for slothd.

lib/libtb/tbdefs.c

@@ -22,6 +22,7 @@ char *tbdb_objecttypes[] = {
 	TBDB_OBJECTTYPE_SIMULATOR,
 	TBDB_OBJECTTYPE_LINKTEST,
 	TBDB_OBJECTTYPE_NSE,
+        TBDB_OBJECTTYPE_SLOTHD,
 	0,
 };
 
@@ -40,6 +41,8 @@ char *tbdb_eventtypes[] = {
 	TBDB_EVENTTYPE_SWAPOUT,
 	TBDB_EVENTTYPE_NSESWAP,
 	TBDB_EVENTTYPE_NSEEVENT,
+        TBDB_EVENTTYPE_REPORT,
+        TBDB_EVENTTYPE_ALERT,
         TBDB_NODESTATE_ISUP, 
         TBDB_NODESTATE_REBOOTED, 
         TBDB_NODESTATE_REBOOTING, 

lib/libtb/tbdefs.h

@@ -38,6 +38,7 @@
 #define TBDB_OBJECTTYPE_SIMULATOR "SIMULATOR"
 #define TBDB_OBJECTTYPE_LINKTEST "LINKTEST"
 #define TBDB_OBJECTTYPE_NSE     "NSE"
+#define TBDB_OBJECTTYPE_SLOTHD  "SLOTHD"
 
 #define TBDB_EVENTTYPE_START	"START"
 #define TBDB_EVENTTYPE_STOP	"STOP"
@@ -53,6 +54,8 @@
 #define TBDB_EVENTTYPE_SWAPOUT	"SWAPOUT"
 #define TBDB_EVENTTYPE_NSESWAP	"NSESWAP"
 #define TBDB_EVENTTYPE_NSEEVENT	"NSEEVENT"
+#define TBDB_EVENTTYPE_REPORT   "REPORT"
+#define TBDB_EVENTTYPE_ALERT    "ALERT"
 
 #define TBDB_NODESTATE_ISUP       "ISUP"
 #define TBDB_NODESTATE_REBOOTED   "REBOOTED"

sql/database-fill.sql

@@ -78,6 +78,8 @@ REPLACE INTO event_eventtypes VALUES (10,'KILL');
 REPLACE INTO event_eventtypes VALUES (11,'HALT');
 REPLACE INTO event_eventtypes VALUES (12,'SWAPOUT');
 REPLACE INTO event_eventtypes VALUES (13,'NSEEVENT');
+REPLACE INTO event_eventtypes VALUES (14,'REPORT');
+REPLACE INTO event_eventtypes VALUES (15,'ALERT');
 
 --
 -- Dumping data for table `event_objecttypes`
@@ -93,6 +95,7 @@ REPLACE INTO event_objecttypes VALUES (5,'FRISBEE');
 REPLACE INTO event_objecttypes VALUES (6,'SIMULATOR');
 REPLACE INTO event_objecttypes VALUES (7,'LINKTEST');
 REPLACE INTO event_objecttypes VALUES (8,'NSE');
+REPLACE INTO event_objecttypes VALUES (9,'SLOTHD');
 
 --
 -- Dumping data for table `exported_tables`

tbsetup/ns2ir/sim.tcl.in

@@ -381,6 +381,8 @@ Simulator instproc run {} {
 
     # This will eventually be under user control.
     $self spitxml_data "virt_agents" [list "vnode" "vname" "objecttype" ] [list "*" "linktest" $objtypes(LINKTEST) ]
+
+    $self spitxml_data "virt_agents" [list "vnode" "vname" "objecttype" ] [list "*" "slothd" $objtypes(SLOTHD) ]
     
     foreach event $event_list {
 	$self spitxml_data "eventlist" [list "time" "vnode" "vname" "objecttype" "eventtype" "arguments" "atstring" ] [list [lindex $event 0] [lindex $event 1] [lindex $event 2] $objtypes([lindex $event 3]) $eventtypes([lindex $event 4]) [lindex $event 5] [lindex $event 6] ]