Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
batsim
batsim
Commits
93cff1c6
Commit
93cff1c6
authored
Jun 21, 2017
by
Millian Poquet
Browse files
[code] codacy {} cosmetics
parent
c1eec28c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/batsim.cpp
View file @
93cff1c6
...
@@ -391,7 +391,9 @@ Other options:
...
@@ -391,7 +391,9 @@ Other options:
{
{
main_args
.
verbosity
=
verbosity_level_from_string
(
args
[
"--verbosity"
].
asString
());
main_args
.
verbosity
=
verbosity_level_from_string
(
args
[
"--verbosity"
].
asString
());
if
(
args
[
"--quiet"
].
asBool
())
if
(
args
[
"--quiet"
].
asBool
())
{
main_args
.
verbosity
=
VerbosityLevel
::
QUIET
;
main_args
.
verbosity
=
VerbosityLevel
::
QUIET
;
}
}
}
catch
(
const
std
::
exception
&
)
catch
(
const
std
::
exception
&
)
{
{
...
@@ -813,11 +815,17 @@ void set_configuration(BatsimContext *context,
...
@@ -813,11 +815,17 @@ void set_configuration(BatsimContext *context,
// Let's override configuration values from main arguments if needed
// Let's override configuration values from main arguments if needed
// *****************************************************************
// *****************************************************************
if
(
main_args
.
redis_hostname
!=
"None"
)
if
(
main_args
.
redis_hostname
!=
"None"
)
{
redis_hostname
=
main_args
.
redis_hostname
;
redis_hostname
=
main_args
.
redis_hostname
;
}
if
(
main_args
.
redis_port
!=
-
1
)
if
(
main_args
.
redis_port
!=
-
1
)
{
redis_port
=
main_args
.
redis_port
;
redis_port
=
main_args
.
redis_port
;
}
if
(
main_args
.
redis_prefix
!=
"None"
)
if
(
main_args
.
redis_prefix
!=
"None"
)
{
redis_prefix
=
main_args
.
redis_prefix
;
redis_prefix
=
main_args
.
redis_prefix
;
}
// *************************************
// *************************************
// Let's update the BatsimContext values
// Let's update the BatsimContext values
...
...
src/jobs_execution.cpp
View file @
93cff1c6
...
@@ -127,7 +127,9 @@ int execute_profile(BatsimContext *context,
...
@@ -127,7 +127,9 @@ int execute_profile(BatsimContext *context,
computation_amount
=
xbt_new
(
double
,
nb_res
);
computation_amount
=
xbt_new
(
double
,
nb_res
);
communication_amount
=
nullptr
;
communication_amount
=
nullptr
;
if
(
size
>
0
)
if
(
size
>
0
)
{
communication_amount
=
xbt_new
(
double
,
nb_res
*
nb_res
);
communication_amount
=
xbt_new
(
double
,
nb_res
*
nb_res
);
}
// Let us fill the local computation and communication matrices
// Let us fill the local computation and communication matrices
int
k
=
0
;
int
k
=
0
;
...
@@ -345,8 +347,10 @@ int execute_job_process(int argc, char *argv[])
...
@@ -345,8 +347,10 @@ int execute_job_process(int argc, char *argv[])
job
->
state
=
JobState
::
JOB_STATE_COMPLETED_KILLED
;
job
->
state
=
JobState
::
JOB_STATE_COMPLETED_KILLED
;
job
->
kill_reason
=
"Walltime reached"
;
job
->
kill_reason
=
"Walltime reached"
;
if
(
args
->
context
->
trace_schedule
)
if
(
args
->
context
->
trace_schedule
)
{
args
->
context
->
paje_tracer
.
add_job_kill
(
job
,
args
->
allocation
->
machine_ids
,
args
->
context
->
paje_tracer
.
add_job_kill
(
job
,
args
->
allocation
->
machine_ids
,
MSG_get_clock
(),
true
);
MSG_get_clock
(),
true
);
}
}
}
args
->
context
->
machines
.
update_machines_on_job_end
(
job
,
args
->
allocation
->
machine_ids
,
args
->
context
->
machines
.
update_machines_on_job_end
(
job
,
args
->
allocation
->
machine_ids
,
...
@@ -404,7 +408,9 @@ int waiter_process(int argc, char *argv[])
...
@@ -404,7 +408,9 @@ int waiter_process(int argc, char *argv[])
XBT_INFO
(
"Sleeping done"
);
XBT_INFO
(
"Sleeping done"
);
}
}
else
else
{
XBT_INFO
(
"Time %g is already reached, skipping sleep"
,
args
->
target_time
);
XBT_INFO
(
"Time %g is already reached, skipping sleep"
,
args
->
target_time
);
}
send_message
(
"server"
,
IPMessageType
::
WAITING_DONE
);
send_message
(
"server"
,
IPMessageType
::
WAITING_DONE
);
delete
args
;
delete
args
;
...
...
Write
Preview
Supports
Markdown
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