Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-05-03 08:06:01 +0000
committerHenrik Rentz-Reichert2013-05-03 08:06:01 +0000
commit6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24 (patch)
treee95c1b8e23fb7917ce97172458ea4316888f30a4 /runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
parent542803b0983becd79ff95133bec44526c03b7adc (diff)
parent3f26e81bc9be937a2f6c0bf765628093e6eda05b (diff)
downloadorg.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.tar.gz
org.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.tar.xz
org.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.zip
Merge remote branch 'origin/CGenPhysical' into CGenPhysical
Conflicts: tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
index 4f70b98e2..9e66c95fd 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
@@ -111,6 +111,7 @@ void etMessageService_initMessagePool(etMessageService* self){
etMessage* block = (etMessage*) &self->messageBuffer.buffer[i*self->messageBuffer.blockSize];
etMessageQueue_push(&self->messagePool, block);
}
+ etMessageQueue_resetLowWaterMark(&self->messagePool);
ET_MSC_LOGGER_SYNC_EXIT
}
@@ -189,7 +190,7 @@ void etMessageService_execute(etMessageService* self){
etInt16 etMessageService_getMessagePoolLowWaterMark(etMessageService* self){
ET_MSC_LOGGER_SYNC_ENTRY("etMessageService", "getMessagePoolLowWaterMark")
- etInt16 lowWaterMark = self->messageBuffer.maxBlocks - etMessageQueue_getHighWaterMark(&self->messageQueue);
+ etInt16 lowWaterMark = etMessageQueue_getLowWaterMark(&self->messagePool);
ET_MSC_LOGGER_SYNC_EXIT
return lowWaterMark;
}

Back to the top