- client: fix bug introduced in [19035] that causes wrong nidle instances

(and resulting work fetch problems)
- Unix build: don't touch svn_version.sh if it hasn't changed,
    to avoid remake of sched/ (from Gabor Gombas)

svn path=/trunk/boinc/; revision=19096

checkin_notes

@@ -7893,3 +7893,13 @@ David  18 Sept 2009
     config.sub
     missing
     m4/libtool.m4
+
+David  18 Sept 2009
+    - client: fix bug introduced in [19035] that causes wrong nidle instances
+        (and resulting work fetch problems)
+    - Unix build: don't touch svn_version.sh if it hasn't changed,
+        to avoid remake of sched/ (from Gabor Gombas)
+
+    generate_svn_version.sh
+    client/
+        rr_sim.cpp

client/rr_sim.cpp

@@ -83,13 +83,8 @@ struct RR_SIM_STATUS {
         }
         active.push_back(rp);
         cpu_work_fetch.sim_nused += rp->avp->avg_ncpus;
-        p->cpu_pwf.sim_nused += rp->avp->avg_ncpus;
-
         cuda_work_fetch.sim_nused += rp->avp->ncudas;
-        p->cuda_pwf.sim_nused += rp->avp->ncudas;
-
         ati_work_fetch.sim_nused += rp->avp->natis;
-        p->ati_pwf.sim_nused += rp->avp->natis;
     }
     // remove *rpbest from active set,
     // and adjust FLOPS left for other results

generate_svn_version.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/env sh
 
-echo "#ifndef SVN_VERSION_H" > svn_version.h
-echo "#define SVN_VERSION_H" >> svn_version.h
-echo "" >> svn_version.h
+HEADER="svn_version.h"
+TMPFILE="$HEADER.tmp"
+
+echo "#ifndef SVN_VERSION_H" > $TMPFILE
+echo "#define SVN_VERSION_H" >> $TMPFILE
+echo "" >> $TMPFILE
 
 if [ -d .git ]; then
     CMD="git svn info"
@@ -17,11 +20,17 @@ if [ "x$CMD" != "x" ]; then
                 /^Rev/ { rev = $2; }; \
                 END { print "#define SVN_VERSION \"Repository: " url \
                             " Revision: " rev "\""; };' \
-               >> svn_version.h
+               >> $TMPFILE
 else
-    echo "#include \"version.h\"" >> svn_version.h
-    echo "#define SVN_VERSION BOINC_VERSION_STRING" >> svn_version.h
+    echo "#include \"version.h\"" >> $TMPFILE
+    echo "#define SVN_VERSION BOINC_VERSION_STRING" >> $TMPFILE
 fi
 
-echo "" >> svn_version.h
-echo "#endif" >> svn_version.h
+echo "" >> $TMPFILE
+echo "#endif" >> $TMPFILE
+
+if cmp "$HEADER" "$TMPFILE" >/dev/null 2>&1; then
+	rm -f "$TMPFILE"
+else
+	mv "$TMPFILE" "$HEADER"
+fi