From 3916d481d7e9d1d153eb688d13a6654ac892871c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 17 May 2004 17:24:14 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=3387
---
 checkin_notes       | 12 ++++++++++++
 doc/db_dump.php     |  2 +-
 sched/sched_send.C  |  6 +++---
 sched/sched_shmem.h |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 7eab2b1f56..7ef055215c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12319,3 +12319,15 @@ David  May 15 2004
 	api/
 		gutil.C,h
 		reduce.C
+
+David  May 17 2004
+    - In the scheduler shared-memory segment,
+        keep only the result ID (not the whole result record)
+        in each WU_RESULT.
+        This saves large amounts of memory,
+        and doesn't incur any DB overhead because we have to
+        reread the result record anyway.
+
+    sched/
+        sched_shmem.h
+        sched_send.C
diff --git a/doc/db_dump.php b/doc/db_dump.php
index 45204803ff..c68871d62e 100644
--- a/doc/db_dump.php
+++ b/doc/db_dump.php
@@ -76,7 +76,7 @@ htmlspecialchars("<tables>
 list_start();
 list_item(
 "team_total_credit.xml<br> team_total_credit_N.xml",
-"Team summaries, ordered by decreasing <a href=credit.php>total credit</a><.
+"Team summaries, ordered by decreasing <a href=credit.php>total credit</a>.
 The first file is the complete list;
 the remaining files (for N = 0, 1, ...) is the list
 in limited-size chunks."
diff --git a/sched/sched_send.C b/sched/sched_send.C
index 12076ddc6c..1956bb436f 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -479,7 +479,7 @@ static void scan_work_array(
             }
         }
 
-        result = wu_result.result;
+        result.id = wu_result.resultid;
 
         // mark slot as empty AFTER we've copied out of it
         // (since otherwise feeder might overwrite it)
@@ -493,14 +493,14 @@ static void scan_work_array(
         if (retval) {
             log_messages.printf(SCHED_MSG_LOG::CRITICAL,
                 "[RESULT#%d] result.lookup_id() failed %d\n",
-                wu_result.result.id, retval
+                result.id, retval
             );
             goto done;
         }
         if (result.server_state != RESULT_SERVER_STATE_UNSENT) {
             log_messages.printf(SCHED_MSG_LOG::DEBUG,
                 "[RESULT#%d] expected to be unsent; instead, state is %d\n",
-                wu_result.result.id, result.server_state
+                result.id, result.server_state
             );
             goto done;
         }
diff --git a/sched/sched_shmem.h b/sched/sched_shmem.h
index 277ad516ea..7aa5435c15 100644
--- a/sched/sched_shmem.h
+++ b/sched/sched_shmem.h
@@ -51,7 +51,7 @@ struct WU_RESULT {
     int state;
     int infeasible_count;
     WORKUNIT workunit;
-    RESULT result;
+    int resultid;
 };
 
 struct SCHED_SHMEM {