PERFORCE change 1024152 for review

[Jonathan Anderson]

http://p4web.freebsd.org/@@1024152?ac=10

Change 1024152 by jonathan at jonathan-on-zenith on 2013/10/09 21:34:22

	Fix some compile errors introduced into P4 branch by last GitHub sync.
	
	It looks like I previously fixed these things in P4, copied them to my zenith Git repo but failed to push them upstream. Consequently, on the next sync I clobbered them.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#11 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#9 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#12 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_class.c#11 (text+ko) ====

@@ -151,7 +151,7 @@
 		return (TESLA_SUCCESS);
 	}
 
-	tesla_assert(0 && ("no free instances but tc_free was > 0"));
+	tesla_assert(0, ("no free instances but tc_free was > 0"));
 	return (TESLA_ERROR_ENOMEM);
 }
 

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_debug.c#9 (text+ko) ====

@@ -208,7 +208,7 @@
 
 	tesla_assert(instance_belongs_to_class,
 		("tesla_instance %x not of class '%s'",
-		 instance, tclass->tc_name)
+		 instance, tclass->tc_automaton->ta_name)
 	       );
 }
 

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#12 (text+ko) ====

@@ -47,18 +47,17 @@
     "struct tesla_class *", "struct tesla_instance *",
     "struct tesla_instance *", "struct tesla_transition *");
 SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match,
-    "struct tesla_class *", "const char *", "const char *",
+    "struct tesla_class *", "const char *", "int32_t",
     "struct tesla_transitions *");
 SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition,
     "struct tesla_class *", "struct tesla_instance *",
-    "struct tesla_transitions *");
-SDT_PROBE_DEFINE3(tesla, automata, fail, other_err, other-error,
-    "struct tesla_class *", "int", "const char *");
+    "int32_t");
+SDT_PROBE_DEFINE4(tesla, automata, fail, other_err, other-error,
+    "struct tesla_class *", "int32_t", "int", "const char *");
 SDT_PROBE_DEFINE2(tesla, automata, success, accept, accept,
     "struct tesla_class *", "struct tesla_instance *");
 SDT_PROBE_DEFINE3(tesla, automata, event, ignored, ignored-event,
-    "struct tesla_class *", "struct tesla_key *",
-    "struct tesla_transitions *");
+    "struct tesla_class *", "int32_t", "struct tesla_key *");
 
 static void
 new_instance(struct tesla_class *tcp, struct tesla_instance *tip)
@@ -84,8 +83,8 @@
 }
 
 static void
-no_instance(struct tesla_class *tcp, const struct tesla_key *tkp,
-    const struct tesla_transitions *ttp)
+no_instance(struct tesla_class *tcp, int32_t symbol,
+    const struct tesla_key *tkp)
 {
 	char instbuf[200];
 	char *c = instbuf;
@@ -108,22 +107,25 @@
 	key_string(keybuf, keybuf + sizeof(keybuf), tkp);
 
 	SDT_PROBE(tesla, automata, fail, no_instance,
-		tcp, instbuf, keybuf, ttp, 0);
+		tcp, instbuf, symbol, keybuf, 0);
 }
 
 static void
 bad_transition(struct tesla_class *tcp, struct tesla_instance *tip,
-    const struct tesla_transitions *ttp)
+    int32_t symbol)
 {
 
-	SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, ttp, 0, 0);
+	SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, symbol,
+		0, 0);
 }
 
 static void
-err(struct tesla_class *tcp, int errnum, const char *message)
+err(const struct tesla_automaton *tap, int32_t symbol, int32_t errnum,
+    const char *message)
 {
 
-	SDT_PROBE(tesla, automata, fail, other_err, tcp, errnum, message, 0, 0);
+	SDT_PROBE(tesla, automata, fail, other_err,
+		tap, symbol, errnum, message, 0);
 }
 
 static void
@@ -134,11 +136,11 @@
 }
 
 static void
-ignored(const struct tesla_class *tcp, const struct tesla_key *tkp,
-    const struct tesla_transitions *ttp)
+ignored(const struct tesla_class *tcp, int32_t symbol,
+    const struct tesla_key *tkp)
 {
 
-	SDT_PROBE(tesla, automata, event, ignored, tcp, tkp, ttp, 0, 0);
+	SDT_PROBE(tesla, automata, event, ignored, tcp, symbol, tkp, 0, 0);
 }
 
 const struct tesla_event_handlers dtrace_handlers = {