Changeset 822 for soft/giet_vm/applications/rosenfeld/include/mca.h

Timestamp:

Jun 1, 2016, 10:25:43 AM (8 years ago)

Author:

meunier

Message:

In rosenfeld:

• Updated nrio0, nrio1, nrio2, nrio1f, nrio2f, nrio1x, nrbool1, nrbool2 and nralloc1 in the nrc2 lib in order to use macro-typed functions
• Updated the simulation script to include performance evaluation with random images, and a script to generate graphs
• Updated the clock.h to use 64-bit integers, which potentially breaks the printing on the giet

File:

• soft/giet_vm/applications/rosenfeld/include/mca.h (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/include/mca.h

@@ -26 +26 @@
 
 
-// QM : using mutex lock instead of mutexlock,
-// because apparently mutexlocks cause a bug in valgrind
+// QM : using mutex lock instead of spinlock,
+// because apparently spinlocks cause a bug in valgrind
 // (solved but the installed version is not recent enough)
 // cf. https://bugs.kde.org/show_bug.cgi?id=336435
 pthread_mutex_t print_lock;
 
-#define MCA_VERBOSE0(X) ({                 \
+
+
+
+#if MCA_VERBOSE_LEVEL >= 1
+    #define MCA_VERBOSE1(X) ({             \
         pthread_mutex_lock(&print_lock);   \
         X;                                 \
         pthread_mutex_unlock(&print_lock); \
         })
-#define MCA_VERBOSE1(X) ({                 \
+#else
+    #define MCA_VERBOSE1(X)
+#endif
+
+#if MCA_VERBOSE_LEVEL >= 2
+    #define MCA_VERBOSE2(X) ({             \
         pthread_mutex_lock(&print_lock);   \
         X;                                 \
         pthread_mutex_unlock(&print_lock); \
         })
-#define MCA_DISPLAY0(X) ({                 \
+#else
+    #define MCA_VERBOSE2(X)
+#endif
+
+#if MCA_VERBOSE_LEVEL >= 3
+    #define MCA_VERBOSE3(X) ({             \
         pthread_mutex_lock(&print_lock);   \
         X;                                 \
         pthread_mutex_unlock(&print_lock); \
         })
-#define MCA_DISPLAY1(X) ({                 \
-        pthread_mutex_lock(&print_lock);   \
-        X;                                 \
-        pthread_mutex_unlock(&print_lock); \
-        })
-
-
-#define MCA_VERBOSE2(X)
-/*
-#define MCA_VERBOSE2(X) ({                 \
-        pthread_mutex_lock(&print_lock);   \
-        X;                                 \
-        pthread_mutex_unlock(&print_lock); \
-        })
-*/
-
-#define MCA_DISPLAY2(X) 
-
+#else
+    #define MCA_VERBOSE3(X)
+#endif