diff --git a/checkin_notes b/checkin_notes index 0213324436..0593bde381 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3811,3 +3811,13 @@ David May 9 2008 sched_plan.C sched_send.C server_types.C + +David May 9 2008 + - client part of the above + + client/ + client_state.C + client_types.C + cpu_sched.C + lib/ + coproc.h diff --git a/client/client_state.C b/client/client_state.C index ff1e1429f7..43f7d3ac69 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -254,7 +254,7 @@ int CLIENT_STATE::init() { } else { for (i=0; iname, c->count); + msg_printf(NULL, MSG_INFO, "Coprocessor: %s (%d)", c->type, c->count); } } diff --git a/client/client_types.C b/client/client_types.C index 5091ddc3af..9aeb4c0bd6 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -1108,7 +1108,7 @@ int APP_VERSION::parse(MIOFILE& in) { if (parse_double(buf, "", flops)) continue; if (parse_str(buf, "", cmdline, sizeof(cmdline))) continue; if (match_tag(buf, "")) { - COPROC* cp = new COPROC; + COPROC* cp = new COPROC(""); int retval = cp->parse(in); if (!retval) { coprocs.coprocs.push_back(cp); diff --git a/client/cpu_sched.C b/client/cpu_sched.C index 87f33f471e..2b190f1222 100644 --- a/client/cpu_sched.C +++ b/client/cpu_sched.C @@ -73,10 +73,10 @@ using std::vector; bool CLIENT_STATE::sufficient_coprocs(APP_VERSION& av) { for (unsigned int i=0; iname); + COPROC* cp2 = coprocs.lookup(cp->type); if (!cp2) { msg_printf(av.project, MSG_INFO, - "Missing a %s coprocessor", cp->name + "Missing a %s coprocessor", cp->type ); return false; } @@ -84,7 +84,7 @@ bool CLIENT_STATE::sufficient_coprocs(APP_VERSION& av) { if (log_flags.cpu_sched_debug) { msg_printf(NULL, MSG_INFO, "[cpu_sched_debug] insufficient coproc %s (%d + %d > %d)", - cp2->name, cp2->used, cp->count, cp2->count + cp2->type, cp2->used, cp->count, cp2->count ); } return false; @@ -96,12 +96,12 @@ bool CLIENT_STATE::sufficient_coprocs(APP_VERSION& av) { void CLIENT_STATE::reserve_coprocs(APP_VERSION& av) { for (unsigned int i=0; iname); + COPROC* cp2 = coprocs.lookup(cp->type); if (!cp2) continue; if (log_flags.cpu_sched_debug) { msg_printf(NULL, MSG_INFO, "[cpu_sched_debug] reserving %d of coproc %s", - cp->count, cp2->name + cp->count, cp2->type ); } cp2->used += cp->count; @@ -111,12 +111,12 @@ void CLIENT_STATE::reserve_coprocs(APP_VERSION& av) { void CLIENT_STATE::free_coprocs(APP_VERSION& av) { for (unsigned int i=0; iname); + COPROC* cp2 = coprocs.lookup(cp->type); if (!cp2) continue; if (log_flags.cpu_sched_debug) { msg_printf(NULL, MSG_INFO, "[cpu_sched_debug] freeing %d of coproc %s", - cp->count, cp2->name + cp->count, cp2->type ); } cp2->used -= cp->count; diff --git a/lib/coproc.h b/lib/coproc.h index 0fd7192786..87e3357750 100644 --- a/lib/coproc.h +++ b/lib/coproc.h @@ -104,6 +104,7 @@ struct COPROC_CUDA : public COPROC { struct COPROC_CELL_SPE : public COPROC { static void get(COPROCS&); + COPROC_CELL_SPE() : COPROC("Cell SPE"){} virtual ~COPROC_CELL_SPE(){} };