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
147ace8a
Commit
147ace8a
authored
May 06, 2017
by
mpoquet
Committed by
GitHub
May 06, 2017
Browse files
Merge pull request #24 from adfaure/json_protocol
Add constructor for std::tuple
parents
922edb8b
bc048ad8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/job_submitter.cpp
View file @
147ace8a
...
...
@@ -376,7 +376,7 @@ static std::tuple<int,double,double> wait_for_query_answer(string submitter_name
XBT_INFO
(
"Returning : %d %f %f"
,
res
->
nb_resources
,
res
->
processing_time
,
res
->
expected_time
);
return
{
res
->
nb_resources
,
res
->
processing_time
,
res
->
expected_time
}
;
return
std
::
tuple
<
int
,
double
,
double
>
(
res
->
nb_resources
,
res
->
processing_time
,
res
->
expected_time
)
;
}
...
...
@@ -387,7 +387,6 @@ int batexec_job_launcher_process(int argc, char *argv[])
JobSubmitterProcessArguments
*
args
=
(
JobSubmitterProcessArguments
*
)
MSG_process_get_data
(
MSG_process_self
());
BatsimContext
*
context
=
args
->
context
;
Workload
*
workload
=
context
->
workloads
.
at
(
args
->
workload_name
);
auto
&
jobs
=
workload
->
jobs
->
jobs
();
...
...
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