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

- DB/feeder/scheduler: change app_version.xml_doc from blob to mediumblob, 

and change the correspending structure field from 64KB to 256KB
    (could increase this if needed).
    This is needed to handle app versions with lots (> 100) of files
- change LARGE_BLOB_SIZE to BLOB_SIZE a bunch of places
- Change COPROCS from vector<COPROC> to vector<COPROC*>.
    Otherwise the right virtual functions of COPROCs don't get called

svn path=/trunk/boinc/; revision=14986
This commit is contained in:
David Anderson 2008-03-31 16:19:45 +00:00
parent 84c3e7fb53
commit 6af9f66b4e
19 changed files with 86 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
checkin_notes
View File

@ -2826,3 +2826,22 @@ Janus Mar 30 2008
sched/
sched_send.C
David Mar 31 2008
- DB/feeder/scheduler: change app_version.xml_doc from blob to mediumblob,
and change the correspending structure field from 64KB to 256KB
(could increase this if needed).
This is needed to handle app versions with lots (> 100) of files
- change LARGE_BLOB_SIZE to BLOB_SIZE a bunch of places
- Change COPROCS from vector<COPROC> to vector<COPROC*>.
Otherwise the right virtual functions of COPROCs don't get called
db/
boinc_db.C,h
schema.sql
html/ops/
db_update.php
lib/
coproc.h
sched/
*.C
server_types.h

2
db/boinc_db.C
View File

