git.ucc.asn.au
/
matches
/
honours.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parallel Programming - Trivial
[matches/honours.git]
/
course
/
semester2
/
pprog
/
assignment1
/
single-thread
/
nbody.c
diff --git
a/course/semester2/pprog/assignment1/single-thread/nbody.c
b/course/semester2/pprog/assignment1/single-thread/nbody.c
index
67c36d3
..
c54661f
100644
(file)
--- a/
course/semester2/pprog/assignment1/single-thread/nbody.c
+++ b/
course/semester2/pprog/assignment1/single-thread/nbody.c
@@
-234,6
+234,6
@@
void DisplayStatistics()
*/
bool ExitCondition(void)
{
*/
bool ExitCondition(void)
{
- return ((options.timeout > 0.00 && ((unsigned)(time(NULL) - options.start_time.tv_sec) >= options.timeout))
+ return (
runstate != RUN ||
(options.timeout > 0.00 && ((unsigned)(time(NULL) - options.start_time.tv_sec) >= options.timeout))
|| (options.num_steps > 0 && universe.steps > options.num_steps));
}
|| (options.num_steps > 0 && universe.steps > options.num_steps));
}
UCC
git Repository :: git.ucc.asn.au