Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7beea5ca
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7beea5ca
编写于
2月 18, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stop simple editor worker after 5 min if it's not used
上级
0b6bef4b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
61 addition
and
19 deletion
+61
-19
src/vs/base/common/worker/simpleWorker.ts
src/vs/base/common/worker/simpleWorker.ts
+5
-3
src/vs/base/common/worker/workerClient.ts
src/vs/base/common/worker/workerClient.ts
+2
-2
src/vs/base/worker/defaultWorkerFactory.ts
src/vs/base/worker/defaultWorkerFactory.ts
+5
-7
src/vs/editor/common/services/editorWorkerServiceImpl.ts
src/vs/editor/common/services/editorWorkerServiceImpl.ts
+49
-7
未找到文件。
src/vs/base/common/worker/simpleWorker.ts
浏览文件 @
7beea5ca
...
...
@@ -7,6 +7,7 @@
import
{
IWorker
,
IWorkerFactory
}
from
'
./workerClient
'
;
import
{
TPromise
,
ValueCallback
,
ErrorCallback
}
from
'
vs/base/common/winjs.base
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
const
INITIALIZE
=
'
$initialize
'
;
...
...
@@ -153,7 +154,7 @@ class SimpleWorkerProtocol {
/**
* Main thread side
*/
export
class
SimpleWorkerClient
<
T
>
{
export
class
SimpleWorkerClient
<
T
>
extends
Disposable
{
private
_worker
:
IWorker
;
private
_onModuleLoaded
:
TPromise
<
void
>
;
...
...
@@ -161,9 +162,10 @@ export class SimpleWorkerClient<T> {
private
_proxy
:
T
;
constructor
(
workerFactory
:
IWorkerFactory
,
moduleId
:
string
,
ctor
:
any
)
{
this
.
_worker
=
workerFactory
.
create
(
'
vs/base/common/worker/simpleWorker
'
,
(
msg
:
string
)
=>
{
super
();
this
.
_worker
=
this
.
_register
(
workerFactory
.
create
(
'
vs/base/common/worker/simpleWorker
'
,
(
msg
:
string
)
=>
{
this
.
_protocol
.
handleMessage
(
msg
);
});
})
)
;
this
.
_protocol
=
new
SimpleWorkerProtocol
({
sendMessage
:
(
msg
:
string
):
void
=>
{
...
...
src/vs/base/common/worker/workerClient.ts
浏览文件 @
7beea5ca
...
...
@@ -14,7 +14,7 @@ import marshalling = require('vs/base/common/marshalling');
export
interface
IWorker
{
getId
():
number
;
postMessage
(
message
:
string
):
void
;
terminat
e
():
void
;
dispos
e
():
void
;
}
export
interface
IWorkerCallback
{
...
...
@@ -137,7 +137,7 @@ export class WorkerClient {
}
}
}
this
.
_worker
.
terminat
e
();
this
.
_worker
.
dispos
e
();
}
private
_sendMessage
(
type
:
string
,
payload
:
any
,
forceTimestamp
:
number
=
(
new
Date
()).
getTime
()):
TPromise
<
any
>
{
...
...
src/vs/base/worker/defaultWorkerFactory.ts
浏览文件 @
7beea5ca
...
...
@@ -22,7 +22,7 @@ var getWorkerUrl = env.getCrossOriginWorkerScriptUrl || defaultGetWorkerUrl;
class
WebWorker
implements
IWorker
{
private
id
:
number
;
private
worker
:
any
;
private
worker
:
Worker
;
constructor
(
moduleId
:
string
,
id
:
number
,
label
:
string
,
onMessageCallback
:
IWorkerCallback
)
{
this
.
id
=
id
;
...
...
@@ -41,8 +41,9 @@ class WebWorker implements IWorker {
this
.
worker
.
postMessage
(
msg
);
}
public
terminat
e
():
void
{
public
dispos
e
():
void
{
this
.
worker
.
terminate
();
this
.
worker
=
null
;
}
}
...
...
@@ -87,6 +88,8 @@ class FrameWorker implements IWorker {
public
dispose
():
void
{
this
.
_listeners
=
lifecycle
.
disposeAll
(
this
.
_listeners
);
window
.
removeEventListener
(
'
message
'
,
this
.
onMessage
);
window
.
frames
[
this
.
iframeId
()].
close
();
}
private
iframeId
():
string
{
...
...
@@ -116,11 +119,6 @@ class FrameWorker implements IWorker {
this
.
beforeLoadMessages
.
push
(
msg
);
}
}
public
terminate
():
void
{
window
.
removeEventListener
(
'
message
'
,
this
.
onMessage
);
window
.
frames
[
this
.
iframeId
()].
close
();
}
}
export
class
DefaultWorkerFactory
implements
IWorkerFactory
{
...
...
src/vs/editor/common/services/editorWorkerServiceImpl.ts
浏览文件 @
7beea5ca
...
...
@@ -9,10 +9,21 @@ import URI from 'vs/base/common/uri';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IDisposable
,
disposeAll
}
from
'
vs/base/common/lifecycle
'
;
import
{
Disposable
,
IDisposable
,
disposeAll
}
from
'
vs/base/common/lifecycle
'
;
import
{
SimpleWorkerClient
}
from
'
vs/base/common/worker/simpleWorker
'
;
import
{
DefaultWorkerFactory
}
from
'
vs/base/worker/defaultWorkerFactory
'
;
import
{
EditorSimpleWorker
}
from
'
vs/editor/common/services/editorSimpleWorkerCommon
'
;
import
{
IntervalTimer
}
from
'
vs/base/common/async
'
;
/**
* Stop syncing a model to the worker if it was not needed for 1 min.
*/
const
STOP_SYNC_MODEL_DELTA_TIME_MS
=
60
*
1000
;
/**
* Stop the worker if it was not needed for 5 min.
*/
const
STOP_WORKER_DELTA_TIME_MS
=
5
*
60
*
1000
;
export
class
EditorWorkerServiceImpl
implements
IEditorWorkerService
{
public
serviceId
=
IEditorWorkerService
;
...
...
@@ -32,17 +43,43 @@ export class EditorWorkerServiceImpl implements IEditorWorkerService {
}
}
class
WorkerManager
{
class
WorkerManager
extends
Disposable
{
private
_modelService
:
IModelService
;
private
_editorWorkerClient
:
EditorWorkerClient
;
private
_lastWorkerUsedTime
:
number
;
constructor
(
modelService
:
IModelService
)
{
super
();
this
.
_modelService
=
modelService
;
this
.
_editorWorkerClient
=
null
;
let
stopWorkerInterval
=
this
.
_register
(
new
IntervalTimer
());
stopWorkerInterval
.
cancelAndSet
(()
=>
this
.
_checkStopWorker
(),
Math
.
round
(
STOP_WORKER_DELTA_TIME_MS
/
2
));
}
public
dispose
():
void
{
if
(
this
.
_editorWorkerClient
)
{
this
.
_editorWorkerClient
.
dispose
();
this
.
_editorWorkerClient
=
null
;
}
super
.
dispose
();
}
private
_checkStopWorker
():
void
{
if
(
!
this
.
_editorWorkerClient
)
{
return
;
}
let
timeSinceLastWorkerUsedTime
=
(
new
Date
()).
getTime
()
-
this
.
_lastWorkerUsedTime
;
if
(
timeSinceLastWorkerUsedTime
>
STOP_WORKER_DELTA_TIME_MS
)
{
this
.
_editorWorkerClient
.
dispose
();
this
.
_editorWorkerClient
=
null
;
}
}
public
withWorker
():
TPromise
<
EditorWorkerClient
>
{
this
.
_lastWorkerUsedTime
=
(
new
Date
()).
getTime
();
if
(
!
this
.
_editorWorkerClient
)
{
this
.
_editorWorkerClient
=
new
EditorWorkerClient
(
this
.
_modelService
);
}
...
...
@@ -50,26 +87,31 @@ class WorkerManager {
}
}
class
EditorWorkerClient
{
class
EditorWorkerClient
extends
Disposable
{
private
_worker
:
SimpleWorkerClient
<
EditorSimpleWorker
>
;
private
_proxy
:
EditorSimpleWorker
;
private
_modelService
:
IModelService
;
private
_syncedModels
:
{[
uri
:
string
]:
IDisposable
[];};
private
_syncedModels
:
{[
modelUrl
:
string
]:
IDisposable
[];};
constructor
(
modelService
:
IModelService
)
{
super
();
this
.
_modelService
=
modelService
;
this
.
_syncedModels
=
Object
.
create
(
null
);
this
.
_worker
=
new
SimpleWorkerClient
<
EditorSimpleWorker
>
(
this
.
_worker
=
this
.
_register
(
new
SimpleWorkerClient
<
EditorSimpleWorker
>
(
new
DefaultWorkerFactory
(),
'
vs/editor/common/services/editorSimpleWorker
'
,
EditorSimpleWorker
);
)
)
;
this
.
_proxy
=
this
.
_worker
.
get
();
}
public
dispose
():
void
{
console
.
log
(
'
TODO: EditorWorkerClient.dispose
'
);
for
(
let
modelUrl
in
this
.
_syncedModels
)
{
disposeAll
(
this
.
_syncedModels
[
modelUrl
]);
}
this
.
_syncedModels
=
Object
.
create
(
null
);
super
.
dispose
();
}
public
computeDiff
(
original
:
URI
,
modified
:
URI
,
ignoreTrimWhitespace
:
boolean
):
TPromise
<
EditorCommon
.
ILineChange
[]
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录