Merge branch 'charm' of charmgit:charm into charm
[charm.git] / src / conv-perf / machineEvents.h
index 85f2561365c3361e7c76c3c9a03654dea01eca97..d659d2b20d72102eef9d89877bebd0f4e94e12a2 100644 (file)
                \
        }
 
-#ifdef CMK_OPTIMIZE
-#define _LOG_E_PROC_IDLE()
-#define _LOG_E_PROC_BUSY()
-#else
 #define _LOG_E_PROC_IDLE() \
-       { machine_procIdle(); }
+       { LOGCONDITIONAL(machine_procIdle()); }
 #define _LOG_E_PROC_BUSY() \
-       { machine_procBusy(); }
-#endif
+       { LOGCONDITIONAL(machine_procBusy()); }
 
 #endif