diff --git a/checkin_notes b/checkin_notes index baa01c0ca4..181636f383 100755 --- a/checkin_notes +++ b/checkin_notes @@ -14728,3 +14728,18 @@ David 22 Dec 2005 html/inc/ user.inc team.inc + +Bruce 22 Dec 2005 + - compile fix to create_work.C + - Einstein@Home-specific hack to the locality scheduler. For new + WU, I need to separate two types of 'sticky/report on RPC' files. + One type is used for WU names of the form FILE__ and the others + are auxilliary. David, after I've talked with you I'll either + generalize this notion or we can eliminate it. + + tools/ + create_work.C + sched/ + server_types.h + sched_locality.C + diff --git a/sched/sched_locality.C b/sched/sched_locality.C index 665eee2250..8706572746 100644 --- a/sched/sched_locality.C +++ b/sched/sched_locality.C @@ -44,9 +44,19 @@ // returns zero if there is a file we can delete. // int delete_file_from_host(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& sreply) { + +#ifdef EINSTEIN_AT_HOME + // append the list of deletion candidates to the file list + int ndelete_candidates = (int)sreq.file_delete_candidates.size(); + for (int j=0; j eah_copy = sreq.file_infos; + sreq.file_infos.clear(); + nfiles = (int) eah_copy.size(); + for (i=0; i results; std::vector msgs_from_host; - std::vector file_infos; // sticky files reported by host + std::vector file_infos; // sticky files reported by host for locality scheduling +#ifdef EINSTEIN_AT_HOME + std::vector file_delete_candidates; // sticky files reported by host, deletion candidates +#endif std::vector other_results; std::vector ip_results; bool have_other_results_list;