Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-20 12:58:22 +0000
committerHenrik Rentz-Reichert2012-02-20 12:58:22 +0000
commit75040cb3a48b029271bd431075fbee68f03b40de (patch)
tree6597ea02d05cb9f2757167845b0e202d636fa656 /runtime
parenta0c700235ae1caa31259d0ad29ccbabf77e2d686 (diff)
parente5b246bcb3c9e7bb79f4f550526ca1fa75151e36 (diff)
downloadorg.eclipse.etrice-75040cb3a48b029271bd431075fbee68f03b40de.tar.gz
org.eclipse.etrice-75040cb3a48b029271bd431075fbee68f03b40de.tar.xz
org.eclipse.etrice-75040cb3a48b029271bd431075fbee68f03b40de.zip
Merge remote branch 'refs/remotes/origin/master'
Conflicts: runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.abin144124 -> 144882 bytes
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c6
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h5
5 files changed, 12 insertions, 3 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
index 6824bf738..3885aae84 100644
--- a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
+++ b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
Binary files differ
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c
index 2e2e7edf6..639798bc6 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c
@@ -92,7 +92,7 @@ etBool etMessageQueue_isNotEmpty(etMessageQueue* self){
return self->last != NULL;
}
-etInt16 etMessageQueue_getHightWaterMark(etMessageQueue* self) {
+etInt16 etMessageQueue_getHighWaterMark(etMessageQueue* self) {
ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "getHightWaterMark")
ET_MSC_LOGGER_SYNC_EXIT
return self->highWaterMark;
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h
index f08b19901..a303146ec 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h
@@ -36,7 +36,7 @@ etMessage* etMessageQueue_getLast(etMessageQueue* self);
etBool etMessageQueue_isNotEmpty(etMessageQueue* self);
-etInt16 etMessageQueue_getHightWaterMark(etMessageQueue* self);
+etInt16 etMessageQueue_getHighWaterMark(etMessageQueue* self);
etInt16 etMessageQueue_getSize(etMessageQueue* self);
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c
index 7af1c4bf7..10e2fe00c 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c
@@ -95,3 +95,9 @@ void etMessageService_execute(etMessageService* self){
ET_MSC_LOGGER_SYNC_EXIT
}
+etInt16 etMessageService_getMessagePoolLowWaterMark(etMessageService* self){
+ ET_MSC_LOGGER_SYNC_ENTRY("etMessageService", "getMessagePoolLowWaterMark")
+ etInt16 lowWaterMark = self->messageBuffer.maxBlocks - etMessageQueue_getHighWaterMark(&self->messageQueue);
+ ET_MSC_LOGGER_SYNC_EXIT
+ return lowWaterMark;
+}
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h
index b7c46060c..5997363d1 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h
@@ -38,10 +38,13 @@ void etMessageService_initMessagePool(etMessageService* self);
void etMessageService_pushMessage(etMessageService* self, etMessage* msg);
etMessage* etMessageService_popMessage(etMessageService* self);
-
etMessage* etMessageService_getMessageBuffer(etMessageService* self, etUInt16 size);
void etMessageService_returnMessageBuffer(etMessageService* self, etMessage* buffer);
void etMessageService_execute(etMessageService* self);
+/* functions for debug and service information */
+etInt16 etMessageService_getMessagePoolLowWaterMark(etMessageService* self);
+
+
#endif /* RMESSAGESERVICE_H_ */

Back to the top