Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
comp30023-2021-project-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Elizabeth Baker
comp30023-2021-project-1
Commits
14f8e877
Commit
14f8e877
authored
4 years ago
by
Elizabeth Baker
Browse files
Options
Downloads
Patches
Plain Diff
Sub proc execution times rounded up.
Trying to fix procs remaining.
parent
90b2e89e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
allocate.c
+19
-9
19 additions, 9 deletions
allocate.c
with
19 additions
and
9 deletions
allocate.c
+
19
−
9
View file @
14f8e877
...
@@ -174,6 +174,18 @@ int main(int argc, char *argv[]) {
...
@@ -174,6 +174,18 @@ int main(int argc, char *argv[]) {
printf
(
"Error in test file "
);
printf
(
"Error in test file "
);
exit
(
1
);
exit
(
1
);
}
}
// Log finished processes.
struct
node
*
currNode
=
(
struct
node
*
)
completedProcesses
;
process
*
currProc
=
currNode
->
data
;
while
(
currNode
){
if
(
currProc
->
timeCompleted
>=
currentTime
)
{
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
currProc
->
timeCompleted
,
currProc
->
processID
,
numProcessesLeft
);
}
currNode
=
currNode
->
next
;
if
(
currNode
)
currProc
=
currNode
->
data
;
}
// Log started processes.
// Log started processes.
for
(
int
j
=
0
;
j
<
numCPU
;
j
++
)
{
for
(
int
j
=
0
;
j
<
numCPU
;
j
++
)
{
headProcess
=
headData
(
CPUs
[
j
].
processQueue
);
headProcess
=
headData
(
CPUs
[
j
].
processQueue
);
...
@@ -313,13 +325,13 @@ process *headData(llist *q) {
...
@@ -313,13 +325,13 @@ process *headData(llist *q) {
}
}
process
*
parallelParent
(
llist
*
q
,
char
*
parentPid
)
{
process
*
parallelParent
(
llist
*
q
,
char
*
parentPid
)
{
struct
node
*
head
=
*
q
;
struct
node
*
curr
=
*
q
;
process
*
p
;
process
*
p
;
if
(
head
)
p
=
head
->
data
;
if
(
curr
)
p
=
curr
->
data
;
while
(
head
&&
!
strncmp
(
p
->
processID
,
parentPid
,
strlen
(
parentPid
)))
{
while
(
curr
&&
!
strncmp
(
p
->
processID
,
parentPid
,
strlen
(
parentPid
)))
{
head
=
head
->
next
;
curr
=
curr
->
next
;
p
=
head
->
data
;
p
=
curr
->
data
;
}
}
return
p
;
return
p
;
}
}
...
@@ -355,10 +367,8 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll
...
@@ -355,10 +367,8 @@ void advanceProcessQueue(llist *processQueue, int currentTime, int deltaTime, ll
paralizedProcess
->
timeRemaining
=
0
;
paralizedProcess
->
timeRemaining
=
0
;
headProcess
->
timeRemaining
=
0
;
headProcess
->
timeRemaining
=
0
;
//printf("process had finished: Current time: %d, deltaTime: %d\n", currentTime, deltaTime);
//printf("process had finished: Current time: %d, deltaTime: %d\n", currentTime, deltaTime);
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
// // Could accumulate statistics here instead of keeping list of completed processes
paralizedProcess
->
timeCompleted
,
paralizedProcess
->
processID
,
*
numProcessesLeft
);
// llist_push(processesComplete, paralizedProcess);
// Could accumulate statistics here instead of keeping list of completed processes
llist_push
(
processesComplete
,
paralizedProcess
);
}
}
llist_pop
(
processQueue
);
llist_pop
(
processQueue
);
headProcess
=
headData
(
processQueue
);
headProcess
=
headData
(
processQueue
);
...
...
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