Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
codes
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
38
Issues
38
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
codes
codes
Commits
94958c20
Commit
94958c20
authored
Jul 14, 2014
by
Jonathan Jenkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct resource stats in the case resource is unused
parent
ee9e1f1a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
src/util/resource-lp.c
src/util/resource-lp.c
+1
-1
src/util/resource.c
src/util/resource.c
+3
-2
No files found.
src/util/resource-lp.c
View file @
94958c20
...
...
@@ -390,7 +390,6 @@ void resource_rev_handler(
void
resource_finalize
(
resource_state
*
ns
,
tw_lp
*
lp
){
/* Fill me in... */
struct
qlist_head
*
ent
;
for
(
int
i
=
0
;
i
<
MAX_RESERVE
+
1
;
i
++
){
qlist_for_each
(
ent
,
&
ns
->
pending
[
i
]){
...
...
@@ -409,6 +408,7 @@ void resource_finalize(
}
written
=
sprintf
(
out_buf
,
"%lu"
,
lp
->
gid
);
// compute peak resource usage
// TODO: wrap this up in the resource interface
for
(
int
i
=
0
;
i
<
ns
->
r
.
num_tokens
+
1
;
i
++
){
written
+=
sprintf
(
out_buf
+
written
,
" %lu"
,
ns
->
r
.
max
[
i
]
-
ns
->
r
.
min_avail
[
i
]);
...
...
src/util/resource.c
View file @
94958c20
...
...
@@ -18,11 +18,11 @@ void resource_init(uint64_t avail, resource *r){
r
->
max_all
=
avail
;
r
->
avail
[
0
]
=
avail
;
r
->
max
[
0
]
=
avail
;
r
->
min_avail
[
0
]
=
UINT64_MAX
;
r
->
min_avail
[
0
]
=
avail
;
for
(
int
i
=
1
;
i
<
MAX_RESERVE
;
i
++
){
r
->
avail
[
i
]
=
0
;
r
->
max
[
i
]
=
0
;
r
->
min_avail
[
i
]
=
UINT64_MAX
;
r
->
min_avail
[
i
]
=
avail
;
}
}
...
...
@@ -119,6 +119,7 @@ int resource_reserve(uint64_t req, resource_token_t *tok, resource *r){
*
tok
=
++
(
r
->
num_tokens
);
r
->
avail
[
*
tok
]
=
req
;
r
->
max
[
*
tok
]
=
req
;
r
->
min_avail
[
*
tok
]
=
req
;
r
->
max
[
0
]
-=
req
;
r
->
avail
[
0
]
-=
req
;
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment