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
eff93e02
Commit
eff93e02
authored
4 years ago
by
Elizabeth Baker
Browse files
Options
Downloads
Patches
Plain Diff
log fin proc
parent
86ca6e1b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
allocate.c
+15
-8
15 additions, 8 deletions
allocate.c
with
15 additions
and
8 deletions
allocate.c
+
15
−
8
View file @
eff93e02
...
@@ -180,8 +180,12 @@ int main(int argc, char *argv[]) {
...
@@ -180,8 +180,12 @@ int main(int argc, char *argv[]) {
// Log finished processes.
// Log finished processes.
struct
node
*
currNode
=
*
completedProcesses
;
//(struct node *)
struct
node
*
currNode
=
*
completedProcesses
;
//(struct node *)
headData
(
completedProcesses
);
headData
(
completedProcesses
);
process
*
currProc
=
currNode
->
data
;
process
*
currProc
=
currNode
->
data
;;
// = currNode->data;
if
(
currProc
!=
NULL
){
//currProc
while
(
currNode
){
while
(
currNode
){
llist_print
(
completedProcesses
,(
void
(
*
)(
void
*
))
&
printQEntry
);
printf
(
"current time: %d
\n
currProc TC: %d
\n
"
,
currentTime
,
currProc
->
timeCompleted
);
if
(
currProc
!=
NULL
&&
currProc
->
timeCompleted
>=
currentTime
)
{
if
(
currProc
!=
NULL
&&
currProc
->
timeCompleted
>=
currentTime
)
{
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
currProc
->
timeCompleted
,
currProc
->
processID
,
numProcessesLeft
);
currProc
->
timeCompleted
,
currProc
->
processID
,
numProcessesLeft
);
...
@@ -189,6 +193,8 @@ int main(int argc, char *argv[]) {
...
@@ -189,6 +193,8 @@ int main(int argc, char *argv[]) {
currNode
=
currNode
->
next
;
currNode
=
currNode
->
next
;
if
(
currNode
)
currProc
=
currNode
->
data
;
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
);
...
@@ -243,6 +249,7 @@ int main(int argc, char *argv[]) {
...
@@ -243,6 +249,7 @@ int main(int argc, char *argv[]) {
if
(
currProc
!=
NULL
&&
currProc
->
timeCompleted
>=
currentTime
)
{
if
(
currProc
!=
NULL
&&
currProc
->
timeCompleted
>=
currentTime
)
{
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
printf
(
"%d,FINISHED,pid=%s,proc_remaining=%d
\n
"
,
currProc
->
timeCompleted
,
currProc
->
processID
,
numProcessesLeft
);
currProc
->
timeCompleted
,
currProc
->
processID
,
numProcessesLeft
);
}
}
currNode
=
currNode
->
next
;
currNode
=
currNode
->
next
;
if
(
currNode
)
currProc
=
currNode
->
data
;
if
(
currNode
)
currProc
=
currNode
->
data
;
...
@@ -262,6 +269,7 @@ int main(int argc, char *argv[]) {
...
@@ -262,6 +269,7 @@ int main(int argc, char *argv[]) {
// currentTime += deltaTime;
// currentTime += deltaTime;
}
}
//printf("Makespan %d\n", currentTime);
// printf("Completed Queue:");
// printf("Completed Queue:");
// llist_print(completedProcesses, (void (*)(void *)) &printQEntry);
// llist_print(completedProcesses, (void (*)(void *)) &printQEntry);
...
@@ -456,7 +464,6 @@ void calStats(llist *completedProcesses, int *currentTime, float *aveTurnaroundT
...
@@ -456,7 +464,6 @@ void calStats(llist *completedProcesses, int *currentTime, float *aveTurnaroundT
float
overhead
,
totOverhead
,
maxOverhead
;
float
overhead
,
totOverhead
,
maxOverhead
;
process
*
p
=
headData
(
completedProcesses
);
process
*
p
=
headData
(
completedProcesses
);
*
currentTime
=
p
->
timeCompleted
;
count
=
0
;
count
=
0
;
maxOverhead
=
0
;
maxOverhead
=
0
;
...
...
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