openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-19 16:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

!921 adapter esmodule of es2abc

Browse Source 
Merge pull request !921 from zrg/module_es2abc
This commit is contained in:
openharmony_ci
2022-08-09 06:19:07 +00:00
committed by Gitee
parent 5cab0e58c7 710f2d527e
commit 16e5e6d10e
2 changed files with 104 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/gen_abc_plugin.ts
+73 -70
View File
@@ -17,6 +17,7 @@ import * as fs from 'fs';
import * as path from 'path';
import cluster from 'cluster';
import process from 'process';
import os from 'os';
import Compiler from 'webpack/lib/Compiler';
import { logger } from './compile_info';
import {
@@ -412,20 +413,39 @@ function invokeWorkersModuleToGenAbc(moduleInfos: Array<ModuleInfo>): void {
}
function initAbcEnv() : string[] {
let js2abc: string = path.join(arkDir, 'build', 'src', 'index.js');
if (isWin) {
js2abc = path.join(arkDir, 'build-win', 'src', 'index.js');
} else if (isMac) {
js2abc = path.join(arkDir, 'build-mac', 'src', 'index.js');
}
let args: string[] = [];
if (process.env.panda === TS2ABC) {
let js2abc: string = path.join(arkDir, 'build', 'src', 'index.js');
if (isWin) {
js2abc = path.join(arkDir, 'build-win', 'src', 'index.js');
} else if (isMac) {
js2abc = path.join(arkDir, 'build-mac', 'src', 'index.js');
}
js2abc = '"' + js2abc + '"';
const args: string[] = [
'--expose-gc',
js2abc
];
if (isDebug) {
args.push('--debug');
js2abc = '"' + js2abc + '"';
args = [
'--expose-gc',
js2abc
];
if (isDebug) {
args.push('--debug');
}
} else if (process.env.panda === ES2ABC || process.env.panda === 'undefined' || process.env.panda === undefined) {
let es2abc: string = path.join(arkDir, 'build', 'bin', 'es2abc');
if (isWin) {
es2abc = path.join(arkDir, 'build-win', 'bin', 'es2abc.exe');
} else if (isMac) {
es2abc = path.join(arkDir, 'build-mac', 'bin', 'es2abc');
}
args = [
'"' + es2abc + '"'
];
if (isDebug) {
args.push('--debug-info');
}
} else {
logger.error(red, `ETS:ERROR please set panda module`, reset);
}
return args;
@@ -458,41 +478,11 @@ function invokeCluterModuleToAbc(): void {
}
let totalWorkerNumber = 0;
commonJsModuleInfos = Array.from(new Set(commonJsModuleInfos));
if (commonJsModuleInfos.length > 0) {
const tempAbcArgs: string[] = abcArgs.slice(0);
tempAbcArgs.push('-c');
const commonJsCmdPrefix: any = `${nodeJs} ${tempAbcArgs.join(' ')}`;
let workerNumber: number = 3;
const splitedModules: any[] = splitModulesByNumber(commonJsModuleInfos, workerNumber);
workerNumber = splitedModules.length;
totalWorkerNumber += workerNumber;
for (let i = 0; i < workerNumber; i++) {
const workerData: any = {
'inputs': JSON.stringify(splitedModules[i]),
'cmd': commonJsCmdPrefix
};
cluster.fork(workerData);
}
}
let commonJsWorkerNumber: number = invokeClusterByModule(abcArgs, commonJsModuleInfos);
totalWorkerNumber += commonJsWorkerNumber;
ESMModuleInfos = Array.from(new Set(ESMModuleInfos));
if (ESMModuleInfos.length > 0) {
const tempAbcArgs: string[] = abcArgs.slice(0);
tempAbcArgs.push('-m');
const ESMCmdPrefix: any = `${nodeJs} ${tempAbcArgs.join(' ')}`;
let workerNumber: number = 3;
const splitedModules: any[] = splitModulesByNumber(ESMModuleInfos, workerNumber);
workerNumber = splitedModules.length;
totalWorkerNumber += workerNumber;
for (let i = 0; i < workerNumber; i++) {
const workerData: any = {
'inputs': JSON.stringify(splitedModules[i]),
'cmd': ESMCmdPrefix
};
cluster.fork(workerData);
}
}
let esmWorkerNumber: number = invokeClusterByModule(abcArgs, ESMModuleInfos, true);
totalWorkerNumber += esmWorkerNumber;
let count_ = 0;
cluster.on('exit', (worker, code, signal) => {
@@ -513,6 +503,37 @@ function invokeCluterModuleToAbc(): void {
}
}
function invokeClusterByModule(abcArgs:string[], moduleInfos: Array<ModuleInfo>, isModule: Boolean = false) {
moduleInfos = Array.from(new Set(moduleInfos));
let workerNumber: number = 0;
if (moduleInfos.length > 0) {
let cmdPrefix: any = "";
const tempAbcArgs: string[] = abcArgs.slice(0);
if (process.env.panda === TS2ABC) {
workerNumber = 3;
isModule ? tempAbcArgs.push('-m') : tempAbcArgs.push('-c');
cmdPrefix = `${nodeJs} ${tempAbcArgs.join(' ')}`;
} else if (process.env.panda === ES2ABC || process.env.panda === 'undefined' || process.env.panda === undefined) {
workerNumber = os.cpus().length;
isModule ? tempAbcArgs.push('--module') : tempAbcArgs.push('--commonjs');
cmdPrefix = `${tempAbcArgs.join(' ')}`;
} else {
logger.error(red, `ETS:ERROR please set panda module`, reset);
}
const splitedModules: any[] = splitModulesByNumber(moduleInfos, workerNumber);
workerNumber = splitedModules.length;
for (let i = 0; i < workerNumber; i++) {
const workerData: any = {
'inputs': JSON.stringify(splitedModules[i]),
'cmd': cmdPrefix
};
cluster.fork(workerData);
}
}
return workerNumber;
}
function splitModulesByNumber(moduleInfos: Array<ModuleInfo>, workerNumber: number): any[] {
const result: any = [];
if (moduleInfos.length < workerNumber) {
@@ -557,38 +578,20 @@ function judgeModuleWorkersToGenAbc(callback): void {
}
function invokeWorkersToGenAbc(): void {
let param: string = '';
let cmdPrefix: string = '';
let maxWorkerNumber: number = 3;
const abcArgs: string[] = initAbcEnv();
if (process.env.panda === TS2ABC) {
if (isDebug) {
param += ' --debug';
}
let js2abc: string = path.join(arkDir, 'build', 'src', 'index.js');
if (isWin) {
js2abc = path.join(arkDir, 'build-win', 'src', 'index.js');
} else if (isMac) {
js2abc = path.join(arkDir, 'build-mac', 'src', 'index.js');
}
cmdPrefix = `${nodeJs} --expose-gc "${js2abc}" ${param} `;
cmdPrefix = `${nodeJs} ${abcArgs.join(' ')}`;
} else if (process.env.panda === ES2ABC || process.env.panda === 'undefined' || process.env.panda === undefined) {
if (isDebug) {
param += ' --debug-info';
}
let es2abc: string = path.join(arkDir, 'build', 'bin', 'es2abc');
if (isWin) {
es2abc = path.join(arkDir, 'build-win', 'bin', 'es2abc.exe');
} else if (isMac) {
es2abc = path.join(arkDir, 'build-mac', 'bin', 'es2abc');
}
cmdPrefix = `"${es2abc}" ${param}`;
maxWorkerNumber = os.cpus().length;
cmdPrefix = `${abcArgs.join(' ')}`;
} else {
logger.error(red, `ETS:ERROR please set panda module`, reset);
}
filterIntermediateJsBundleByHashJson(buildPathInfo, intermediateJsBundle);
const maxWorkerNumber: number = 3;
const splitedBundles: any[] = splitJsBundlesBySize(fileterIntermediateJsBundle, maxWorkerNumber);
const workerNumber: number = maxWorkerNumber < splitedBundles.length ? maxWorkerNumber : splitedBundles.length;
compiler/src/gen_module_abc.ts
+31 -2
View File
@@ -19,7 +19,9 @@ import cluster from 'cluster';
import { logger } from './compile_info';
import {
SUCCESS,
FAIL
FAIL,
TS2ABC,
ES2ABC
} from './pre_define';
const red: string = '\u001b[31m';
@@ -53,10 +55,37 @@ function js2abcByWorkers(jsonInput: string, cmd: string): Promise<void> {
return;
}
function es2abcByWorkers(jsonInput: string, cmd: string): Promise<void> {
const inputPaths: any = JSON.parse(jsonInput);
for (let i = 0; i < inputPaths.length; ++i) {
const input: string = inputPaths[i].tempFilePath;
const abcFile: string = input.replace(/\.js$/, '.abc');
const singleCmd: any = `${cmd} "${input}" --output "${abcFile}"`;
logger.debug('gen abc cmd is: ', singleCmd);
try {
childProcess.execSync(singleCmd);
} catch (e) {
logger.error(red, `ETS:ERROR Failed to convert file ${input} to abc `, reset);
process.exit(FAIL);
}
}
return;
}
logger.debug('worker data is: ', JSON.stringify(process.env));
logger.debug('gen_abc isWorker is: ', cluster.isWorker);
if (cluster.isWorker && process.env['inputs'] !== undefined && process.env['cmd'] !== undefined) {
logger.debug('==>worker #', cluster.worker.id, 'started!');
js2abcByWorkers(process.env['inputs'], process.env['cmd']);
if (process.env.panda === TS2ABC) {
js2abcByWorkers(process.env['inputs'], process.env['cmd']);
} else if (process.env.panda === ES2ABC || process.env.panda === 'undefined' || process.env.panda === undefined) {
es2abcByWorkers(process.env['inputs'], process.env['cmd']);
} else {
logger.error(red, `ETS:ERROR please set panda module`, reset);
process.exit(FAIL);
}
process.exit(SUCCESS);
}