Skip to content
Snippets Groups Projects
Commit 1e0094a0 authored by Elizabeth Baker's avatar Elizabeth Baker
Browse files

Merge remote-tracking branch 'origin/master' into alternative_ending

# Conflicts:
#	allocate.c
parents 65e89a87 933b83d1
No related branches found
No related tags found
Loading
...@@ -159,6 +159,7 @@ int main(int argc, char *argv[]) { ...@@ -159,6 +159,7 @@ int main(int argc, char *argv[]) {
parableProcess[i].parallelisable = newProcess->parallelisable; parableProcess[i].parallelisable = newProcess->parallelisable;
parableProcess[i].timeCompleted = -1; parableProcess[i].timeCompleted = -1;
parableProcess[i].timeRemaining = parableProcess[i].executionTime; parableProcess[i].timeRemaining = parableProcess[i].executionTime;
parableProcess[i].startTime = newProcess->startTime;
addProcessToQueue(CPUs[i].processQueue, &parableProcess[i], currentTime, i); addProcessToQueue(CPUs[i].processQueue, &parableProcess[i], currentTime, i);
} }
numProcessesLeft += 1; numProcessesLeft += 1;
...@@ -222,7 +223,7 @@ int main(int argc, char *argv[]) { ...@@ -222,7 +223,7 @@ int main(int argc, char *argv[]) {
} }
} }
// currentTime += startTime; // currentTime += deltaTime;
} }
// printf("Completed Queue:"); // printf("Completed Queue:");
// llist_print(completedProcesses, (void (*)(void *)) &printQEntry); // llist_print(completedProcesses, (void (*)(void *)) &printQEntry);
...@@ -342,7 +343,7 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll ...@@ -342,7 +343,7 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll
paralizedProcess->timeCompleted = currentTime - deltaTime; paralizedProcess->timeCompleted = currentTime - deltaTime;
paralizedProcess->timeRemaining = 0; paralizedProcess->timeRemaining = 0;
headProcess->timeRemaining = 0; headProcess->timeRemaining = 0;
//printf("process had finished: Current time: %d, startTime: %d\n", currentTime, startTime); //printf("process had finished: Current time: %d, deltaTime: %d\n", currentTime, deltaTime);
printf("%d,FINISHED,pid=%s,proc_remaining=%d\n", printf("%d,FINISHED,pid=%s,proc_remaining=%d\n",
paralizedProcess->timeCompleted, paralizedProcess->processID, *numProcessesLeft); paralizedProcess->timeCompleted, paralizedProcess->processID, *numProcessesLeft);
// Could accumulate statistics here instead of keeping list of completed processes // Could accumulate statistics here instead of keeping list of completed processes
...@@ -413,7 +414,7 @@ void addProcessToQueue(llist *processQueue, process *newProcess, int currentTime ...@@ -413,7 +414,7 @@ void addProcessToQueue(llist *processQueue, process *newProcess, int currentTime
llist_add_inorder(newProcess, processQueue, (int (*)(void *, void *)) &leastTimeRemaining); llist_add_inorder(newProcess, processQueue, (int (*)(void *, void *)) &leastTimeRemaining);
headProcess = headData(processQueue); headProcess = headData(processQueue);
// llist_print(processQueue, (void (*)(void *)) &printQEntry); // llist_print(processQueue, (void (*)(void *)) &printQEntry);
if (strncmp(headProcess->processID, newProcess->processID, sizeof (newProcess->processID))) { if (!strncmp(headProcess->processID, newProcess->processID, sizeof (newProcess->processID))) {
headProcess->justStarted = -1; headProcess->justStarted = -1;
headProcess->startTime = currentTime; headProcess->startTime = currentTime;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment