Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
    npro  
 Modern all-safe Rust Network Protocol library supporting h1, h2, h3, ws, wt sans-IO and with socket IO + tls
git clone https://npro.rs/repo/npro
 
root / src / common / struct-metadata.c
Author[]Andy Green <andy@warmcat.com> 2025-10-01 18:10 UTC
Committer[]Andy Green <andy@warmcat.com> 2025-10-01 18:41 UTC
Tree47eda340c21fafcccfab455f29700762c7d0ca63   Raw Patch
 
builder-scheduler-ui-clean
builder-scheduler-ui-clean
diff --git a/assets/sai.css b/assets/sai.css index 9132e3c..a186e51 100644 --- a/assets/sai.css +++ b/assets/sai.css @@ -955,15 +955,16 @@ body.overlay-active { } .spreadsheet { - margin-top: 5px; + margin-top: 2px; + font-size: 7pt; } .spreadsheet table { width: 100%; border-collapse: collapse; } .spreadsheet th, .spreadsheet td { - border: 1px solid #ddd; - padding: 4px; + border: 0px solid #ddd; + padding: 2px; font-size: 7pt; text-align: left; } diff --git a/assets/sai.js b/assets/sai.js index 9910f50..95d81fa 100644 --- a/assets/sai.js +++ b/assets/sai.js @@ -518,16 +518,25 @@ function renderSpreadsheet(tasks) { var now_ut = Math.round((new Date().getTime() / 1000)); let html = '<table class="spreadsheet">' + '<thead><tr>' + - '<th>Task</th>' + '<th>Build Step</th>' + - '<th>Started</th>' + + '<th>Since</th>' + + '<th>Task</th>' + '</tr></thead><tbody>'; for (const task of tasks) { + var s1 = "", qc; + + for (qc = 0; qc < task.build_step; qc++) + s1 += "&#9635"; + + while (qc < task.total_steps) { + s1 += "&#9633"; + qc++; + } html += '<tr>' + - `<td><a href="?task=${hsanitize(task.task_uuid)}">${hsanitize(task.task_name)}</a></td>` + - `<td>${hsanitize(task.build_step)} / ${hsanitize(task.total_steps)}</td>` + + `<td>` + s1 + `</td>` + `<td>${agify(now_ut, task.started)} ago</td>` + + `<td><a href="?task=${hsanitize(task.task_uuid)}">${hsanitize(task.task_name)}</a></td>` + '</tr>'; } diff --git a/src/builder/b-nspawn.c b/src/builder/b-nspawn.c index e864c0c..f4ddd56 100644 --- a/src/builder/b-nspawn.c +++ b/src/builder/b-nspawn.c @@ -223,10 +223,7 @@ sai_lsp_reap_cb(void *opaque, const lws_spawn_resource_us_t *res, siginfo_t *si, lws_dir(ns->inp, &du, lws_dir_du_cb); peak_mem_bytes = res->peak_mem_rss; -#if defined(__linux__) - /* on linux, getrusage reports in KiB, on OSX in bytes */ - peak_mem_bytes *= 1024; -#elif defined(__APPLE__) +#if defined(__APPLE__) /* * lws seems to be multiplying OSX ru_maxrss by 1024 when it's already * in bytes. Let's divide it back to bytes. diff --git a/src/server/s-ws-builder.c b/src/server/s-ws-builder.c index 7c73c38..eca88e9 100644 --- a/src/server/s-ws-builder.c +++ b/src/server/s-ws-builder.c @@ -706,18 +706,18 @@ bail: break; case SAIM_WSSCH_BUILDER_LOADREPORT: - { +// { // sai_load_report_t *lr = (sai_load_report_t *)pss->a.dest; // lwsl_notice("%s: @@@@@@@@@@@@@@@@@@ loadreport from %s: ram %uk, disk %uk\n", // __func__, lr->builder_name, lr->reserved_ram_kib, // lr->reserved_disk_kib); - ssize_t wr = write(2, buf, bl); - if (wr != (ssize_t)bl) - lwsl_notice("%s: write failed\n", __func__); - } - lwsl_wsi_user(pss->wsi, "SAIM_WSSCH_BUILDER_LOADREPORT broadcasting\n"); +// ssize_t wr = write(2, buf, bl); +// if (wr != (ssize_t)bl) +// lwsl_notice("%s: write failed\n", __func__); +// } +// lwsl_wsi_user(pss->wsi, "SAIM_WSSCH_BUILDER_LOADREPORT broadcasting\n"); sais_websrv_broadcast(vhd->h_ss_websrv, (const char *)buf, bl); break;
Page fetched 0s ago, creation time: 4ms (vhost etag hits: 0%, cache hits: 0%)