Client: limit # of slots to #CPUS*100. Also, consider an app verison a VM app if one of its files contains "vboxwrapper"

This commit is contained in:
David Anderson 2013-10-24 14:21:30 -07:00
parent bdee88d331
commit 41f2c94902
2 changed files with 9 additions and 4 deletions

View File

@ -518,9 +518,9 @@ int ACTIVE_TASK::get_free_slot(RESULT* rp) {
// paranoia - don't allow unbounded slots
//
if (j > 1000) {
if (j > gstate.ncpus*100) {
msg_printf(rp->project, MSG_INTERNAL_ERROR,
"exceeded limit of 1000 slot directories"
"exceeded limit of %d slot directories", gstate.ncpus*100
);
return ERR_NULL;
}

View File

@ -794,8 +794,13 @@ int APP_VERSION::parse(XML_PARSER& xp) {
}
if (xp.parse_str("app_name", app_name, sizeof(app_name))) continue;
if (xp.match_tag("file_ref")) {
file_ref.parse(xp);
app_files.push_back(file_ref);
int retval = file_ref.parse(xp);
if (!retval) {
if (strstr(file_ref.file_name, "vboxwrapper")) {
is_vm_app = true;
}
app_files.push_back(file_ref);
}
continue;
}
if (xp.parse_int("version_num", version_num)) continue;