Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add hostinfo wsl fields 

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2018-03-31 04:50:31 +03:00
parent 0ba3d607d5
commit d297b9a86f
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/hostinfo.cpp
View File

@ -69,6 +69,11 @@ void HOST_INFO::clear_host_info() {
safe_strcpy(os_name, ""); safe_strcpy(os_name, "");
safe_strcpy(os_version, ""); safe_strcpy(os_version, "");
os_wsl_enabled = false;
safe_strcpy(os_wsl_name, "");
safe_strcpy(os_wsl_version, "");
safe_strcpy(product_name, ""); safe_strcpy(product_name, "");
safe_strcpy(mac_address, ""); safe_strcpy(mac_address, "");
@ -124,6 +129,9 @@ int HOST_INFO::parse(XML_PARSER& xp, bool static_items_only) {
if (xp.parse_double("d_free", d_free)) continue; if (xp.parse_double("d_free", d_free)) continue;
if (xp.parse_str("os_name", os_name, sizeof(os_name))) continue; if (xp.parse_str("os_name", os_name, sizeof(os_name))) continue;
if (xp.parse_str("os_version", os_version, sizeof(os_version))) continue; if (xp.parse_str("os_version", os_version, sizeof(os_version))) continue;
if (xp.parse_bool("os_wsl_enabled", os_wsl_enabled)) continue;
if (xp.parse_str("os_wsl_name", os_wsl_name, sizeof(os_wsl_name))) continue;
if (xp.parse_str("os_wsl_version", os_wsl_version, sizeof(os_wsl_version))) continue;
if (xp.parse_str("product_name", product_name, sizeof(product_name))) continue; if (xp.parse_str("product_name", product_name, sizeof(product_name))) 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.match_tag("coprocs")) { if (xp.match_tag("coprocs")) {
@ -154,7 +162,7 @@ int HOST_INFO::parse(XML_PARSER& xp, bool static_items_only) {
int HOST_INFO::write( int HOST_INFO::write(
MIOFILE& out, bool include_net_info, bool include_coprocs MIOFILE& out, bool include_net_info, bool include_coprocs
) { ) {
char pv[265], pm[256], pf[1024], osn[256], osv[256], pn[256]; char pv[265], pm[256], pf[1024], osn[256], osv[256], oswsln[256], oswslv[256], pn[256];
out.printf( out.printf(
"<host_info>\n" "<host_info>\n"
" <timezone>%d</timezone>\n", " <timezone>%d</timezone>\n",
@ -173,6 +181,8 @@ int HOST_INFO::write(
xml_escape(p_features, pf, sizeof(pf)); xml_escape(p_features, pf, sizeof(pf));
xml_escape(os_name, osn, sizeof(osn)); xml_escape(os_name, osn, sizeof(osn));
xml_escape(os_version, osv, sizeof(osv)); xml_escape(os_version, osv, sizeof(osv));
xml_escape(os_wsl_name, oswsln, sizeof(oswsln));
xml_escape(os_wsl_version, oswslv, sizeof(oswslv));
out.printf( out.printf(
" <host_cpid>%s</host_cpid>\n" " <host_cpid>%s</host_cpid>\n"
" <p_ncpus>%d</p_ncpus>\n" " <p_ncpus>%d</p_ncpus>\n"
@ -211,6 +221,17 @@ int HOST_INFO::write(
osv, osv,
coprocs.ndevs() coprocs.ndevs()
); );
if (os_wsl_enabled) {
out.printf(
" <os_wsl_enabled>%d</os_wsl_enabled>\n"
" <os_wsl_name>%s</os_wsl_name>\n"
" <os_wsl_version>%s</os_wsl_version>\n"
,
os_wsl_enabled,
oswsln,
oswslv
);
}
if (strlen(product_name)) { if (strlen(product_name)) {
xml_escape(product_name, pn, sizeof(pn)); xml_escape(product_name, pn, sizeof(pn));
out.printf( out.printf(

6
lib/hostinfo.h
View File

@ -61,6 +61,12 @@ public:
char os_name[256]; char os_name[256];
char os_version[256]; char os_version[256];
// WSL information for Win10 only
bool os_wsl_enabled;
char os_wsl_name[256];
char os_wsl_version[256];
char product_name[256]; // manufacturer and/or model of system char product_name[256]; // manufacturer and/or model of system
char mac_address[256]; // MAC addr e.g. 00:00:00:00:00:00 char mac_address[256]; // MAC addr e.g. 00:00:00:00:00:00
// currently populated for Android // currently populated for Android