Use the codeQL.runningTests.numberOfThreads

This setting has existed for a while, but it was not used for some
reason.

Author: aeisenberg

extensions/ql-vscode/CHANGELOG.md

@@ -14,6 +14,7 @@
 - Clear the problems view of all CodeQL query results when a database is removed.
 - Add a `View DIL` command on query history items. This opens a text editor containing the Datalog Intermediary Language representation of the compiled query.
 - Remove feature flag for the AST Viewer. For more information on how to use the AST Viewer, [see the documentation](https://help.semmle.com/codeql/codeql-for-vscode/procedures/exploring-the-structure-of-your-source-code.html).
+- The `codeQL.runningTests.numberOfThreads` setting is now used correctly when running tests.
 
 ## 1.3.3 - 16 September 2020
 

extensions/ql-vscode/src/cli.ts

@@ -9,7 +9,9 @@ import { StringDecoder } from 'string_decoder';
 import * as tk from 'tree-kill';
 import * as util from 'util';
 import { CancellationToken, Disposable } from 'vscode';
+
 import { BQRSInfo, DecodedBqrsChunk } from './bqrs-cli-types';
+import { CliConfig } from './config';
 import { DistributionProvider } from './distribution';
 import { assertNever } from './helpers-pure';
 import { QueryMetadata, SortDirection } from './interface-types';
@@ -122,12 +124,21 @@ export class CodeQLCliServer implements Disposable {
   /**  A buffer with a single null byte. */
   nullBuffer: Buffer;
 
-  constructor(private config: DistributionProvider, private logger: Logger) {
+  constructor(
+    private distributionProvider: DistributionProvider,
+    private cliConfig: CliConfig,
+    private logger: Logger,
+  ) {
     this.commandQueue = [];
     this.commandInProcess = false;
     this.nullBuffer = Buffer.alloc(1);
-    if (this.config.onDidChangeDistribution) {
-      this.config.onDidChangeDistribution(() => {
+    if (this.distributionProvider.onDidChangeDistribution) {
+      this.distributionProvider.onDidChangeDistribution(() => {
+        this.restartCliServer();
+      });
+    }
+    if (this.cliConfig.onDidChangeCliConfiguration) {
+      this.cliConfig.onDidChangeCliConfiguration(() => {
         this.restartCliServer();
       });
     }
@@ -188,7 +199,7 @@ export class CodeQLCliServer implements Disposable {
    * Get the path to the CodeQL CLI distribution, or throw an exception if not found.
    */
   private async getCodeQlPath(): Promise<string> {
-    const codeqlPath = await this.config.getCodeQlPathWithoutVersionCheck();
+    const codeqlPath = await this.distributionProvider.getCodeQlPathWithoutVersionCheck();
     if (!codeqlPath) {
       throw new Error('Failed to find CodeQL distribution.');
     }
@@ -200,7 +211,14 @@ export class CodeQLCliServer implements Disposable {
    */
   private async launchProcess(): Promise<child_process.ChildProcessWithoutNullStreams> {
     const config = await this.getCodeQlPath();
-    return spawnServer(config, 'CodeQL CLI Server', ['execute', 'cli-server'], [], this.logger, _data => { /**/ });
+    return spawnServer(
+      config,
+      'CodeQL CLI Server',
+      ['execute', 'cli-server'],
+      [],
+      this.logger,
+      _data => { /**/ }
+    );
   }
 
   private async runCodeQlCliInternal(command: string[], commandArgs: string[], description: string): Promise<string> {
@@ -455,7 +473,8 @@ export class CodeQLCliServer implements Disposable {
 
     const subcommandArgs = [
       '--additional-packs', workspaces.join(path.delimiter),
-      '--threads', '8',
+      '--threads',
+      this.cliConfig.numberTestThreads.toString(),
       ...testPaths
     ];
 

extensions/ql-vscode/src/config.ts

@@ -67,6 +67,9 @@ const NUMBER_OF_THREADS_SETTING = new Setting('numberOfThreads', RUNNING_QUERIES
 const TIMEOUT_SETTING = new Setting('timeout', RUNNING_QUERIES_SETTING);
 const MEMORY_SETTING = new Setting('memory', RUNNING_QUERIES_SETTING);
 const DEBUG_SETTING = new Setting('debug', RUNNING_QUERIES_SETTING);
+const RUNNING_TESTS_SETTING = new Setting('runningTests', ROOT_SETTING);
+
+export const NUMBER_OF_TEST_THREADS_SETTING = new Setting('numberOfThreads', RUNNING_TESTS_SETTING);
 export const MAX_QUERIES = new Setting('maxQueries', RUNNING_QUERIES_SETTING);
 export const AUTOSAVE_SETTING = new Setting('autoSave', RUNNING_QUERIES_SETTING);
 
@@ -90,6 +93,14 @@ export interface QueryHistoryConfig {
   onDidChangeQueryHistoryConfiguration: Event<void>;
 }
 
+const CLI_SETTINGS = [NUMBER_OF_TEST_THREADS_SETTING];
+
+export interface CliConfig {
+  numberTestThreads: number;
+  onDidChangeCliConfiguration?: Event<void>;
+}
+
+
 abstract class ConfigListener extends DisposableObject {
   protected readonly _onDidChangeConfiguration = this.push(new EventEmitter<void>());
 
@@ -211,6 +222,21 @@ export class QueryHistoryConfigListener extends ConfigListener implements QueryH
   }
 }
 
+export class CliConfigListener extends ConfigListener implements CliConfig {
+
+  public get numberTestThreads(): number {
+    return NUMBER_OF_TEST_THREADS_SETTING.getValue();
+  }
+
+  public get onDidChangeCliConfiguration(): Event<void> {
+    return this._onDidChangeConfiguration.event;
+  }
+
+  protected handleDidChangeConfiguration(e: ConfigurationChangeEvent): void {
+    this.handleDidChangeConfigurationForRelevantSettings(CLI_SETTINGS, e);
+  }
+}
+
 // Enable experimental features
 
 /**

extensions/ql-vscode/src/extension.ts

@@ -20,6 +20,7 @@ import { AstViewer } from './astViewer';
 import * as archiveFilesystemProvider from './archive-filesystem-provider';
 import { CodeQLCliServer } from './cli';
 import {
+  CliConfigListener,
   DistributionConfigListener,
   MAX_QUERIES,
   QueryHistoryConfigListener,
@@ -314,7 +315,11 @@ async function activateWithInstalledDistribution(
   ctx.subscriptions.push(qlConfigurationListener);
 
   logger.log('Initializing CodeQL cli server...');
-  const cliServer = new CodeQLCliServer(distributionManager, logger);
+  const cliServer = new CodeQLCliServer(
+    distributionManager,
+    new CliConfigListener(),
+    logger
+  );
   ctx.subscriptions.push(cliServer);
 
   logger.log('Initializing query server client.');

extensions/ql-vscode/test/pure-tests/query-test.ts

@@ -109,11 +109,18 @@ describe('using the query server', function() {
       removeAdditionalLogLocation: async () => { /**/ },
       getBaseLocation: () => ''
     };
-    cliServer = new cli.CodeQLCliServer({
-      async getCodeQlPathWithoutVersionCheck(): Promise<string | undefined> {
-        return codeQlPath;
+    cliServer = new cli.CodeQLCliServer(
+      {
+        async getCodeQlPathWithoutVersionCheck(): Promise<string | undefined> {
+          return codeQlPath;
+        },
+      },
+      {
+        numberTestThreads: 2,
+        onDidChangeCliConfiguration: (() => {}) as any
       },
-    }, logger);
+      logger
+    );
     qs = new qsClient.QueryServerClient(
       {
         codeQlPath,