Fix for I/O performance problems
sys.readFile checks whether file exists before reading instead of relying on exceptions sys.writeFile returns a boolean result and doesn't use exceptions to communicate errors Disabled code to create directories until performance has been verified
This commit is contained in:
Anders Hejlsberg
Родитель
f6714cb615
Коммит
bbd14c005d
|
|
@ -1,10 +1,11 @@
|
|||
interface System {
|
||||
args: string[];
|
||||
newLine: string;
|
||||
useCaseSensitiveFileNames: boolean;
|
||||
write(s: string): void;
|
||||
writeErr(s: string): void;
|
||||
readFile(fileName: string): string;
|
||||
writeFile(fileName: string, data: string): void;
|
||||
writeFile(fileName: string, data: string): boolean;
|
||||
resolvePath(path: string): string;
|
||||
fileExists(path: string): boolean;
|
||||
directoryExists(path: string): boolean;
|
||||
|
|
@ -13,12 +14,6 @@ interface System {
|
|||
getCurrentDirectory(): string;
|
||||
getMemoryUsage(): number;
|
||||
exit(exitCode?: number): void;
|
||||
useCaseSensitiveFileNames: boolean;
|
||||
}
|
||||
|
||||
enum ErrorCodes {
|
||||
UnsupportedFileEncoding = 1,
|
||||
CannotReadFile = 2,
|
||||
}
|
||||
|
||||
declare var require: any;
|
||||
|
|
@ -27,96 +22,81 @@ declare var process: any;
|
|||
declare var global: any;
|
||||
|
||||
var sys: System = (function () {
|
||||
|
||||
function getWScriptSystem(): System {
|
||||
|
||||
var fso = new ActiveXObject("Scripting.FileSystemObject");
|
||||
|
||||
var fileStream = new ActiveXObject("ADODB.Stream");
|
||||
var binaryStream = new ActiveXObject("ADODB.Stream");
|
||||
|
||||
var args: string[] = [];
|
||||
for (var i = 0; i < WScript.Arguments.length; i++) {
|
||||
args[i] = WScript.Arguments.Item(i);
|
||||
}
|
||||
|
||||
var fileStreamObjectPool: any[] = [];
|
||||
|
||||
function getFileStreamObject(): any {
|
||||
if (fileStreamObjectPool.length > 0) {
|
||||
return fileStreamObjectPool.pop();
|
||||
}
|
||||
else {
|
||||
return new ActiveXObject("ADODB.Stream");
|
||||
function readFile(fileName: string): string {
|
||||
if (fso.FileExists(fileName)) {
|
||||
fileStream.Open();
|
||||
try {
|
||||
// Load file in binary mode to ensure no byte order mark is added
|
||||
fileStream.Type = 1;
|
||||
fileStream.LoadFromFile(fileName);
|
||||
// Read the first two bytes into a string with no interpretation
|
||||
fileStream.Type = 2;
|
||||
fileStream.Charset = "x-ansi";
|
||||
var bom = fileStream.ReadText(2) || "";
|
||||
// Position must be at 0 before encoding can be changed
|
||||
fileStream.Position = 0;
|
||||
// [0xFF,0xFE] and [0xFE,0xFF] mean utf-16 (little or big endian), otherwise default to utf-8
|
||||
fileStream.Charset = bom.length >= 2 && (bom.charCodeAt(0) === 0xFF && bom.charCodeAt(1) === 0xFE || bom.charCodeAt(0) === 0xFE && bom.charCodeAt(1) === 0xFF) ? "unicode" : "utf-8";
|
||||
// ReadText method always strips byte order mark from resulting string
|
||||
var result = fileStream.ReadText();
|
||||
fileStream.Close();
|
||||
return result;
|
||||
}
|
||||
catch (e) {
|
||||
fileStream.Close();
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function releaseFileStreamObject(obj: any) {
|
||||
fileStreamObjectPool.push(obj);
|
||||
function writeFile(fileName: string, data: string): boolean {
|
||||
fileStream.Open();
|
||||
binaryStream.Open();
|
||||
try {
|
||||
fileStream.Type = 2;
|
||||
fileStream.Charset = "utf-8";
|
||||
fileStream.WriteText(data);
|
||||
// Skip byte order mark and copy remaining text to binary stream
|
||||
binaryStream.Type = 1;
|
||||
fileStream.Position = 3;
|
||||
fileStream.CopyTo(binaryStream);
|
||||
binaryStream.SaveToFile(fileName, 2 /*overwrite*/);
|
||||
binaryStream.Close();
|
||||
fileStream.Close();
|
||||
return true;
|
||||
}
|
||||
catch (e) {
|
||||
binaryStream.Close();
|
||||
fileStream.Close();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return {
|
||||
args: args,
|
||||
newLine: "\r\n",
|
||||
useCaseSensitiveFileNames: false,
|
||||
write(s: string): void {
|
||||
WScript.StdOut.Write(s);
|
||||
},
|
||||
writeErr(s: string): void {
|
||||
WScript.StdErr.Write(s);
|
||||
},
|
||||
readFile(fileName: string): string {
|
||||
var contents: string;
|
||||
try {
|
||||
// Initially just read the first two bytes of the file to see if there's a bom.
|
||||
var fileStream = getFileStreamObject();
|
||||
fileStream.Open();
|
||||
fileStream.Type = 2; // Text data
|
||||
|
||||
// Start reading individual chars without any interpretation. That way we can check for a byte-order-mark.
|
||||
fileStream.Charset = "x-ansi";
|
||||
|
||||
fileStream.LoadFromFile(fileName);
|
||||
var byteOrderMarkSeq: string = fileStream.ReadText(2) || ""; // Read the BOM char-seq or fall back to an empty string
|
||||
|
||||
// Position has to be at 0 before changing the encoding
|
||||
fileStream.Position = 0;
|
||||
if (byteOrderMarkSeq.charCodeAt(0) === 0xFE && byteOrderMarkSeq.charCodeAt(1) === 0xFF) {
|
||||
// utf16-be
|
||||
fileStream.Charset = "unicode";
|
||||
}
|
||||
else if (byteOrderMarkSeq.charCodeAt(0) === 0xFF && byteOrderMarkSeq.charCodeAt(1) === 0xFE) {
|
||||
// utf16-le
|
||||
fileStream.Charset = "unicode";
|
||||
}
|
||||
else if (byteOrderMarkSeq.charCodeAt(0) === 0xEF && byteOrderMarkSeq.charCodeAt(1) === 0xBB) {
|
||||
// utf-8
|
||||
fileStream.Charset = "utf-8";
|
||||
}
|
||||
else {
|
||||
// Always read a file as utf8 if it has no bom.
|
||||
fileStream.Charset = "utf-8";
|
||||
}
|
||||
contents = fileStream.ReadText(-1 /* Read from beginning to end-of-stream */);
|
||||
fileStream.Close();
|
||||
releaseFileStreamObject(fileStream);
|
||||
}
|
||||
catch (err) {
|
||||
// -2147024809 is the javascript value for 0x80070057 which is the HRESULT for
|
||||
// "the parameter is incorrect".
|
||||
if (err.number === -2147024809) {
|
||||
err.code = ErrorCodes.UnsupportedFileEncoding;
|
||||
}
|
||||
else {
|
||||
err.code = ErrorCodes.CannotReadFile;
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
return contents;
|
||||
},
|
||||
writeFile(fileName: string, data: string): void {
|
||||
var textStream = getFileStreamObject();
|
||||
textStream.Charset = "utf-8";
|
||||
textStream.Open();
|
||||
textStream.WriteText(data, 0 /*do not add newline*/);
|
||||
textStream.SaveToFile(fileName, 2 /*overwrite*/);
|
||||
textStream.Close();
|
||||
releaseFileStreamObject(textStream);
|
||||
},
|
||||
readFile: readFile,
|
||||
writeFile: writeFile,
|
||||
resolvePath(path: string): string {
|
||||
return fso.GetAbsolutePathName(path);
|
||||
},
|
||||
|
|
@ -142,75 +122,64 @@ var sys: System = (function () {
|
|||
},
|
||||
exit(exitCode?: number): void {
|
||||
WScript.Quit(exitCode);
|
||||
},
|
||||
useCaseSensitiveFileNames: false,
|
||||
}
|
||||
};
|
||||
}
|
||||
function getNodeSystem(): System {
|
||||
var _fs = require("fs");
|
||||
var _path = require("path");
|
||||
var _os = require("os");
|
||||
var platform: string = _os.platform();
|
||||
// win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
|
||||
var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
|
||||
var _os = require('os');
|
||||
|
||||
function readFile(fileName: string): string {
|
||||
if (_fs.existsSync(fileName)) {
|
||||
try {
|
||||
var buffer = _fs.readFileSync(fileName);
|
||||
var len = buffer.length;
|
||||
if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
|
||||
len &= ~1;
|
||||
for (var i = 0; i < len; i += 2) {
|
||||
var temp = buffer[i];
|
||||
buffer[i] = buffer[i + 1];
|
||||
buffer[i + 1] = temp;
|
||||
}
|
||||
return buffer.toString("utf16le", 2);
|
||||
}
|
||||
if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
|
||||
return buffer.toString("utf16le", 2);
|
||||
}
|
||||
if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
|
||||
return buffer.toString("utf8", 3);
|
||||
}
|
||||
return buffer.toString("utf8");
|
||||
}
|
||||
catch (e) {
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function writeFile(fileName: string, data: string): boolean {
|
||||
try {
|
||||
_fs.writeFileSync(fileName, data, "utf8");
|
||||
return true;
|
||||
}
|
||||
catch (e) {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return {
|
||||
args: process.argv.slice(2),
|
||||
newLine: _os.EOL,
|
||||
useCaseSensitiveFileNames: true,
|
||||
write(s: string): void {
|
||||
process.stdout.write(s);
|
||||
},
|
||||
writeErr(s: string): void {
|
||||
process.stderr.write(s);
|
||||
},
|
||||
readFile(fileName: string): string {
|
||||
try {
|
||||
var buffer = _fs.readFileSync(fileName);
|
||||
|
||||
// Make sure buffer got initialized and that we don't try to read into a completely empty file.
|
||||
if (!buffer || buffer.length === 0) {
|
||||
return "";
|
||||
}
|
||||
|
||||
switch (buffer[0]) {
|
||||
case 0xFE:
|
||||
if (buffer[1] === 0xFF) {
|
||||
// utf16-be. Reading the buffer as big endian is not supported, so convert it to
|
||||
// Little Endian first
|
||||
var i = 0;
|
||||
while ((i + 1) < buffer.length) {
|
||||
var temp = buffer[i];
|
||||
buffer[i] = buffer[i + 1];
|
||||
buffer[i + 1] = temp;
|
||||
i += 2;
|
||||
}
|
||||
return buffer.toString("utf16le", 2);
|
||||
}
|
||||
break;
|
||||
case 0xFF:
|
||||
if (buffer[1] === 0xFE) {
|
||||
// utf16-le
|
||||
return buffer.toString("utf16le", 2);
|
||||
}
|
||||
break;
|
||||
case 0xEF:
|
||||
if (buffer[1] === 0xBB) {
|
||||
// utf-8
|
||||
return buffer.toString("utf8", 3);
|
||||
}
|
||||
}
|
||||
|
||||
return buffer.toString("utf8", 0);
|
||||
}
|
||||
catch (err) {
|
||||
err.code = ErrorCodes.CannotReadFile;
|
||||
throw err;
|
||||
}
|
||||
},
|
||||
writeFile(fileName: string, data: string): void {
|
||||
// TODO (drosen): bring back the old environment code if necessary
|
||||
_fs.writeFileSync(fileName, data, "utf8");
|
||||
},
|
||||
readFile: readFile,
|
||||
writeFile: writeFile,
|
||||
resolvePath: function (path: string): string {
|
||||
return _path.resolve(path);
|
||||
},
|
||||
|
|
@ -237,8 +206,7 @@ var sys: System = (function () {
|
|||
},
|
||||
exit(exitCode?: number): void {
|
||||
process.exit(exitCode);
|
||||
},
|
||||
useCaseSensitiveFileNames: useCaseSensitiveFileNames,
|
||||
}
|
||||
};
|
||||
}
|
||||
if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
|
||||
|
|
|
|||
|
|
@ -117,47 +117,45 @@ module ts {
|
|||
}
|
||||
|
||||
function getSourceFile(filename: string, languageVersion: ScriptTarget): SourceFile {
|
||||
try {
|
||||
var text = sys.readFile(filename);
|
||||
}
|
||||
catch (err) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return createSourceFile(filename, text, languageVersion);
|
||||
var text = sys.readFile(filename);
|
||||
return text ? createSourceFile(filename, text, languageVersion) : undefined;
|
||||
}
|
||||
|
||||
function writeFile(fileName: string, data: string) {
|
||||
function ensureDirectoryStructure(directoryName: string) {
|
||||
if (directoryName) {
|
||||
if (!sys.directoryExists(directoryName)) {
|
||||
var parentDirectory = getDirectoryPath(directoryName);
|
||||
// If we arent at the root path ensure that the folder exists
|
||||
if (parentDirectory !== directoryName) {
|
||||
if (ensureDirectoryStructure(parentDirectory)) {
|
||||
// If parent directory was present, create the current directory
|
||||
try {
|
||||
sys.createDirectory(directoryName);
|
||||
}
|
||||
catch (e) {
|
||||
reportErrors([createCompilerDiagnostic(Diagnostics.Could_not_create_directory_0, [directoryName])]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// TODO: Review this code for performance
|
||||
|
||||
// If parent directory structure is present create the file
|
||||
if (ensureDirectoryStructure(getDirectoryPath(normalizePath(fileName)))) {
|
||||
try {
|
||||
sys.writeFile(fileName, data);
|
||||
}
|
||||
catch (e) {
|
||||
reportErrors([createCompilerDiagnostic(Diagnostics.Could_not_write_file_0, [fileName])]);
|
||||
}
|
||||
//function ensureDirectoryStructure(directoryName: string) {
|
||||
// if (directoryName) {
|
||||
// if (!sys.directoryExists(directoryName)) {
|
||||
// var parentDirectory = getDirectoryPath(directoryName);
|
||||
// // If we arent at the root path ensure that the folder exists
|
||||
// if (parentDirectory !== directoryName) {
|
||||
// if (ensureDirectoryStructure(parentDirectory)) {
|
||||
// // If parent directory was present, create the current directory
|
||||
// try {
|
||||
// sys.createDirectory(directoryName);
|
||||
// }
|
||||
// catch (e) {
|
||||
// reportErrors([createCompilerDiagnostic(Diagnostics.Could_not_create_directory_0, [directoryName])]);
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return true;
|
||||
//}
|
||||
//// If parent directory structure is present create the file
|
||||
//if (ensureDirectoryStructure(getDirectoryPath(normalizePath(fileName)))) {
|
||||
// try {
|
||||
// sys.writeFile(fileName, data);
|
||||
// }
|
||||
// catch (e) {
|
||||
// reportErrors([createCompilerDiagnostic(Diagnostics.Could_not_write_file_0, [fileName])]);
|
||||
// }
|
||||
//}
|
||||
if (!sys.writeFile(fileName, data)) {
|
||||
reportErrors([createCompilerDiagnostic(Diagnostics.Could_not_write_file_0, [fileName])]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -224,10 +222,10 @@ module ts {
|
|||
if (cmds.options.diagnostics) {
|
||||
reportDiagnosticCount("Files", program.getSourceFiles().length);
|
||||
reportDiagnosticCount("Lines", countLines(program));
|
||||
reportDiagnosticCount("Nodes", checker.getNodeCount());
|
||||
reportDiagnosticCount("Identifiers", checker.getIdentifierCount());
|
||||
reportDiagnosticCount("Symbols", checker.getSymbolCount());
|
||||
reportDiagnosticCount("Types", checker.getTypeCount());
|
||||
reportDiagnosticCount("Nodes", checker ? checker.getNodeCount() : 0);
|
||||
reportDiagnosticCount("Identifiers", checker ? checker.getIdentifierCount() : 0);
|
||||
reportDiagnosticCount("Symbols", checker ? checker.getSymbolCount() : 0);
|
||||
reportDiagnosticCount("Types", checker ? checker.getTypeCount() : 0);
|
||||
reportDiagnosticTime("Parse time", bindStart - parseStart);
|
||||
reportDiagnosticTime("Bind time", checkStart - bindStart);
|
||||
reportDiagnosticTime("Check time", emitStart - checkStart);
|
||||
|
|
|
|||
|
|
@ -190,8 +190,9 @@ module Playback {
|
|||
return areSame(left, right) || areSame(wrapper.resolvePath(left), right) || areSame(left, wrapper.resolvePath(right)) || areSame(wrapper.resolvePath(left), wrapper.resolvePath(right));
|
||||
}
|
||||
|
||||
function noOpReplay(name: string) {
|
||||
function noOpReplay(name: string): boolean {
|
||||
console.log("Swallowed write operation during replay: " + name);
|
||||
return true;
|
||||
}
|
||||
|
||||
export function wrapSystem(underlying: System): PlaybackSystem {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче