diff options
| author | Thomas Schuetz | 2013-07-03 18:52:37 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2013-07-03 19:22:01 +0000 |
| commit | 0f66e0f056d1065bc2192ac1e563443d96b2a547 (patch) | |
| tree | 48ed969d5a1ac3b1adee3d89cc1e9b088534a05b /runtime | |
| parent | ea246893be3af78e0c3b2fe1db5d738291bf46a4 (diff) | |
| download | org.eclipse.etrice-0f66e0f056d1065bc2192ac1e563443d96b2a547.tar.gz org.eclipse.etrice-0f66e0f056d1065bc2192ac1e563443d96b2a547.tar.xz org.eclipse.etrice-0f66e0f056d1065bc2192ac1e563443d96b2a547.zip | |
[runtime.c] added defines for async MSC logger
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h | 42 | ||||
| -rw-r--r-- | runtime/org.eclipse.etrice.runtime.c/src/config/etRuntimeConfig.h | 7 |
2 files changed, 36 insertions, 13 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h b/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h index 81edcd151..70f24d7c2 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h @@ -36,26 +36,46 @@ void etMSCLogger_setState(char* objectName, char* stateName); #define ET_MSC_LOGGER_CLOSE etMSCLogger_close();
- #define ET_MSC_LOGGER_SYNC_ENTRY(object, message) \
- char* sourceName = etMSCLogger_getObjectName(); \
- char* targetName = object; \
- etMSCLogger_syncCall(sourceName, message, targetName); \
- etMSCLogger_setObjectName(targetName);
-
-
- #define ET_MSC_LOGGER_SYNC_EXIT \
- etMSCLogger_syncReturn(sourceName, targetName); \
- etMSCLogger_setObjectName(sourceName);
-
#define ET_MSC_LOGGER_CHANGE_STATE(objectName, stateName) \
etMSCLogger_setState(objectName, stateName);
+ #ifdef ET_SYNC_MSC_LOGGER_ACTIVATE
+ #define ET_MSC_LOGGER_SYNC_ENTRY(object, message) \
+ char* sourceName = etMSCLogger_getObjectName(); \
+ char* targetName = object; \
+ etMSCLogger_syncCall(sourceName, message, targetName); \
+ etMSCLogger_setObjectName(targetName);
+ #define ET_MSC_LOGGER_SYNC_EXIT \
+ etMSCLogger_syncReturn(sourceName, targetName); \
+ etMSCLogger_setObjectName(sourceName);
+ #else
+ #define ET_MSC_LOGGER_SYNC_ENTRY(object, message)
+ #define ET_MSC_LOGGER_SYNC_EXIT
+ #endif
+
+
+ #ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE
+ #define ET_MSC_LOGGER_ASYNC_OUT(sourceName, message, targetName) \
+ etMSCLogger_asyncOut(sourceName, message, targetName);
+
+ #define ET_MSC_LOGGER_ASYNC_IN(sourceName, message, targetName) \
+ etMSCLogger_asyncIn(sourceName, message, targetName);
+ #else
+ #define ET_MSC_LOGGER_ASYNC_OUT(sourceName, message, targetName)
+ #define ET_MSC_LOGGER_ASYNC_IN(sourceName, message, targetName)
+ #endif
+
+
#else
#define ET_MSC_LOGGER_OPEN
#define ET_MSC_LOGGER_CLOSE
#define ET_MSC_LOGGER_SYNC_ENTRY(object, message)
#define ET_MSC_LOGGER_SYNC_EXIT
+
+ #define ET_MSC_LOGGER_ASYNC_OUT(sourceName, message, targetName)
+ #define ET_MSC_LOGGER_ASYNC_IN(sourceName, message, targetName)
+
#define ET_MSC_LOGGER_CHANGE_STATE(objectName, stateName)
#endif
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/config/etRuntimeConfig.h b/runtime/org.eclipse.etrice.runtime.c/src/config/etRuntimeConfig.h index c863be28e..05aaffa8e 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/config/etRuntimeConfig.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/config/etRuntimeConfig.h @@ -14,15 +14,18 @@ #define ETGLOBALFLAGS_H_
/* flags for debugging */
+
#define ET_MSC_LOGGER_ACTIVATE /* needs ET_LOGGER_ACTIVATE */
+#define ET_SYNC_MSC_LOGGER_ACTIVATE /* needs ET_MSC_LOGGER_ACTIVATE */
+#define ET_ASYNC_MSC_LOGGER_ACTIVATE /* needs ET_MSC_LOGGER_ACTIVATE */
#define ET_LOGGER_ACTIVATE
#define STRUCT_ALIGN 8
/* timing and scheduling */
-#define FREQUENCY 10L
-#define ET_RUNTIME_MAXLOOP 100
+//#define FREQUENCY 10L
+//#define ET_RUNTIME_MAXLOOP 100
/*#define ET_RUNTIME_ENDLESS*/
/* enable multi threading (e.g. for protection of message queues) */
|