From 6bdc90bb4f086b00f9b3f3696c29b0c8a2d33351 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 17 Jan 2005 21:29:46 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5130
---
 checkin_notes         |  5 +++++
 client/client_state.C | 13 +++++++++----
 db/schema.sql         |  7 +++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index a4a1220532..0841bf69d7 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -22802,4 +22802,9 @@ Bruce 17 Jan 2005
         sched_locality.C
  
 
+David  17 Jan 2005
+    - don't start apps until after benchmark
+        (may work around CPDN bug)
 
+    client/
+        client_state.C
diff --git a/client/client_state.C b/client/client_state.C
index 4e0d27f876..7e2aa13335 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -301,10 +301,6 @@ int CLIENT_STATE::init() {
     retval = make_project_dirs();
     if (retval) return retval;
 
-    // Restart any tasks that were running when we last quit the client
-    //
-    restart_tasks();
-
     // Just to be on the safe side; something may have been modified
     //
     set_client_state_dirty("init");
@@ -349,6 +345,7 @@ int CLIENT_STATE::net_sleep(double x) {
 bool CLIENT_STATE::do_something(double now) {
     int actions = 0, reason, retval;
     SCOPE_MSG_LOG scope_messages(log_messages, CLIENT_MSG_LOG::DEBUG_POLL);
+    static bool tasks_restarted = false;
 
     if (should_run_cpu_benchmarks() && !are_cpu_benchmarks_running()) {
         run_cpu_benchmarks = false;
@@ -407,6 +404,14 @@ bool CLIENT_STATE::do_something(double now) {
     // in that order (active_tasks_poll() sets must_schedule_cpus,
     // and handle_finished_apps() must be done before schedule_cpus()
 
+    // restart tasks here so that if we do benchmark on startup,
+    // we don't immediately suspend apps
+    //
+    if (!activities_suspended && !tasks_restarted) {
+        restart_tasks();
+        tasks_restarted = true;
+    }
+
     ss_logic.poll();
     if (activities_suspended) {
         scope_messages.printf("CLIENT_STATE::do_something(): activities suspended\n");
diff --git a/db/schema.sql b/db/schema.sql
index ea36f39eae..35891d4836 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -413,3 +413,10 @@ create table forum_logging (
     timestamp           integer     not null default 0,
     primary key (userid,threadid)
 ) TYPE=MyISAM;
+
+create table tentative_user (
+    nonce               varchar(254) not null,
+    email_addr          varchar(254) not null,
+    confirmed           integer not null,
+    primary key(nonce)
+);