Merge pull request #6426 from BOINC/dpa_submit35

Author: AenBleidd

html/inc/host.inc

@@ -831,7 +831,7 @@ function show_user_hosts($userid, $private, $show_all, $sort, $rev) {
     $now = time();
     $old_hosts=0;
     $i = 1;
-    $hosts = BoincHost::enum("userid=$userid order by $sort_clause");
+    $hosts = BoincHost::enum("userid=$userid order by $sort_clause limit 100");
     $any_product_name = false;
     foreach ($hosts as $host) {
         if ($host->product_name) {

html/user/submit.php

@@ -663,20 +663,24 @@ function handle_query_batch($user) {
         );
         break;
     }
-    echo "<p>";
-    show_button("submit_stats.php?action=flops_graph&batch_id=$batch_id",
-        "Job runtimes"
-    );
-    show_button("submit.php?action=batch_stats&batch_id=$batch_id",
-        "Memory/disk usage"
-    );
-    echo "<p>";
-    show_button("submit_stats.php?action=err_host&batch_id=$batch_id",
-        "Errors by host"
-    );
-    show_button("submit_stats.php?action=err_code&batch_id=$batch_id",
-        "Errors by exit code"
-    );
+    echo "<p>
+        <h3>Completed jobs</h3>
+        <ul>
+        <li>
+        <a href=submit_stats.php?action=flops_graph&batch_id=$batch_id>Job runtimes</a>
+        <li>
+        <a href=submit.php?action=batch_stats&batch_id=$batch_id>Memory/disk usage</a>
+        <li>
+        <a href=submit_stats.php?action=show_hosts&batch_id=$batch_id>Grouped by host</a>
+        </ul>
+        <h3>Failed jobs</h3>
+        <ul>
+        <li>
+        <a href=submit_stats.php?action=err_host&batch_id=$batch_id>Grouped by host</a>
+        <li>
+        <a href=submit_stats.php?action=err_code&batch_id=$batch_id>Grouped by exit code</a>
+        </ul>
+    ";
 
     echo "<h2>Jobs</h2>\n";
     start_table();

html/user/submit_stats.php

@@ -49,14 +49,15 @@ function err_host($batch) {
     text_start();
     arsort($x);
     start_table();
-    table_header('Host', '# errors');
+    table_header('Host', 'OS', '# errors');
     $n = 0;
     foreach ($x as $id=>$count) {
         $host = BoincHost::lookup_id($id);
         table_row(
             "<a href=show_host_detail.php?hostid=$id>$host->domain_name</a>",
+            $host->os_name,
             sprintf(
-                '<a href=submit_stats.php?action=host_list&host_id=%d&batch_id=%d>%d</a>',
+                '<a href=submit_stats.php?action=host_list_errors&host_id=%d&batch_id=%d>%d</a>',
                 $id, $batch->id, $count
             )
         );
@@ -108,7 +109,7 @@ function err_code($batch) {
 
 // list of error results from a host
 //
-function host_list($batch_id, $host_id) {
+function host_list_errors($batch_id, $host_id) {
     page_head("Errors for batch $batch_id, host $host_id");
     $results = BoincResult::enum(
         sprintf('batch=%d and hostid=%d and outcome=%d',
@@ -138,14 +139,22 @@ function code_list($batch_id, $code) {
         )
     );
 
+    text_start();
     start_table();
-    table_header('Job instance');
+    table_header('Job instance', 'Host');
     foreach ($results as $r) {
+        $host = BoincHost::lookup_id($r->hostid);
         table_row(
-            "<a href=result.php?resultid=$r->id>$r->name</a>"
+            "<a href=result.php?resultid=$r->id>$r->name</a>",
+            sprintf('<a href=show_host_detail.php?hostid=%d>%d (%s)</a>',
+                $host->id,
+                $host->id,
+                $host->os_name
+            )
         );
     }
     end_table();
+    text_end();
     page_tail();
 }
 
@@ -223,6 +232,42 @@ function flops_graph($batch) {
     page_tail();
 }
 
+// show hosts that did jobs for this batch
+function show_hosts($batch) {
+    $results = BoincResult::enum_fields(
+        'hostid',
+        sprintf('batch=%d and outcome=%d',
+            $batch->id,
+            RESULT_OUTCOME_SUCCESS
+        )
+    );
+    $x = [];
+    foreach ($results as $r) {
+        $id = $r->hostid;
+        if (array_key_exists($id, $x)) {
+            $x[$id] += 1;
+        } else {
+            $x[$id] = 1;
+        }
+    }
+    arsort($x);
+    page_head("Batch $batch->id: completed jobs grouped by host");
+    text_start();
+    start_table();
+    table_header('Host', 'OS', '# jobs');
+    foreach ($x as $id => $count) {
+        $host = BoincHost::lookup_id($id);
+        table_row(
+            "<a href=show_host_detail.php?hostid=$id>$id</a>",
+            $host->os_name,
+            $count
+        );
+    }
+    end_table();
+    text_end();
+    page_tail();
+}
+
 $batch = BoincBatch::lookup_id(get_int('batch_id'));
 if (!$batch) error_page('no batch');
 switch(get_str('action')) {
@@ -232,15 +277,18 @@ function flops_graph($batch) {
 case 'err_code':
     err_code($batch);
     break;
-case 'host_list':
-    host_list($batch->id, get_int('host_id'));
+case 'host_list_errors':
+    host_list_errors($batch->id, get_int('host_id'));
     break;
 case 'code_list':
     code_list($batch->id, get_int('code'));
     break;
 case 'flops_graph':
     flops_graph($batch);
     break;
+case 'show_hosts':
+    show_hosts($batch);
+    break;
 default:
     error_page('bad action');
 }