Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cd6ee093
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd6ee093
编写于
5月 16, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adopt new loader with 'onNodeCachedData', send telemetry for successful cached data generation
上级
29422ec6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
53 addition
and
35 deletion
+53
-35
src/vs/code/electron-browser/sharedProcess.js
src/vs/code/electron-browser/sharedProcess.js
+0
-2
src/vs/loader.js
src/vs/loader.js
+37
-22
src/vs/workbench/electron-browser/bootstrap/index.js
src/vs/workbench/electron-browser/bootstrap/index.js
+2
-2
src/vs/workbench/electron-browser/nodeCachedDataManager.ts
src/vs/workbench/electron-browser/nodeCachedDataManager.ts
+14
-9
未找到文件。
src/vs/code/electron-browser/sharedProcess.js
浏览文件 @
cd6ee093
...
@@ -83,12 +83,10 @@ function main() {
...
@@ -83,12 +83,10 @@ function main() {
window
.
MonacoEnvironment
=
{};
window
.
MonacoEnvironment
=
{};
const
nodeCachedDataErrors
=
window
.
MonacoEnvironment
.
nodeCachedDataErrors
=
[];
require
.
config
({
require
.
config
({
baseUrl
:
rootUrl
,
baseUrl
:
rootUrl
,
'
vs/nls
'
:
nlsConfig
,
'
vs/nls
'
:
nlsConfig
,
nodeCachedDataDir
:
configuration
.
nodeCachedDataDir
,
nodeCachedDataDir
:
configuration
.
nodeCachedDataDir
,
onNodeCachedDataError
:
function
(
err
)
{
nodeCachedDataErrors
.
push
(
err
)
},
nodeModules
:
[
/*BUILD->INSERT_NODE_MODULES*/
]
nodeModules
:
[
/*BUILD->INSERT_NODE_MODULES*/
]
});
});
...
...
src/vs/loader.js
浏览文件 @
cd6ee093
...
@@ -253,15 +253,21 @@ var AMDLoader;
...
@@ -253,15 +253,21 @@ var AMDLoader;
if
(
typeof
options
.
nodeCachedDataWriteDelay
!==
'
number
'
||
options
.
nodeCachedDataWriteDelay
<
0
)
{
if
(
typeof
options
.
nodeCachedDataWriteDelay
!==
'
number
'
||
options
.
nodeCachedDataWriteDelay
<
0
)
{
options
.
nodeCachedDataWriteDelay
=
1000
*
7
;
options
.
nodeCachedDataWriteDelay
=
1000
*
7
;
}
}
if
(
typeof
options
.
onNodeCachedDataError
!==
'
function
'
)
{
if
(
typeof
options
.
onNodeCachedData
!==
'
function
'
)
{
options
.
onNodeCachedDataError
=
function
(
err
)
{
options
.
onNodeCachedData
=
function
(
err
,
data
)
{
if
(
err
.
errorCode
===
'
cachedDataRejected
'
)
{
if
(
!
err
)
{
// ignore
}
else
if
(
err
.
errorCode
===
'
cachedDataRejected
'
)
{
console
.
warn
(
'
Rejected cached data from file:
'
+
err
.
path
);
console
.
warn
(
'
Rejected cached data from file:
'
+
err
.
path
);
}
}
else
if
(
err
.
errorCode
===
'
unlink
'
||
err
.
errorCode
===
'
writeFile
'
)
{
else
if
(
err
.
errorCode
===
'
unlink
'
||
err
.
errorCode
===
'
writeFile
'
)
{
console
.
error
(
'
Problems writing cached data file:
'
+
err
.
path
);
console
.
error
(
'
Problems writing cached data file:
'
+
err
.
path
);
console
.
error
(
err
.
detail
);
console
.
error
(
err
.
detail
);
}
}
else
{
console
.
error
(
err
);
}
};
};
}
}
return
options
;
return
options
;
...
@@ -742,31 +748,40 @@ var AMDLoader;
...
@@ -742,31 +748,40 @@ var AMDLoader;
var
_this
=
this
;
var
_this
=
this
;
if
(
script
.
cachedDataRejected
)
{
if
(
script
.
cachedDataRejected
)
{
// data rejected => delete cache file
// data rejected => delete cache file
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedData
Error
({
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedData
({
errorCode
:
'
cachedDataRejected
'
,
errorCode
:
'
cachedDataRejected
'
,
path
:
cachedDataPath
path
:
cachedDataPath
});
});
NodeScriptLoader
.
_runSoon
(
function
()
{
return
_this
.
_fs
.
unlink
(
cachedDataPath
,
function
(
err
)
{
NodeScriptLoader
.
_runSoon
(
function
()
{
if
(
err
)
{
return
_this
.
_fs
.
unlink
(
cachedDataPath
,
function
(
err
)
{
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedDataError
({
if
(
err
)
{
errorCode
:
'
unlink
'
,
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedData
({
path
:
cachedDataPath
,
errorCode
:
'
unlink
'
,
detail
:
err
path
:
cachedDataPath
,
});
detail
:
err
}
});
});
},
moduleManager
.
getConfig
().
getOptionsLiteral
().
nodeCachedDataWriteDelay
);
}
});
},
moduleManager
.
getConfig
().
getOptionsLiteral
().
nodeCachedDataWriteDelay
);
}
}
else
if
(
script
.
cachedDataProduced
)
{
else
if
(
script
.
cachedDataProduced
)
{
// data produced => tell outside world
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedData
(
undefined
,
{
path
:
cachedDataPath
,
length
:
script
.
cachedData
.
length
});
// data produced => write cache file
// data produced => write cache file
NodeScriptLoader
.
_runSoon
(
function
()
{
return
_this
.
_fs
.
writeFile
(
cachedDataPath
,
script
.
cachedData
,
function
(
err
)
{
NodeScriptLoader
.
_runSoon
(
function
()
{
if
(
err
)
{
return
_this
.
_fs
.
writeFile
(
cachedDataPath
,
script
.
cachedData
,
function
(
err
)
{
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedDataError
({
if
(
err
)
{
errorCode
:
'
writeFile
'
,
moduleManager
.
getConfig
().
getOptionsLiteral
().
onNodeCachedData
({
path
:
cachedDataPath
,
errorCode
:
'
writeFile
'
,
detail
:
err
path
:
cachedDataPath
,
});
detail
:
err
}
});
});
},
moduleManager
.
getConfig
().
getOptionsLiteral
().
nodeCachedDataWriteDelay
);
}
});
},
moduleManager
.
getConfig
().
getOptionsLiteral
().
nodeCachedDataWriteDelay
);
}
}
};
};
NodeScriptLoader
.
_runSoon
=
function
(
callback
,
minTimeout
)
{
NodeScriptLoader
.
_runSoon
=
function
(
callback
,
minTimeout
)
{
...
...
src/vs/workbench/electron-browser/bootstrap/index.js
浏览文件 @
cd6ee093
...
@@ -163,13 +163,13 @@ function main() {
...
@@ -163,13 +163,13 @@ function main() {
window
.
MonacoEnvironment
=
{};
window
.
MonacoEnvironment
=
{};
const
nodeCachedDataErrors
=
window
.
MonacoEnvironment
.
nodeCachedDataErrors
=
[];
const
onNodeCachedData
=
window
.
MonacoEnvironment
.
onNodeCachedData
=
[];
require
.
config
({
require
.
config
({
baseUrl
:
rootUrl
,
baseUrl
:
rootUrl
,
'
vs/nls
'
:
nlsConfig
,
'
vs/nls
'
:
nlsConfig
,
recordStats
:
!!
configuration
.
performance
,
recordStats
:
!!
configuration
.
performance
,
nodeCachedDataDir
:
configuration
.
nodeCachedDataDir
,
nodeCachedDataDir
:
configuration
.
nodeCachedDataDir
,
onNodeCachedData
Error
:
function
(
err
)
{
nodeCachedDataErrors
.
push
(
err
)
},
onNodeCachedData
:
function
()
{
onNodeCachedData
.
push
(
arguments
)
},
nodeModules
:
[
/*BUILD->INSERT_NODE_MODULES*/
]
nodeModules
:
[
/*BUILD->INSERT_NODE_MODULES*/
]
});
});
...
...
src/vs/workbench/electron-browser/nodeCachedDataManager.ts
浏览文件 @
cd6ee093
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
join
}
from
'
path
'
;
import
{
join
,
basename
}
from
'
path
'
;
import
{
readdir
,
rimraf
,
stat
}
from
'
vs/base/node/pfs
'
;
import
{
readdir
,
rimraf
,
stat
}
from
'
vs/base/node/pfs
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
@@ -26,7 +26,7 @@ export class NodeCachedDataManager {
...
@@ -26,7 +26,7 @@ export class NodeCachedDataManager {
this
.
_telemetryService
=
telemetryService
;
this
.
_telemetryService
=
telemetryService
;
this
.
_environmentService
=
environmentService
;
this
.
_environmentService
=
environmentService
;
this
.
_handleCachedData
Errors
();
this
.
_handleCachedData
Info
();
this
.
_manageCachedDataSoon
();
this
.
_manageCachedDataSoon
();
}
}
...
@@ -34,20 +34,25 @@ export class NodeCachedDataManager {
...
@@ -34,20 +34,25 @@ export class NodeCachedDataManager {
this
.
_disposables
=
dispose
(
this
.
_disposables
);
this
.
_disposables
=
dispose
(
this
.
_disposables
);
}
}
private
_handleCachedDataErrors
():
void
{
private
_handleCachedDataInfo
():
void
{
const
onNodeCachedDataError
=
(
err
)
=>
{
const
onNodeCachedData
=
(
err
,
data
)
=>
{
this
.
_telemetryService
.
publicLog
(
'
nodeCachedData
'
,
{
errorCode
:
err
.
errorCode
,
path
:
err
.
path
});
console
.
log
(
'
onNodeCachedDatare
'
,
err
,
data
);
if
(
err
)
{
this
.
_telemetryService
.
publicLog
(
'
nodeCachedData
'
,
{
errorCode
:
err
.
errorCode
,
path
:
basename
(
err
.
path
)
});
}
else
if
(
data
)
{
this
.
_telemetryService
.
publicLog
(
'
nodeCachedDataProduced
'
,
{
path
:
basename
(
data
.
path
)
});
}
};
};
// handle future and past errors
// handle future and past errors
(
<
any
>
self
).
require
.
config
({
onNodeCachedData
Error
});
(
<
any
>
self
).
require
.
config
({
onNodeCachedData
});
(
<
any
[]
>
(
<
any
>
window
).
MonacoEnvironment
.
nodeCachedDataErrors
).
forEach
(
onNodeCachedDataError
)
;
delete
(
<
any
>
window
).
MonacoEnvironment
.
onNodeCachedData
;
delete
(
<
any
>
window
).
MonacoEnvironment
.
nodeCachedDataErrors
;
(
<
any
[]
>
(
<
any
>
window
).
MonacoEnvironment
.
onNodeCachedData
).
forEach
(
args
=>
onNodeCachedData
.
apply
(
undefined
,
args
))
;
// stop when being disposed
// stop when being disposed
this
.
_disposables
.
push
({
this
.
_disposables
.
push
({
dispose
()
{
dispose
()
{
(
<
any
>
self
).
require
.
config
({
onNodeCachedData
Error
:
undefined
},
true
);
(
<
any
>
self
).
require
.
config
({
onNodeCachedData
:
undefined
},
true
);
}
}
});
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录