Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
boinc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
boinc
Commits
05b2c0e5
Unverified
Commit
05b2c0e5
authored
2 months ago
by
lfield
Committed by
GitHub
2 months ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #6140 from BOINC/dpa_docker7
scheduler: update parsing of host info.
parents
f90a2ed2
66e0ba83
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
db/boinc_db_types.h
+2
-3
2 additions, 3 deletions
db/boinc_db_types.h
sched/sched_types.cpp
+2
-2
2 additions, 2 deletions
sched/sched_types.cpp
with
4 additions
and
5 deletions
db/boinc_db_types.h
+
2
−
3
View file @
05b2c0e5
...
@@ -379,11 +379,10 @@ struct HOST {
...
@@ -379,11 +379,10 @@ struct HOST {
WSL_DISTROS
wsl_distros
;
WSL_DISTROS
wsl_distros
;
// Docker info (non-Win only)
// Docker info (non-Win only)
bool
docker_available
;
// present and allowed by config
bool
docker_compose_available
;
char
docker_version
[
256
];
char
docker_version
[
256
];
int
docker_type
;
char
docker_compose_version
[
256
];
char
docker_compose_version
[
256
];
int
docker_compose_type
;
// stuff from time_stats
// stuff from time_stats
double
cpu_and_network_available_frac
;
double
cpu_and_network_available_frac
;
...
...
This diff is collapsed.
Click to expand it.
sched/sched_types.cpp
+
2
−
2
View file @
05b2c0e5
...
@@ -1405,10 +1405,10 @@ int HOST::parse(XML_PARSER& xp) {
...
@@ -1405,10 +1405,10 @@ int HOST::parse(XML_PARSER& xp) {
if
(
xp
.
parse_double
(
"n_bwup"
,
n_bwup
))
continue
;
if
(
xp
.
parse_double
(
"n_bwup"
,
n_bwup
))
continue
;
if
(
xp
.
parse_double
(
"n_bwdown"
,
n_bwdown
))
continue
;
if
(
xp
.
parse_double
(
"n_bwdown"
,
n_bwdown
))
continue
;
if
(
xp
.
parse_str
(
"p_features"
,
p_features
,
sizeof
(
p_features
)))
continue
;
if
(
xp
.
parse_str
(
"p_features"
,
p_features
,
sizeof
(
p_features
)))
continue
;
if
(
xp
.
parse_bool
(
"docker_available"
,
docker_available
))
continue
;
if
(
xp
.
parse_bool
(
"docker_compose_available"
,
docker_compose_available
))
continue
;
if
(
xp
.
parse_str
(
"docker_version"
,
docker_version
,
sizeof
(
docker_version
)))
continue
;
if
(
xp
.
parse_str
(
"docker_version"
,
docker_version
,
sizeof
(
docker_version
)))
continue
;
if
(
xp
.
parse_int
(
"docker_type"
,
docker_type
))
continue
;
if
(
xp
.
parse_str
(
"docker_compose_version"
,
docker_compose_version
,
sizeof
(
docker_compose_version
)))
continue
;
if
(
xp
.
parse_str
(
"docker_compose_version"
,
docker_compose_version
,
sizeof
(
docker_compose_version
)))
continue
;
if
(
xp
.
parse_int
(
"docker_compose_type"
,
docker_compose_type
))
continue
;
if
(
xp
.
parse_str
(
"virtualbox_version"
,
virtualbox_version
,
sizeof
(
virtualbox_version
)))
continue
;
if
(
xp
.
parse_str
(
"virtualbox_version"
,
virtualbox_version
,
sizeof
(
virtualbox_version
)))
continue
;
if
(
xp
.
parse_bool
(
"p_vm_extensions_disabled"
,
p_vm_extensions_disabled
))
continue
;
if
(
xp
.
parse_bool
(
"p_vm_extensions_disabled"
,
p_vm_extensions_disabled
))
continue
;
if
(
xp
.
match_tag
(
"opencl_cpu_prop"
))
{
if
(
xp
.
match_tag
(
"opencl_cpu_prop"
))
{
...
...
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