Skip to content

Commit

Permalink
minor naming refactor and style adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
vovatrykoz committed Nov 13, 2024
1 parent 37bb9c2 commit 2682a7d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
15 changes: 9 additions & 6 deletions include/MathFramework.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Contains functions from section 3.4 Mathematical Framework
// Some of the description text is copy-pasted from A Compositional Framework for End-to-End Path Delay Calculation
// of Automotive Systems under Different Path Semantics to make finding relevant functions easier
// Some of the description text is copy-pasted from A Compositional Framework
// for End-to-End Path Delay Calculation of Automotive Systems under Different
// Path Semantics to make finding relevant functions easier

#ifndef _MATH_FRAMEWORK_H_
#define _MATH_FRAMEWORK_H_
Expand All @@ -20,20 +21,22 @@
* writer).
* @return false if activation time travel does not occur.
*/
bool att(const TaskInstance& writerTask, const TaskInstance& readerTask);
bool att(const TaskInstance& writerTaskInstance,
const TaskInstance& readerTaskInstance);

/**
* @brief Determines if the writer and reader tasks overlap in execution.
*
*
* The more important “critical function” crit determines if
* (even in case of non-activation time travel) writer and reader
* overlap in execution:
*
*
* @param writerTask The task instance representing the writer.
* @param readerTask The task instance representing the reader.
* @return true if there is an overlap in execution between writer and reader.
* @return false if there is no overlap in execution.
*/
bool crit(const TaskInstance& writerTask, const TaskInstance& readerTask);
bool crit(const TaskInstance& writerTaskInstance,
const TaskInstance& readerTaskInstance);

#endif
13 changes: 8 additions & 5 deletions source/MathFramework.cpp
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
#include "MathFramework.h"

bool att(const TaskInstance& writerTask, const TaskInstance& readerTask) {
if(readerTask.activationTime < writerTask.activationTime) {
bool att(const TaskInstance& writerTaskInstance,
const TaskInstance& readerTaskInstance) {
if (readerTaskInstance.activationTime < writerTaskInstance.activationTime) {
return true;
}

return false;
}

bool crit(const TaskInstance& writerTask, const TaskInstance& readerTask) {
int writerTaskTerminationTime = writerTask.activationTime + writerTask.wcet;
bool crit(const TaskInstance& writerTaskInstance,
const TaskInstance& readerTaskInstance) {
int writerTaskTerminationTime =
writerTaskInstance.activationTime + writerTaskInstance.wcet;

if(readerTask.activationTime < writerTaskTerminationTime) {
if (readerTaskInstance.activationTime < writerTaskTerminationTime) {
return true;
}

Expand Down

0 comments on commit 2682a7d

Please sign in to comment.