summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schuetz2013-04-16 12:42:06 (EDT)
committerThomas Schuetz2013-04-16 12:42:21 (EDT)
commit955539f0d645d2f599d5be48071105796421e119 (patch)
tree7883ba2dc2cf614191f1c3ba5e1d2366c564928f
parentc621f5c2d1fd4b27ffee6ba97a83cd9e78e21082 (diff)
downloadorg.eclipse.etrice-955539f0d645d2f599d5be48071105796421e119.zip
org.eclipse.etrice-955539f0d645d2f599d5be48071105796421e119.tar.gz
org.eclipse.etrice-955539f0d645d2f599d5be48071105796421e119.tar.bz2
[generator.c, runtime.c] removed cyclic logger call in subsystem, added
flush for etLogger calls Change-Id: Id94741b8bcaab8bc70472515a5adc183de54bfe4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend1
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java3
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/.gitignore1
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c5
4 files changed, 6 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
index 38f4ba5..9a7340a 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
@@ -181,7 +181,6 @@ class SubSystemClassGen {
if (etTimer_executeNeeded()){
etMessageService_execute(&msgService_Thread1);
«generateDatadrivenExecutes(root, ssi)»
- etLogger_logInfo("Execute");
if (loopCounter++ > ET_RUNTIME_MAXLOOP){
break;
}
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
index 7c51733..4448aef 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
@@ -446,9 +446,6 @@ public class SubSystemClassGen {
_builder.append(_generateDatadrivenExecutes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t\t");
- _builder.append("etLogger_logInfo(\"Execute\");");
- _builder.newLine();
- _builder.append("\t\t\t\t");
_builder.append("if (loopCounter++ > ET_RUNTIME_MAXLOOP){");
_builder.newLine();
_builder.append("\t\t\t\t\t");
diff --git a/runtime/org.eclipse.etrice.modellib.c/.gitignore b/runtime/org.eclipse.etrice.modellib.c/.gitignore
index 54a6691..78e2fe2 100644
--- a/runtime/org.eclipse.etrice.modellib.c/.gitignore
+++ b/runtime/org.eclipse.etrice.modellib.c/.gitignore
@@ -1,4 +1,5 @@
/Debug
+/src-gen-info
*.aux
*.lof
*.gz
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c
index 5ab7da0..662776c 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c
@@ -17,10 +17,12 @@
void etLogger_logError(const char* message){
printf("ERROR: %s\n", message);
+ fflush(stdout);
}
void etLogger_logWarning(const char* message){
printf("WARNING: %s\n", message);
+ fflush(stdout);
}
void etLogger_logInfo(const char* message){
@@ -35,6 +37,7 @@ void etLogger_logErrorF(const char* format, ... ){
vprintf( format, arglist );
va_end( arglist );
printf("\n");
+ fflush(stdout);
}
void etLogger_logWarningF(const char* format, ... ){
@@ -44,6 +47,7 @@ void etLogger_logWarningF(const char* format, ... ){
vprintf( format, arglist );
va_end( arglist );
printf("\n");
+ fflush(stdout);
}
void etLogger_logInfoF(const char* format, ... ){
@@ -53,6 +57,7 @@ void etLogger_logInfoF(const char* format, ... ){
vprintf( format, arglist );
va_end( arglist );
printf("\n");
+ fflush(stdout);
}
etFileHandle etLogger_fopen(const char* filename, const char* mode){