Skip to content

Commit a9ee736

Browse files
krausestkrausest
committed
renanme error in catch clause
1 parent 0f75bd8 commit a9ee736

14 files changed

+174
-188
lines changed

‎webdriver-ts/src/benchmarkRunner.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ async function runBench(
250250
}
251251
errors = errors.concat(result.errors);
252252
warnings = warnings.concat(result.warnings);
253-
} catch (e) {
254-
console.log("UNHANDELED ERROR", e);
255-
errors.push(e as string);
253+
} catch (error) {
254+
console.log("UNHANDELED ERROR", error);
255+
errors.push(error as string);
256256
}
257257
}
258258
}

‎webdriver-ts/src/createResultJS.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ async function main() {
155155
});
156156
}
157157

158-
main().catch((e) => {
159-
console.log("error processing results", e);
158+
main().catch((error) => {
159+
console.log("error processing results", error);
160160
process.exit(1);
161161
});

‎webdriver-ts/src/forkedBenchmarkRunnerLighthouse.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,8 @@ async function runStartupBenchmark(
107107
try {
108108
let result = await runLighthouse(framework, benchmark.subbenchmarks, benchmarkOptions);
109109
return { error, warnings: [], result };
110-
} catch (e) {
111-
error = convertError(e);
112-
return { error, warnings: [] };
110+
} catch (error) {
111+
return { error: convertError(error), warnings: [] };
113112
}
114113
}
115114

@@ -150,9 +149,9 @@ process.on("message", (msg: any) => {
150149
process.send(result);
151150
process.exit(0);
152151
})
153-
.catch((err) => {
152+
.catch((error) => {
154153
console.log("CATCH: Error in forkedBenchmarkRunnerLighthouse");
155-
process.send({ failure: convertError(err) });
154+
process.send({ failure: convertError(error) });
156155
process.exit(0);
157156
});
158157
});

‎webdriver-ts/src/forkedBenchmarkRunnerPlaywright.ts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,24 +159,23 @@ async function runCPUBenchmark(
159159
if (result.duration < 0) throw new Error(`duration ${result} < 0`);
160160
}
161161
return { error, warnings, result: results };
162-
} catch (e) {
163-
console.log("ERROR", e);
164-
error = convertError(e);
165-
return { error, warnings };
162+
} catch (error) {
163+
console.log("ERROR", error);
164+
return { error: convertError(error), warnings };
166165
} finally {
167166
try {
168167
if (page) {
169168
await page.close();
170169
}
171-
} catch (err) {
172-
console.log("ERROR closing page", err);
170+
} catch (error) {
171+
console.log("ERROR closing page", error);
173172
}
174173
try {
175174
if (browser) {
176175
await browser.close();
177176
}
178-
} catch (err) {
179-
console.log("ERROR cleaning up driver", err);
177+
} catch (error) {
178+
console.log("ERROR cleaning up driver", error);
180179
}
181180
}
182181
}
@@ -233,17 +232,16 @@ async function runMemBenchmark(
233232
await page.close();
234233
await browser.close();
235234
return { error, warnings, result: results };
236-
} catch (e) {
237-
console.log("ERROR", e);
238-
error = convertError(e);
235+
} catch (error) {
236+
console.log("ERROR", error);
239237
try {
240238
if (browser) {
241239
await browser.close();
242240
}
243-
} catch (err) {
244-
console.log("ERROR cleaning up driver", err);
241+
} catch (error) {
242+
console.log("ERROR cleaning up driver", error);
245243
}
246-
return { error, warnings };
244+
return { error: convertError(error), warnings };
247245
}
248246
}
249247

@@ -287,9 +285,9 @@ process.on("message", (msg: any) => {
287285
process.send(result);
288286
process.exit(0);
289287
})
290-
.catch((err) => {
291-
console.log("CATCH: Error in forkedBenchmarkRunner", err);
292-
process.send({ failure: convertError(err) });
288+
.catch((error) => {
289+
console.log("CATCH: Error in forkedBenchmarkRunner", error);
290+
process.send({ failure: convertError(error) });
293291
process.exit(0);
294292
});
295293
});

