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

Merge pull request #2512 from lfield/ghap-job-params 

Added support for job params and app version
This commit is contained in:
David Anderson 2018-05-14 10:20:12 -07:00 committed by GitHub
parent 4f51d89bea 82880c90aa
commit 8d90c57ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
samples/condor/boinc_gahp.cpp
View File

@ -70,6 +70,8 @@ struct SUBMIT_REQ {
char app_name[256]; char app_name[256];
vector<JOB> jobs; vector<JOB> jobs;
int batch_id; int batch_id;
JOB_PARAMS job_params;
char app_version_num[256];
}; };
struct LOCAL_FILE { struct LOCAL_FILE {
@ -279,6 +281,21 @@ int COMMAND::parse_submit(char* p) {
} }
submit_req.jobs.push_back(job); submit_req.jobs.push_back(job);
} }
JOB_PARAMS jp;
char *chr = NULL;
chr = strtok_r(NULL, " ", &p);
if (chr != NULL) {
jp.rsc_fpops_est = atof(chr);
jp.rsc_fpops_bound = atof(strtok_r(NULL, " ", &p));
jp.rsc_memory_bound = atof(strtok_r(NULL, " ", &p));
jp.rsc_disk_bound = atof(strtok_r(NULL, " ", &p));
jp.delay_bound = atof(strtok_r(NULL, " ", &p));
strlcpy(submit_req.app_version_num, strtok_r(NULL, " ", &p), sizeof(submit_req.app_version_num));
}
submit_req.job_params = jp;
return 0; return 0;
} }
@ -322,9 +339,10 @@ void handle_submit(COMMAND& c) {
return; return;
} }
retval = submit_jobs( retval = submit_jobs_params(
project_url, authenticator, project_url, authenticator,
req.app_name, req.batch_id, req.jobs, error_msg req.app_name, req.batch_id, req.jobs, error_msg,
req.job_params, atoi(req.app_version_num)
); );
if (retval) { if (retval) {
sprintf(buf, "error\\ submitting\\ jobs:\\ %d\\ ", retval); sprintf(buf, "error\\ submitting\\ jobs:\\ %d\\ ", retval);