diff --git a/checkin_notes b/checkin_notes index d4cad64213..2168a03d50 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2692,3 +2692,11 @@ David 5 Mar 2009 client_types.cpp,h cs_scheduler.cpp cs_statefile.cpp + +David 5 Mar 2009 + - scheduler: parse and return platform name in anon platform apps. + Otherwise, if an app version has a platform different from + the client's primary platform, the client won't find it. + + sched/ + server_types.cpp,h diff --git a/sched/server_types.cpp b/sched/server_types.cpp index e53de639ab..d95e386e99 100644 --- a/sched/server_types.cpp +++ b/sched/server_types.cpp @@ -61,6 +61,7 @@ int CLIENT_APP_VERSION::parse(FILE* f) { while (fgets(buf, sizeof(buf), f)) { if (match_tag(buf, "")) return 0; if (parse_str(buf, "", app_name, 256)) continue; + if (parse_str(buf, "", platform, 256)) continue; if (parse_str(buf, "", plan_class, 256)) continue; if (parse_int(buf, "", version_num)) continue; if (parse_double(buf, "", host_usage.flops)) continue; @@ -942,9 +943,10 @@ int RESULT::write_to_client(FILE* fout) { ); } else if (cavp) { fprintf(fout, + " %s\n" " %d\n" " %s\n", - cavp->version_num, cavp->plan_class + cavp->platform, cavp->version_num, cavp->plan_class ); } diff --git a/sched/server_types.h b/sched/server_types.h index 9ba5873fe1..5326909923 100644 --- a/sched/server_types.h +++ b/sched/server_types.h @@ -215,6 +215,7 @@ struct MSG_FROM_HOST_DESC { // struct CLIENT_APP_VERSION { char app_name[256]; + char platform[256]; int version_num; char plan_class[256]; HOST_USAGE host_usage;