Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge all branches #41

Merged
merged 24 commits into from
May 24, 2018
Merged

merge all branches #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
18601c9
Profiler ON by default in this branch
kiritigowda Oct 1, 2017
f4ce3c0
Merge branch 'develop' into visual-profile
kiritigowda Jan 31, 2018
4e6f56c
Merge branch 'develop' into visual-profile
kiritigowda Jan 31, 2018
cae0b38
Visual Profile: Overhead time
kiritigowda Feb 28, 2018
ab34558
Develop Merge
kiritigowda Mar 4, 2018
a30cbee
Merge branch 'local-master' into visual-profile
kiritigowda Mar 4, 2018
40a659d
Develop Merge
kiritigowda Mar 20, 2018
5030b79
Merge branch 'develop' into visual-profile
kiritigowda Mar 23, 2018
77c906f
Merge branch 'develop' into visual-profile
kiritigowda Mar 24, 2018
ca5e61f
Merge branch 'develop' into visual-profile
kiritigowda Mar 24, 2018
6125eb1
Merge branch 'develop' into visual-profile
kiritigowda Mar 24, 2018
b6a0be2
Merge branch 'develop' into visual-profile
kiritigowda Mar 26, 2018
bc71572
Merge branch 'develop' into visual-profile
kiritigowda Mar 28, 2018
0d3e553
Merge branch 'develop' into visual-profile
kiritigowda Apr 16, 2018
60bac8a
Merge branch 'master' into visual-profile
kiritigowda Apr 18, 2018
c01113c
Merge branch 'master' into develop
kiritigowda Apr 18, 2018
a13be5a
Merge branch 'develop-local' into develop
kiritigowda Apr 18, 2018
c9c9607
Develop local (#36)
kiritigowda May 15, 2018
2aeda16
Version 0.9.9 (#37)
kiritigowda May 15, 2018
22aef6b
Scheduler Release 0.9.9 (#38)
kiritigowda May 15, 2018
d731afb
Merge branch 'visual-profile' into develop
kiritigowda May 15, 2018
b7b8500
Develop Buildable - Fix
May 16, 2018
490cac1
Working code - error fixs
May 24, 2018
ac6f032
Develop merge into master
May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions RTG-scheduler/source/RTG-scheduler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Scheduler Main - Mode Selector
***********************************************************************************************************/
int scheduler_main(char *jobsListFileName, char *releaseTimeFilename, int schedulerMode)
{
PROFILER_START(SRTG, scheduler_main)
//PROFILER_START(SRTG, scheduler_main)
RTGS_Status status = RTGS_SUCCESS;
switch (schedulerMode) {
case 1:
Expand Down Expand Up @@ -40,13 +40,12 @@ int scheduler_main(char *jobsListFileName, char *releaseTimeFilename, int schedu
printf("The Scheduler Mode 5 returned Status ->%d\n", status);
status = 0;
break;

default:
printf("\nMode Not Specified/Not implemented, switched to default mode\n");
printf("Mode 5:: AEAP/ALAP BP with APLAP improver mode->AEAP/ALAP BP Improve\n");
status = RTGS_mode_5(jobsListFileName, releaseTimeFilename);
break;
}
PROFILER_STOP(SRTG, scheduler_main)
//PROFILER_STOP(SRTG, scheduler_main)
return status;
}
2 changes: 1 addition & 1 deletion RTG-scheduler/source/RTGS-entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int main(int argc, char * argv[])
int64_t end_t = RTGS_GetClockCounter();

PROFILER_STOP(SRTG, RTG_Schedule)
PROFILER_SHUTDOWN();
PROFILER_SHUTDOWN();

if (status != RTGS_SUCCESS) {
printf("The Scheduler Failed with error code ->%d\n", status);
Expand Down
3 changes: 1 addition & 2 deletions RTG-scheduler/source/RTGS-helper_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ genericBackupNode *position_delete_preScheduledJob(genericBackupNode *head, int
genericBackupNode *temp1;
int count = 1;
temp = head;

if (temp == NULL) {
if (GLOBAL_RTGS_DEBUG_MSG > 1) { printf("The List is empty\n"); }
return head;
Expand All @@ -597,7 +598,6 @@ genericBackupNode *position_delete_preScheduledJob(genericBackupNode *head, int
temp = temp->next;
++count;
}

return head;
}

Expand Down Expand Up @@ -741,7 +741,6 @@ scheduledResourceNode *remove_recurring_node(scheduledResourceNode* head)
free(t2);
temp->job_next = temp1->job_next;
kernel_check = temp1->job_next;

while (kernel_check->job_next != NULL)
kernel_check = kernel_check->job_next;

Expand Down
6 changes: 2 additions & 4 deletions RTG-scheduler/source/RTGS-mode_3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,8 @@ static int Mode_3_ALAP
if ((localProcessorsAllocatedList->processor_release_time + jobAttributesList[jobNumber].execution_time) > jobAttributesList[jobNumber].deadline)
{
int count = 0;
scheduledResourceNode*temp1 = *processorsAllocatedList;
genericBackupNode* temp2 = processorsDistList;

scheduledResourceNode *temp1 = *processorsAllocatedList;
genericBackupNode *temp2 = processorsDistList;
while (temp2 != NULL)
{
if (count == 0)
Expand Down Expand Up @@ -654,7 +653,6 @@ static int Mode_3_book_keeper
}
if (jobAttributesList[jobNumber].execution_time + presentTime <= jobAttributesList[jobNumber].deadline)
{

processors_available = processors_available - jobAttributesList[jobNumber].processor_req;
processorsInUse = jobAttributesList[jobNumber].processor_req;
processor_release_time = jobAttributesList[jobNumber].execution_time + presentTime;
Expand Down