‎webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts

Lines changed: 88 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ async function runBenchmark(page: Page, benchmark: BenchmarkPuppeteer, framework
1414

1515
async function initBenchmark(page: Page, benchmark: BenchmarkPuppeteer, framework: FrameworkData): Promise<any> {
1616
await benchmark.init(page, framework);
17-
if (config.LOG_PROGRESS)
18-
console.log("after initialized", benchmark.benchmarkInfo.id, benchmark.type, framework.name);
17+
if (config.LOG_PROGRESS) console.log("after initialized", benchmark.benchmarkInfo.id, benchmark.type, framework.name);
1918
}
2019

2120
const wait = (delay = 1000) => new Promise((res) => setTimeout(res, delay));
@@ -46,8 +45,8 @@ function convertError(error: any): string {
4645
// eslint-disable-next-line @typescript-eslint/no-unused-vars
4746
async function forceGC(page: Page, client: CDPSession) {
4847
for (let i = 0; i < 7; i++) {
49-
// await client.send('HeapProfiler.collectGarbage');
50-
await page.evaluate("window.gc()");
48+
// await client.send('HeapProfiler.collectGarbage');
49+
await page.evaluate("window.gc()");
5150
}
5251
}
5352

@@ -56,119 +55,113 @@ async function runCPUBenchmark(
5655
benchmark: CPUBenchmarkPuppeteer,
5756
benchmarkOptions: BenchmarkOptions
5857
): Promise<ErrorAndWarning<CPUBenchmarkResult>> {
59-
let error: string = undefined;
60-
let warnings: string[] = [];
61-
let results: CPUBenchmarkResult[] = [];
58+
let warnings: string[] = [];
59+
let results: CPUBenchmarkResult[] = [];
6260

63-
console.log("benchmarking", framework, benchmark.benchmarkInfo.id);
61+
console.log("benchmarking", framework, benchmark.benchmarkInfo.id);
6462
let browser: Browser = null;
6563
let page: Page = null;
66-
try {
67-
browser = await startBrowser(benchmarkOptions);
68-
page = await browser.newPage();
69-
// if (config.LOG_DETAILS) {
64+
try {
65+
browser = await startBrowser(benchmarkOptions);
66+
page = await browser.newPage();
67+
// if (config.LOG_DETAILS) {
7068
page.on("console", (msg) => {
7169
for (let i = 0; i < msg.args().length; ++i) console.log(`BROWSER: ${msg.args()[i]}`);
72-
});
73-
// }
70+
});
71+
// }
7472
for (let i = 0; i < benchmarkOptions.batchSize; i++) {
75-
try {
73+
try {
7674
await page.goto(`http://${benchmarkOptions.host}:${benchmarkOptions.port}/${framework.uri}/index.html`, {
77-
waitUntil: "networkidle0",
75+
waitUntil: "networkidle0",
7876
});
79-
} catch (ex) {
80-
console.log("**** loading benchmark failed, retrying");
77+
} catch (error) {
78+
console.log("**** loading benchmark failed, retrying");
8179
await page.goto(`http://${benchmarkOptions.host}:${benchmarkOptions.port}/${framework.uri}/index.html`, {
82-
waitUntil: "networkidle0",
80+
waitUntil: "networkidle0",
8381
});
84-
}
82+
}
8583

86-
// await (driver as any).sendDevToolsCommand('Network.enable');
87-
// await (driver as any).sendDevToolsCommand('Network.emulateNetworkConditions', {
88-
// offline: false,
89-
// latency: 200, // ms
90-
// downloadThroughput: 780 * 1024 / 8, // 780 kb/s
91-
// uploadThroughput: 330 * 1024 / 8, // 330 kb/s
92-
// });
93-
console.log("initBenchmark");
94-
await initBenchmark(page, benchmark, framework);
84+
// await (driver as any).sendDevToolsCommand('Network.enable');
85+
// await (driver as any).sendDevToolsCommand('Network.emulateNetworkConditions', {
86+
// offline: false,
87+
// latency: 200, // ms
88+
// downloadThroughput: 780 * 1024 / 8, // 780 kb/s
89+
// uploadThroughput: 330 * 1024 / 8, // 330 kb/s
90+
// });
91+
console.log("initBenchmark");
92+
await initBenchmark(page, benchmark, framework);
9593

96-
let categories = [
97-
"blink.user_timing",
98-
"devtools.timeline",
99-
"disabled-by-default-devtools.timeline",
100-
];
101-
// let categories = [
102-
// "loading",
103-
// 'devtools.timeline',
104-
// 'disabled-by-default-devtools.timeline',
105-
// '-*',
106-
// 'v8.execute',
107-
// 'disabled-by-default-devtools.timeline.frame',
108-
// 'toplevel',
109-
// 'blink.console',
110-
// 'blink.user_timing',
111-
// 'latencyInfo',
112-
// 'disabled-by-default-v8.cpu_profiler',
113-
// 'disabled-by-default-devtools.timeline.stack',
114-
// ];
94+
let categories = ["blink.user_timing", "devtools.timeline", "disabled-by-default-devtools.timeline"];
95+
// let categories = [
96+
// "loading",
97+
// 'devtools.timeline',
98+
// 'disabled-by-default-devtools.timeline',
99+
// '-*',
100+
// 'v8.execute',
101+
// 'disabled-by-default-devtools.timeline.frame',
102+
// 'toplevel',
103+
// 'blink.console',
104+
// 'blink.user_timing',
105+
// 'latencyInfo',
106+
// 'disabled-by-default-v8.cpu_profiler',
107+
// 'disabled-by-default-devtools.timeline.stack',
108+
// ];
115109

116-
const client = await page.target().createCDPSession();
110+
const client = await page.target().createCDPSession();
117111

118112
let throttleCPU = slowDownFactor(benchmark.benchmarkInfo.id, benchmarkOptions.allowThrottling);
119-
if (throttleCPU) {
120-
console.log("CPU slowdown", throttleCPU);
121-
await page.emulateCPUThrottling(throttleCPU);
122-
}
123-
113+
if (throttleCPU) {
114+
console.log("CPU slowdown", throttleCPU);
115+
await page.emulateCPUThrottling(throttleCPU);
116+
}
117+
124118
await page.tracing.start({
125119
path: fileNameTrace(framework, benchmark.benchmarkInfo, i, benchmarkOptions),
126-
screenshots: false,
120+
screenshots: false,
127121
categories: categories,
128-
});
129-
await forceGC(page, client);
130-
console.log("runBenchmark");
131-
let m1 = await page.metrics();
132-
await runBenchmark(page, benchmark, framework);
122+
});
123+
await forceGC(page, client);
124+
console.log("runBenchmark");
125+
let m1 = await page.metrics();
126+
await runBenchmark(page, benchmark, framework);
127+
128+
await wait(40);
129+
await page.tracing.stop();
130+
let m2 = await page.metrics();
131+
if (throttleCPU) {
132+
await page.emulateCPUThrottling(1);
133+
}
133134

134-
await wait(40);
135-
await page.tracing.stop();
136-
let m2 = await page.metrics();
137-
if (throttleCPU) {
138-
await page.emulateCPUThrottling(1);
139-
}
140-
141-
// console.log("afterBenchmark", m1, m2);
142-
// let result = (m2.TaskDuration - m1.TaskDuration)*1000.0; //await computeResultsCPU(fileNameTrace(framework, benchmark, i), benchmarkOptions, framework, benchmark, warnings, benchmarkOptions.batchSize);
135+
// console.log("afterBenchmark", m1, m2);
136+
// let result = (m2.TaskDuration - m1.TaskDuration)*1000.0; //await computeResultsCPU(fileNameTrace(framework, benchmark, i), benchmarkOptions, framework, benchmark, warnings, benchmarkOptions.batchSize);
143137
let result = await computeResultsCPU(fileNameTrace(framework, benchmark.benchmarkInfo, i, benchmarkOptions));
144138
let resultScript = await computeResultsJS(
145139
result,
146140
config,
147141
fileNameTrace(framework, benchmark.benchmarkInfo, i, benchmarkOptions)
148142
);
149-
console.log("**** resultScript =", resultScript);
150-
if (m2.Timestamp == m1.Timestamp) throw new Error("Page metrics timestamp didn't change");
143+
console.log("**** resultScript =", resultScript);
144+
if (m2.Timestamp == m1.Timestamp) throw new Error("Page metrics timestamp didn't change");
151145
results.push({ total: result.duration, script: resultScript });
152146
console.log(`duration for ${framework.name} and ${benchmark.benchmarkInfo.id}: ${JSON.stringify(result)}`);
153147
if (result.duration < 0) throw new Error(`duration ${result} < 0`);
154-
}
155-
return { error, warnings, result: results };
156-
} catch (e) {
157-
console.log("ERROR", e);
158-
error = convertError(e);
159-
return { error, warnings };
160-
} finally {
161-
try {
162-
if (browser) {
148+
}
149+
return { error: undefined, warnings, result: results };
150+
} catch (error) {
151+
console.log("ERROR", error);
152+
return { error: convertError(error), warnings };
153+
} finally {
154+
try {
155+
if (browser) {
163156
console.log("*** browser close");
164-
await browser.close();
157+
await browser.close();
165158
console.log("*** browser closed");
166-
}
167-
} catch (err) {
168-
console.log("ERROR cleaning up driver", err);
169-
}
170-
console.log("*** browser has been shutting down");
159+
}
160+
} catch (error) {
161+
console.log("ERROR cleaning up driver", error);
171162
}
163+
console.log("*** browser has been shutting down");
164+
}
172165
}
173166

174167
async function runMemBenchmark(
@@ -191,9 +184,9 @@ async function runMemBenchmark(
191184
for (let i = 0; i < msg.args().length; ++i) console.log(`BROWSER: ${msg.args()[i]}`);
192185
});
193186
}
194-
187+
195188
await page.goto(`http://${benchmarkOptions.host}:${benchmarkOptions.port}/${framework.uri}/index.html`, {
196-
waitUntil: "networkidle0",
189+
waitUntil: "networkidle0",
197190
});
198191

199192
// await (driver as any).sendDevToolsCommand('Network.enable');
@@ -229,17 +222,16 @@ async function runMemBenchmark(
229222
await page.close();
230223
await browser.close();
231224
return { error, warnings, result: results };
232-
} catch (e) {
233-
console.log("ERROR", e);
234-
error = convertError(e);
225+
} catch (error) {
226+
console.log("ERROR", error);
235227
try {
236228
if (browser) {
237229
await browser.close();
238230
}
239-
} catch (err) {
240-
console.log("ERROR cleaning up driver", err);
231+
} catch (error) {
232+
console.log("ERROR cleaning up driver", error);
241233
}
242-
return { error, warnings };
234+
return { error: convertError(error), warnings };
243235
}
244236
}
245237

@@ -285,9 +277,9 @@ process.on("message", (msg: any) => {
285277
process.send(result);
286278
process.exit(0);
287279
})
288-
.catch((err) => {
280+
.catch((error) => {
289281
console.log("CATCH: Error in forkedBenchmarkRunner");
290-
process.send({ failure: convertError(err) });
282+
process.send({ failure: convertError(error) });
291283
process.exit(0);
292284
});
293285
});

0 commit comments

Comments
 (0)