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

Fixed strtok warning, and added PIDLEN.

parent 82e8c61a
Branches
No related tags found
No related merge requests found
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
#include "llist.h" #include "llist.h"
#define INT_MAX __INT_MAX__ #define INT_MAX __INT_MAX__
#define PIDLEN 16
typedef struct { typedef struct {
int timeArrived; int timeArrived;
int timeCompleted; //instant of time completed int timeCompleted; //instant of time completed
char processID[16]; char processID[PIDLEN];
int executionTime; int executionTime;
char parallelisable; char parallelisable;
int timeRemaining; int timeRemaining;
...@@ -396,6 +397,7 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll ...@@ -396,6 +397,7 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll
process *headProcess; process *headProcess;
process *paralizedProcess; process *paralizedProcess;
char * parentPid; char * parentPid;
char Pid[PIDLEN];
headProcess = headData(processQueue); headProcess = headData(processQueue);
...@@ -407,7 +409,8 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll ...@@ -407,7 +409,8 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll
headProcess->timeRemaining = 0; headProcess->timeRemaining = 0;
if (headProcess->parallelisable == 'p') { if (headProcess->parallelisable == 'p') {
//printf("process had finished, and was a paralized subprocess\n"); //printf("process had finished, and was a paralized subprocess\n");
parentPid = strtok(headProcess->processID, "."); strncpy(Pid, headProcess->processID, PIDLEN);
parentPid = strtok(Pid, ".");
paralizedProcess = parallelParent(paralellProcesses, parentPid); paralizedProcess = parallelParent(paralellProcesses, parentPid);
paralizedProcess->subProcsRunning -= 1; paralizedProcess->subProcsRunning -= 1;
if (paralizedProcess->subProcsRunning == 0) { if (paralizedProcess->subProcsRunning == 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment