Commit 619b5e7
src: simplify loop arithmetic in GetCPUInfo
Cache the repeated operations and reuse; potentially generating
efficient code in some platforms, and improving readability.
PR-URL: #26183
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent ddd71f4 commit 619b5e7
2 files changed
Lines changed: 17 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -92,16 +92,17 @@ function cpus() { | |||
| 92 | 92 | // [] is a bugfix for a regression introduced in 51cea61 | |
| 93 | 93 | const data = getCPUs() || []; | |
| 94 | 94 | const result = []; | |
| 95 | - for (var i = 0; i < data.length; i += 7) { | ||
| 95 | + let i = 0; | ||
| 96 | + while (i < data.length) { | ||
| 96 | 97 | result.push({ | |
| 97 | - model: data[i], | ||
| 98 | - speed: data[i + 1], | ||
| 98 | + model: data[i++], | ||
| 99 | + speed: data[i++], | ||
| 99 | 100 | times: { | |
| 100 | - user: data[i + 2], | ||
| 101 | - nice: data[i + 3], | ||
| 102 | - sys: data[i + 4], | ||
| 103 | - idle: data[i + 5], | ||
| 104 | - irq: data[i + 6] | ||
| 101 | + user: data[i++], | ||
| 102 | + nice: data[i++], | ||
| 103 | + sys: data[i++], | ||
| 104 | + idle: data[i++], | ||
| 105 | + irq: data[i++] | ||
| 105 | 106 | } | |
| 106 | 107 | }); | |
| 107 | 108 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -126,15 +126,15 @@ static void GetCPUInfo(const FunctionCallbackInfo<Value>& args) { | |||
| 126 | 126 | // The array is in the format | |
| 127 | 127 | // [model, speed, (5 entries of cpu_times), model2, speed2, ...] | |
| 128 | 128 | std::vector<Local<Value>> result(count * 7); | |
| 129 | - for (int i = 0; i < count; i++) { | ||
| 129 | + for (int i = 0, j = 0; i < count; i++) { | ||
| 130 | 130 | uv_cpu_info_t* ci = cpu_infos + i; | |
| 131 | - result[i * 7] = OneByteString(isolate, ci->model); | ||
| 132 | - result[i * 7 + 1] = Number::New(isolate, ci->speed); | ||
| 133 | - result[i * 7 + 2] = Number::New(isolate, ci->cpu_times.user); | ||
| 134 | - result[i * 7 + 3] = Number::New(isolate, ci->cpu_times.nice); | ||
| 135 | - result[i * 7 + 4] = Number::New(isolate, ci->cpu_times.sys); | ||
| 136 | - result[i * 7 + 5] = Number::New(isolate, ci->cpu_times.idle); | ||
| 137 | - result[i * 7 + 6] = Number::New(isolate, ci->cpu_times.irq); | ||
| 131 | + result[j++] = OneByteString(isolate, ci->model); | ||
| 132 | + result[j++] = Number::New(isolate, ci->speed); | ||
| 133 | + result[j++] = Number::New(isolate, ci->cpu_times.user); | ||
| 134 | + result[j++] = Number::New(isolate, ci->cpu_times.nice); | ||
| 135 | + result[j++] = Number::New(isolate, ci->cpu_times.sys); | ||
| 136 | + result[j++] = Number::New(isolate, ci->cpu_times.idle); | ||
| 137 | + result[j++] = Number::New(isolate, ci->cpu_times.irq); | ||
| 138 | 138 | } | |
| 139 | 139 | ||
| 140 | 140 | uv_free_cpu_info(cpu_infos, count); | |
0 commit comments