Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECSS Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AcubeSat-OBC
ECSS Services
Commits
af77a59f
Unverified
Commit
af77a59f
authored
6 years ago
by
Dimitrios Stoupis
Browse files
Options
Downloads
Patches
Plain Diff
Insert activities in an ordered fashion
parent
bb32d588
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Services/TimeBasedSchedulingService.cpp
+11
-5
11 additions, 5 deletions
src/Services/TimeBasedSchedulingService.cpp
with
11 additions
and
5 deletions
src/Services/TimeBasedSchedulingService.cpp
+
11
−
5
View file @
af77a59f
...
@@ -66,7 +66,15 @@ void TimeBasedSchedulingService::insertActivities(Message &request) {
...
@@ -66,7 +66,15 @@ void TimeBasedSchedulingService::insertActivities(Message &request) {
newActivity
.
requestID
.
applicationID
=
request
.
applicationId
;
newActivity
.
requestID
.
applicationID
=
request
.
applicationId
;
newActivity
.
requestID
.
sequenceCount
=
request
.
packetSequenceCount
;
newActivity
.
requestID
.
sequenceCount
=
request
.
packetSequenceCount
;
scheduledActivities
.
push_back
(
newActivity
);
// Insert the new activity in the schedule
const
auto
releaseTimeOrder
=
etl
::
find_if_not
(
scheduledActivities
.
begin
(),
scheduledActivities
.
end
(),
[
=
]
(
ScheduledActivity
const
&
currentElement
)
{
return
releaseTime
>=
currentElement
.
requestReleaseTime
;
});
// Add activities ordered by release time as per the standard requirement
scheduledActivities
.
emplace
(
releaseTimeOrder
,
newActivity
);
}
}
}
}
}
}
...
@@ -148,7 +156,7 @@ void TimeBasedSchedulingService::timeShiftActivitiesByID(Message &request) {
...
@@ -148,7 +156,7 @@ void TimeBasedSchedulingService::timeShiftActivitiesByID(Message &request) {
});
});
if
(
requestIDMatch
!=
scheduledActivities
.
end
())
{
if
(
requestIDMatch
!=
scheduledActivities
.
end
())
{
requestIDMatch
->
requestReleaseTime
+=
relativeOffset
;
// Add the required offset
requestIDMatch
->
requestReleaseTime
+=
relativeOffset
;
// Add the required offset
}
else
{
}
else
{
// todo: Generate failed start of execution for the failed instruction
// todo: Generate failed start of execution for the failed instruction
}
}
...
@@ -192,15 +200,13 @@ void TimeBasedSchedulingService::detailReportAllActivities(Message &request) {
...
@@ -192,15 +200,13 @@ void TimeBasedSchedulingService::detailReportAllActivities(Message &request) {
assert
(
request
.
serviceType
==
11
);
assert
(
request
.
serviceType
==
11
);
assert
(
request
.
messageType
==
16
);
assert
(
request
.
messageType
==
16
);
// todo: add an extra check for the vector size to make sure it matches with
// currentNumberOfActivities?
for
(
auto
const
&
activity
:
scheduledActivities
)
{
for
(
auto
const
&
activity
:
scheduledActivities
)
{
// Create the report message object of telemetry message subtype 10 for each activity
// Create the report message object of telemetry message subtype 10 for each activity
Message
report
=
createTM
(
10
);
Message
report
=
createTM
(
10
);
// todo: append sub-schedule and group ID if they are defined
// todo: append sub-schedule and group ID if they are defined
// todo: append the release time of the current activity "activity.requestReleaseTime;"
// todo: append the request contained in the activity "activity.request;"
// todo: append the request contained in the activity "activity.request;"
// todo: important todo, implement append TC packet in the Message header
// todo: important todo, implement append TC packet in the Message header
report
.
appendUint32
(
activity
.
requestReleaseTime
);
// todo: Replace with the time parser
storeMessage
(
report
);
// Save the report
storeMessage
(
report
);
// Save the report
request
.
resetRead
();
// todo: define if this statement is required
request
.
resetRead
();
// todo: define if this statement is required
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment