Skip to content

Commit 075fe25

Browse files
committed
Use codeQL.runningQueries.numberOfThreads to run interpretation
When running `codeql bqrs interpret`, ensure the `codeQL.runningQueries.numberOfThreads` setting is respected.
1 parent 0f82875 commit 075fe25

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

extensions/ql-vscode/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [UNRELEASED]
44

5+
- Respect the `codeQL.runningQueries.numberOfThreads` setting when creating SARIF files during result interpretation. [#771](https://github.com/github/vscode-codeql/pull/771)
56
- Allow using raw LGTM project slugs for fetching LGTM databases. [#769](https://github.com/github/vscode-codeql/pull/769)
67

78
## 1.4.3 - 22 February 2021

extensions/ql-vscode/src/cli.ts

+6
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,12 @@ export class CodeQLCliServer implements Disposable {
597597
'--source-location-prefix', sourceInfo.sourceLocationPrefix
598598
);
599599
}
600+
601+
args.push(
602+
'--threads',
603+
this.cliConfig.numberThreads.toString(),
604+
);
605+
600606
args.push(resultsPath);
601607
await this.runCodeQlCliCommand(['bqrs', 'interpret'], args, 'Interpreting query results');
602608

extensions/ql-vscode/src/config.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,11 @@ export interface QueryHistoryConfig {
104104
onDidChangeConfiguration: Event<void>;
105105
}
106106

107-
const CLI_SETTINGS = [NUMBER_OF_TEST_THREADS_SETTING];
107+
const CLI_SETTINGS = [NUMBER_OF_TEST_THREADS_SETTING, NUMBER_OF_THREADS_SETTING];
108108

109109
export interface CliConfig {
110110
numberTestThreads: number;
111+
numberThreads: number;
111112
onDidChangeConfiguration?: Event<void>;
112113
}
113114

@@ -235,6 +236,11 @@ export class CliConfigListener extends ConfigListener implements CliConfig {
235236
return NUMBER_OF_TEST_THREADS_SETTING.getValue();
236237
}
237238

239+
240+
public get numberThreads(): number {
241+
return NUMBER_OF_THREADS_SETTING.getValue<number>();
242+
}
243+
238244
protected handleDidChangeConfiguration(e: ConfigurationChangeEvent): void {
239245
this.handleDidChangeConfigurationForRelevantSettings(CLI_SETTINGS, e);
240246
}

extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ describe('config listeners', function() {
4141
{
4242
clazz: CliConfigListener,
4343
settings: [{
44+
name: 'codeQL.runningQueries.numberOfThreads',
45+
property: 'numberThreads',
46+
values: [0, 1]
47+
}, {
4448
name: 'codeQL.runningTests.numberOfThreads',
4549
property: 'numberTestThreads',
4650
values: [1, 0]

0 commit comments

Comments
 (0)