client: show correct user credit if using Science United

Science United uses a single user account on each project;
all SU users share that account.
When the client does a scheduler RPC to the project,
the reported user credit (average and total) is the total over all SU users.

The only way to fix this
(that I could think of, and that doesn't involve server code changes)
is to get user credit from SU rather than from projects.
This involves two parts:

- SU's RPC reply now includes, for each project returned,
    new fields 'user_avg_ec' and 'user_total_ec'.
    These are the sums, over the user's hosts,
    of the recent averate total estimated credit (EC) for that project.
    Note: EC has the same units as credit,
    but it's based on CPU/GPU time and benchmarks,
    rather than project-granted credit.
- In the BOINC client, if a project is attached via a dynamic AM
    (that is, via SU) then we get its user credit numbers (avg and total)
    from AM RPC replies, rather than scheduler RPC replies.

Author: davidpanderson

client/acct_mgr.cpp

@@ -300,6 +300,8 @@ int AM_ACCOUNT::parse(XML_PARSER& xp) {
     safe_strcpy(url_signature, "");
     authenticator.clear();
     resource_share.init();
+    user_avg_ec = 0;
+    user_total_ec = 0;
 
     while (!xp.get_tag()) {
         if (!xp.is_tag) {
@@ -325,6 +327,8 @@ int AM_ACCOUNT::parse(XML_PARSER& xp) {
         if (xp.parse_string("authenticator", authenticator)) continue;
         if (xp.parse_bool("detach", detach)) continue;
         if (xp.parse_bool("update", update)) continue;
+        if (xp.parse_double("user_avg_ec", user_avg_ec)) continue;
+        if (xp.parse_double("user_total_ec", user_total_ec)) continue;
         if (xp.parse_bool("no_cpu", btemp)) {
             handle_no_rsc("CPU", btemp);
             continue;
@@ -652,6 +656,10 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
         for (const AM_ACCOUNT& acct: accounts) {
             pp = gstate.lookup_project(acct.url.c_str());
             if (pp) {
+                if (gstate.acct_mgr_info.dynamic) {
+                    pp->user_expavg_credit = acct.user_avg_ec;
+                    pp->user_total_credit = acct.user_total_ec;
+                }
                 if (acct.detach) {
                     if (pp->attached_via_acct_mgr) {
                         gstate.detach_project(pp);
@@ -781,6 +789,10 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
                     if (acct.suspend.present && acct.suspend.value) {
                         pp->suspend();
                     }
+                    if (gstate.acct_mgr_info.dynamic) {
+                        pp->user_expavg_credit = acct.user_avg_ec;
+                        pp->user_total_credit = acct.user_total_ec;
+                    }
                 } else {
                     msg_printf(NULL, MSG_INTERNAL_ERROR,
                         "Failed to add project: %s",

client/acct_mgr.h

@@ -81,8 +81,11 @@ struct ACCT_MGR_INFO : PROJ_AM {
 
     bool password_error;
     bool dynamic;
-        // This AM dynamically decides what projects to assign.
-        // - send EC in AM RPCs
+        // This AM dynamically decides what projects to assign,
+        // and has a single user per project.
+        // Like Science United.
+        // - send EC in AM RPC requests
+        // - RPC replies will include user_avg_ec, user_total_ec per project
         // - send starvation info if idle resources
         // - network preferences are those from AM
     USER_KEYWORDS user_keywords;
@@ -156,6 +159,8 @@ struct AM_ACCOUNT {
     OPTIONAL_DOUBLE resource_share;
     OPTIONAL_BOOL suspend;
     OPTIONAL_BOOL abort_not_started;
+    double user_avg_ec;
+    double user_total_ec;
 
     void handle_no_rsc(const char*, bool);
     int parse(XML_PARSER&);

client/project.h

@@ -200,6 +200,7 @@ struct PROJECT : PROJ_AM {
         // Used for a clean exit to a project,
         // or if a user wants to pause doing work for the project
     bool attached_via_acct_mgr;
+        // if set, don't let user remove project directly
     bool detach_when_done;
         // when no results for this project, detach it.
         // if using AM, do AM RPC before detaching

client/scheduler_op.cpp

@@ -614,6 +614,11 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
         }
     }
 
+    // if project is attached via a dynamic AM (like Science United)
+    // we get user credit from the AM, not the project
+    //
+    bool ignore_host_credit = project->attached_via_acct_mgr && gstate.acct_mgr_info.dynamic;
+
     // First line should either be tag (HTTP 1.0) or
     // hex length of response (HTTP 1.1)
     //
@@ -668,8 +673,8 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
         }
         else if (xp.parse_str("symstore", project->symstore, sizeof(project->symstore))) continue;
         else if (xp.parse_str("user_name", project->user_name, sizeof(project->user_name))) continue;
-        else if (xp.parse_double("user_total_credit", project->user_total_credit)) continue;
-        else if (xp.parse_double("user_expavg_credit", project->user_expavg_credit)) continue;
+        else if (!ignore_host_credit && xp.parse_double("user_total_credit", project->user_total_credit)) continue;
+        else if (!ignore_host_credit && xp.parse_double("user_expavg_credit", project->user_expavg_credit)) continue;
         else if (xp.parse_double("user_create_time", project->user_create_time)) continue;
         else if (xp.parse_double("cpid_time", cpid_time)) continue;
         else if (xp.parse_str("team_name", project->team_name, sizeof(project->team_name))) continue;