contract label length to conf params

[frescor/frsh-include.git] / frsh_debug.h

diff --git a/frsh_debug.h b/frsh_debug.h
index ac2ea22fcd837744b8429640654388c471e076eb..0442b1044f82878eab2d0ad5b280122bc14cbcca 100644 (file)
--- a/frsh_debug.h
+++ b/frsh_debug.h
@@ -85,11 +85,13 @@
 #define FRSH_TRACE_CALLBACKS false
 #define FRSH_TRACE_SERVICE_TH false
 #define FRSH_TRACE_WATCHDOG false
-#define FRSH_TRACE_TIMEDWAIT false
 #define FRSH_TRACE_SPORADIC_SERVER false
 #define FRSH_TRACE_ROUND_ROBIN false
 #define FRSH_TRACE_BOUNDED_JOB false
 
+#define FRSH_TRACE_ADMISSION_TEST false
+#define FRSH_TRACE_ADMISSION_RESULT false
+
 #define FRSH_TRACE_THREAD_INDEX false
 #define FRSH_TRACE_VRES_INDEX false
 
@@ -102,6 +104,9 @@
 extern struct timespec frsh_trace_init_timespec;
 extern long frsh_trace_init_timemsec;
 
+extern int global_error_condition;  /* Used to propagate error
+                                     * conditions in debugging */
+
 static inline long int FRSH_GET_TIMESTAMP_MSECS()
 {
     int terror = -1;
@@ -110,7 +115,7 @@ static inline long int FRSH_GET_TIMESTAMP_MSECS()
     long int result = -1;
 
     PRW(  fosa_clock_get_time(FOSA_CLOCK_REALTIME, &current_time)  );
-    timespec2msec(&current_time, &current_time_msec);
+    current_time_msec = timespec2msec(&current_time);
 
     result = current_time_msec - frsh_trace_init_timemsec;
 
@@ -121,7 +126,7 @@ static inline long int FRSH_TIMESPEC_TO_RELATIVE_MSECS(const struct timespec *ts
 {
     long int time_msecs = -1;
 
-    timespec2msec(tspec, &time_msecs);
+    time_msecs = timespec2msec(tspec);
 
     return time_msecs - frsh_trace_init_timemsec;
 }