@ -457,7 +457,7 @@ void DB_HOST::db_parse(MYSQL_ROW &r) {
// so only include fields modified by the scheduler.
//
int DB_HOST::update_diff(HOST& h) {
char buf[LARGE_BLOB_SIZE], updates[LARGE_BLOB_SIZE], query[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE], updates[BLOB_SIZE], query[BLOB_SIZE];
strcpy(updates, "");
if (rpc_seqno != h.rpc_seqno) {
sprintf(buf, " rpc_seqno=%d,", rpc_seqno);

33
db/boinc_db.h
View File

@ -35,11 +35,16 @@
extern DB_CONN boinc_db;
// Sizes of text buffers in memory, corresponding to database BLOBs.
// Large is for fields with user-supplied text, and preferences
// The following is for regular blobs, 64KB
#define LARGE_BLOB_SIZE 65536
#define MSG_FROM_HOST_BLOB_SIZE 262144
#define MSG_TO_HOST_BLOB_SIZE 262144
#define BLOB_SIZE 65536
// The following are for "medium blobs",
// which are 16MB in the DB
//
#define APP_VERSION_XML_BLOB_SIZE 262144
#define MSG_FROM_HOST_BLOB_SIZE 262144
#define MSG_TO_HOST_BLOB_SIZE 262144
// Dummy name for file xfers
#define FILE_MOVER "move_file"
@ -84,7 +89,7 @@ struct APP_VERSION {
int appid;
int version_num;
int platformid;
char xml_doc[LARGE_BLOB_SIZE];
char xml_doc[APP_VERSION_XML_BLOB_SIZE];
// describes app files. format:
// <file_info>...</file_info>
// ...
@ -127,9 +132,9 @@ struct USER {
double total_credit;
double expavg_credit; // credit per second, recent average
double expavg_time; // when the above was computed
char global_prefs[LARGE_BLOB_SIZE];
char global_prefs[BLOB_SIZE];
// global preferences, within <global_preferences> tag
char project_prefs[LARGE_BLOB_SIZE];
char project_prefs[BLOB_SIZE];
// project preferences; format:
// <project_preferences>
// <resource_share>X</resource_share>
@ -190,7 +195,7 @@ struct TEAM {
char url[256];
int type; // Team type (see above)
char name_html[256];
char description[LARGE_BLOB_SIZE];
char description[BLOB_SIZE];
int nusers; // UNDEFINED BY DEFAULT
char country[256];
double total_credit;
@ -337,7 +342,7 @@ struct WORKUNIT {
int create_time;
int appid; // associated app
char name[256];
char xml_doc[LARGE_BLOB_SIZE];
char xml_doc[BLOB_SIZE];
int batch;
double rsc_fpops_est; // estimated # of FP operations
// used to estimate how long a result will take on a host
@ -462,9 +467,9 @@ struct RESULT {
int received_time; // when result was received from host
char name[256];
double cpu_time; // CPU time used to complete result
char xml_doc_in[LARGE_BLOB_SIZE]; // descriptions of output files
char xml_doc_out[LARGE_BLOB_SIZE]; // MD5s of output files
char stderr_out[LARGE_BLOB_SIZE]; // stderr output, if any
char xml_doc_in[BLOB_SIZE]; // descriptions of output files
char xml_doc_out[BLOB_SIZE]; // MD5s of output files
char stderr_out[BLOB_SIZE]; // stderr output, if any
int batch;
int file_delete_state; // see above; values for file_delete_state
int validate_state;
@ -778,8 +783,8 @@ struct SCHED_RESULT_ITEM {
int received_time;
double cpu_time;
double claimed_credit;
char xml_doc_out[LARGE_BLOB_SIZE];
char stderr_out[LARGE_BLOB_SIZE];
char xml_doc_out[BLOB_SIZE];
char stderr_out[BLOB_SIZE];
int app_version_num;
int exit_status;
int file_delete_state;

2
db/schema.sql
View File

@ -57,7 +57,7 @@ create table app_version (
appid integer not null,
version_num integer not null,
platformid integer not null,
xml_doc blob,
xml_doc mediumblob,
min_core_version integer not null default 0,
max_core_version integer not null default 0,
deprecated tinyint not null default 0,

4
html/ops/db_update.php
View File

@ -581,6 +581,10 @@ function update_3_27_2008() {
do_query("update team set ping_user=0, ping_time=0 where ping_user=userid");
}
function update_3_31_2008() {
do_query("alter table app_version change column xml_doc xml_doc mediumblob");
}
// modify the following to call the function you want.
// Make sure you do all needed functions, in order.
// (Look at your DB structure using "explain" queries to see

5
lib/coproc.h
View File

@ -35,6 +35,11 @@ struct COPROCS {
std::vector<COPROC*> coprocs;
COPROCS(){}
~COPROCS() {
for (unsigned int i=0; i<coprocs.size(); i++) {
delete coprocs[i];
}
}
void get();
int parse(FILE*);
};

2
sched/db_purge.C
View File

@ -261,7 +261,7 @@ int archive_result(DB_RESULT& result) {
// xml_escape can increase size by factor of 6, e.g. x -> &#NNN;
//
char buf[LARGE_BLOB_SIZE*6];
char buf[BLOB_SIZE*6];
xml_escape(result.stderr_out, buf);
fprintf(

4
sched/file_deleter.C
View File

@ -126,7 +126,7 @@ int get_file_path(
int wu_delete_files(WORKUNIT& wu) {
char* p;
char filename[256], pathname[256], buf[LARGE_BLOB_SIZE];
char filename[256], pathname[256], buf[BLOB_SIZE];
bool no_delete=false;
int count_deleted = 0, retval, mthd_retval = 0;
@ -180,7 +180,7 @@ int wu_delete_files(WORKUNIT& wu) {
int result_delete_files(RESULT& result) {
char* p;
char filename[256], pathname[256], buf[LARGE_BLOB_SIZE];
char filename[256], pathname[256], buf[BLOB_SIZE];
bool no_delete=false;
int count_deleted = 0, retval, mthd_retval = 0;

2
sched/get_file.C
View File

@ -66,7 +66,7 @@ void init_xfer_result(DB_RESULT& result) {
int create_upload_result(DB_RESULT& result, int host_id, const char * file_name) {
int retval;
char result_xml[LARGE_BLOB_SIZE];
char result_xml[BLOB_SIZE];
sprintf(result_xml,
"<result>\n"
" <wu_name>%s</wu_name>\n"

2
sched/handle_request.C
View File

@ -786,7 +786,7 @@ int send_result_abort( SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
// 2) send global prefs in reply msg if needed
//
int handle_global_prefs(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
reply.send_global_prefs = false;
bool have_working_prefs = (strlen(sreq.working_global_prefs_xml)>0);
bool have_master_prefs = (strlen(sreq.global_prefs_xml)>0);

8
sched/make_work.C
View File

@ -63,7 +63,7 @@ bool one_pass = false;
// Don't patch the URL; we'll download the same file
//
void replace_file_name(char* xml_doc, char* filename, char* new_filename) {
char buf[LARGE_BLOB_SIZE], temp[256];
char buf[BLOB_SIZE], temp[256];
char * p;
strcpy(buf, xml_doc);
@ -87,8 +87,8 @@ void replace_file_name(char* xml_doc, char* filename, char* new_filename) {
}
void make_new_wu(DB_WORKUNIT& original_wu, char* starting_xml, int start_time) {
char file_name[256], buf[LARGE_BLOB_SIZE], new_file_name[256];
char new_buf[LARGE_BLOB_SIZE];
char file_name[256], buf[BLOB_SIZE], new_file_name[256];
char new_buf[BLOB_SIZE];
char * p;
int retval;
DB_WORKUNIT wu = original_wu;
@ -172,7 +172,7 @@ void wait_for_results(int wu_id) {
void make_work(vector<string> &wu_names) {
int retval, start_time=time(0);
char keypath[256];
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
R_RSA_PRIVATE_KEY key;
int nwu_names = wu_names.size();
DB_WORKUNIT wus[nwu_names];

10
sched/sched_plan.C
View File

@ -72,11 +72,11 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
// and some CPU also, and gets 50 GFLOPS total
//
for (unsigned int i=0; i<sreq.coprocs.coprocs.size(); i++) {
COPROC cp = sreq.coprocs.coprocs[i];
if (!strcmp(cp.name, "CUDA")) {
COPROC cu;
strcpy(cu.name, cp.name);
cu.count = 1;
COPROC* cp = sreq.coprocs.coprocs[i];
if (!strcmp(cp->name, "CUDA")) {
COPROC* cu = new COPROC;
strcpy(cu->name, cp->name);
cu->count = 1;
hu.coprocs.coprocs.push_back(cu);
double x = 1e9/sreq.host.p_fpops;
if (x > 1) x = 1;

6
sched/sched_send.C
View File

@ -644,9 +644,9 @@ int wu_is_infeasible(
//
int insert_after(char* buffer, const char* after, const char* text) {
char* p;
char temp[LARGE_BLOB_SIZE];
char temp[BLOB_SIZE];
if (strlen(buffer) + strlen(text) > LARGE_BLOB_SIZE-1) {
if (strlen(buffer) + strlen(text) > BLOB_SIZE-1) {
log_messages.printf(MSG_CRITICAL,
"insert_after: overflow: %d %d\n",
strlen(buffer), strlen(text)
@ -671,7 +671,7 @@ int insert_after(char* buffer, const char* after, const char* text) {
// in preparation for sending it to a client
//
int insert_wu_tags(WORKUNIT& wu, APP& app) {
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
sprintf(buf,
" <rsc_fpops_est>%f</rsc_fpops_est>\n"

2
sched/send_file.C
View File

@ -65,7 +65,7 @@ void init_xfer_result(DB_RESULT& result) {
int create_download_result(DB_RESULT& result, int host_id) {
int retval;
char result_xml[LARGE_BLOB_SIZE];
char result_xml[BLOB_SIZE];
sprintf(result_xml,
"<result>\n"
" <wu_name>%s</wu_name>\n"

14
sched/server_types.C
View File

@ -504,7 +504,7 @@ SCHEDULER_REPLY::~SCHEDULER_REPLY() {
int SCHEDULER_REPLY::write(FILE* fout) {
unsigned int i;
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
// Note: at one point we had
// "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n"
@ -831,7 +831,7 @@ int APP::write(FILE* fout) {
}
int APP_VERSION::write(FILE* fout) {
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
unsigned int i;
strcpy(buf, xml_doc);
@ -862,14 +862,14 @@ int APP_VERSION::write(FILE* fout) {
);
}
for (i=0; i<bavp->host_usage.coprocs.coprocs.size(); i++) {
COPROC& cp = bavp->host_usage.coprocs.coprocs[i];
COPROC* cp = bavp->host_usage.coprocs.coprocs[i];
fprintf(fout,
" <coproc>\n"
" <name>%s</name>\n"
" <count>%d</count>\n"
" </coproc>\n",
cp.name,
cp.count
cp->name,
cp->count
);
}
fputs("</app_version>\n", fout);
@ -877,7 +877,7 @@ int APP_VERSION::write(FILE* fout) {
}
int RESULT::write_to_client(FILE* fout) {
char buf[LARGE_BLOB_SIZE];
char buf[BLOB_SIZE];
unsigned int i;
strcpy(buf, xml_doc_in);
@ -1074,7 +1074,7 @@ int HOST::parse_disk_usage(FILE* fin) {
}
void GLOBAL_PREFS::parse(const char* buf, const char* venue) {
char buf2[LARGE_BLOB_SIZE];
char buf2[BLOB_SIZE];
double dtemp;
defaults();

5
sched/server_types.h
View File

@ -85,6 +85,7 @@ struct HOST_USAGE {
flops = x;
strcpy(cmdline, "");
}
~HOST_USAGE(){}
};
// keep track of the best app_version for each app for this host
@ -241,8 +242,8 @@ struct SCHEDULER_REQUEST {
// how many wall-clock seconds will elapse before
// host will begin any new work for this project
double duration_correction_factor;
char global_prefs_xml[LARGE_BLOB_SIZE];
char working_global_prefs_xml[LARGE_BLOB_SIZE];
char global_prefs_xml[BLOB_SIZE];
char working_global_prefs_xml[BLOB_SIZE];
char code_sign_key[4096];
bool anonymous_platform;

8
tools/backend_lib.C
View File

@ -174,7 +174,7 @@ static int process_wu_template(
const char* additional_xml
) {
char* p;
char buf[LARGE_BLOB_SIZE], md5[33], path[256], url[256], top_download_path[256];
char buf[BLOB_SIZE], md5[33], path[256], url[256], top_download_path[256];
string out, cmdline;
int retval, file_number;
double nbytes;
@ -443,7 +443,7 @@ int create_result(
) {
DB_RESULT result;
char base_outfile_name[256];
char result_template[LARGE_BLOB_SIZE];
char result_template[BLOB_SIZE];
int retval;
result.clear();
@ -540,8 +540,8 @@ int create_work(
const char* additional_xml
) {
int retval;
char _result_template[LARGE_BLOB_SIZE];
char wu_template[LARGE_BLOB_SIZE];
char _result_template[BLOB_SIZE];
char wu_template[BLOB_SIZE];
#if 0
retval = check_files(infiles, ninfiles, config);

2
tools/create_work.C
View File

@ -76,7 +76,7 @@ int main(int argc, const char** argv) {
DB_APP app;
DB_WORKUNIT wu;
int retval;
char wu_template[LARGE_BLOB_SIZE];
char wu_template[BLOB_SIZE];
char wu_template_file[256], result_template_file[256], result_template_path[1024];
const char* command_line=NULL;
const char** infiles = NULL;

8
tools/process_result_template.C
View File

@ -40,9 +40,9 @@
// add a signature of its contents up to that point.
//
int add_signatures(char* xml, R_RSA_PRIVATE_KEY& key) {
char* p = xml, *q1, *q2, buf[LARGE_BLOB_SIZE], buf2[LARGE_BLOB_SIZE];;
char signature_hex[LARGE_BLOB_SIZE];
char signature_xml[LARGE_BLOB_SIZE];
char* p = xml, *q1, *q2, buf[BLOB_SIZE], buf2[BLOB_SIZE];;
char signature_hex[BLOB_SIZE];
char signature_xml[BLOB_SIZE];
int retval, len;
while (1) {
@ -108,7 +108,7 @@ int process_result_template(
SCHED_CONFIG& config
) {
char* p,*q;
char temp[LARGE_BLOB_SIZE], buf[256];
char temp[BLOB_SIZE], buf[256];
int retval;
while (1) {