diff --git a/checkin_notes b/checkin_notes
index ac26540e00..a6a71218ae 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23380,3 +23380,13 @@ David 28 Jan 2005
client_state.C
gui_rpc_server.C
time_stats.C,h
+
+David 28 Jan 2005
+ - when including FILE_INFOs for sticky files in scheduler request,
+ include the file size and status
+ (0=not present, 1=present, else error code)
+ - change TIME_STATS::last_update from int to double
+
+ client/
+ cs_scheduler.C
+ time_stats.C,h
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index fa8ed16195..90280152e0 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -276,9 +276,11 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p, double work_req) {
fprintf(f,
" \n"
" %s\n"
+ " %f\n"
+ " %d\n"
" \n"
" \n",
- fip->name
+ fip->name, fip->nbytes, fip->status
);
}
fprintf(f, "\n");
diff --git a/client/time_stats.C b/client/time_stats.C
index 2d46067694..3a6584ed54 100644
--- a/client/time_stats.C
+++ b/client/time_stats.C
@@ -104,7 +104,7 @@ int TIME_STATS::write(MIOFILE& out, bool to_server) {
);
if (!to_server) {
out.printf(
- " %d\n",
+ " %f\n",
last_update
);
}
@@ -121,7 +121,7 @@ int TIME_STATS::parse(MIOFILE& in) {
while (in.fgets(buf, 256)) {
if (match_tag(buf, "")) return 0;
- else if (parse_int(buf, "", last_update)) continue;
+ else if (parse_double(buf, "", last_update)) continue;
else if (parse_double(buf, "", on_frac)) continue;
else if (parse_double(buf, "", connected_frac)) continue;
else if (parse_double(buf, "", active_frac)) continue;
diff --git a/client/time_stats.h b/client/time_stats.h
index b9be28f504..968bd71c0c 100644
--- a/client/time_stats.h
+++ b/client/time_stats.h
@@ -20,7 +20,7 @@
#include "miofile.h"
class TIME_STATS {
- int last_update;
+ double last_update;
bool first;
public:
// we maintain an exponentially weighted average of these quantities: