Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
daa50ede
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,发现更多精彩内容 >>
提交
daa50ede
编写于
4月 16, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
files2 - more use of streams
上级
bfe321b7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
49 deletion
+17
-49
src/vs/base/common/buffer.ts
src/vs/base/common/buffer.ts
+3
-3
src/vs/base/test/common/buffer.test.ts
src/vs/base/test/common/buffer.test.ts
+7
-7
src/vs/workbench/services/files2/common/fileService2.ts
src/vs/workbench/services/files2/common/fileService2.ts
+7
-39
未找到文件。
src/vs/base/common/buffer.ts
浏览文件 @
daa50ede
...
@@ -226,7 +226,7 @@ export function writeableBufferStream(): VSBufferWriteableStream {
...
@@ -226,7 +226,7 @@ export function writeableBufferStream(): VSBufferWriteableStream {
}
}
export
interface
VSBufferWriteableStream
extends
VSBufferReadableStream
{
export
interface
VSBufferWriteableStream
extends
VSBufferReadableStream
{
data
(
chunk
:
VSBuffer
):
void
;
write
(
chunk
:
VSBuffer
):
void
;
error
(
error
:
Error
):
void
;
error
(
error
:
Error
):
void
;
end
(
result
?:
VSBuffer
|
Error
):
void
;
end
(
result
?:
VSBuffer
|
Error
):
void
;
}
}
...
@@ -250,7 +250,7 @@ class VSBufferWriteableStreamImpl implements VSBufferWriteableStream {
...
@@ -250,7 +250,7 @@ class VSBufferWriteableStreamImpl implements VSBufferWriteableStream {
end
:
[]
as
{
():
void
}[]
end
:
[]
as
{
():
void
}[]
};
};
data
(
chunk
:
VSBuffer
):
void
{
write
(
chunk
:
VSBuffer
):
void
{
if
(
this
.
state
.
finished
)
{
if
(
this
.
state
.
finished
)
{
return
;
return
;
}
}
...
@@ -291,7 +291,7 @@ class VSBufferWriteableStreamImpl implements VSBufferWriteableStream {
...
@@ -291,7 +291,7 @@ class VSBufferWriteableStreamImpl implements VSBufferWriteableStream {
if
(
result
instanceof
Error
)
{
if
(
result
instanceof
Error
)
{
this
.
error
(
result
);
this
.
error
(
result
);
}
else
if
(
result
)
{
}
else
if
(
result
)
{
this
.
data
(
result
);
this
.
write
(
result
);
}
}
// flowing: send end event to listeners
// flowing: send end event to listeners
...
...
src/vs/base/test/common/buffer.test.ts
浏览文件 @
daa50ede
...
@@ -48,7 +48,7 @@ suite('Buffer', () => {
...
@@ -48,7 +48,7 @@ suite('Buffer', () => {
});
});
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
...
@@ -78,7 +78,7 @@ suite('Buffer', () => {
...
@@ -78,7 +78,7 @@ suite('Buffer', () => {
});
});
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
end
(
new
Error
());
stream
.
end
(
new
Error
());
...
@@ -92,7 +92,7 @@ suite('Buffer', () => {
...
@@ -92,7 +92,7 @@ suite('Buffer', () => {
const
stream
=
writeableBufferStream
();
const
stream
=
writeableBufferStream
();
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
...
@@ -121,7 +121,7 @@ suite('Buffer', () => {
...
@@ -121,7 +121,7 @@ suite('Buffer', () => {
const
stream
=
writeableBufferStream
();
const
stream
=
writeableBufferStream
();
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
error
(
new
Error
());
stream
.
error
(
new
Error
());
...
@@ -152,7 +152,7 @@ suite('Buffer', () => {
...
@@ -152,7 +152,7 @@ suite('Buffer', () => {
const
stream
=
writeableBufferStream
();
const
stream
=
writeableBufferStream
();
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
...
@@ -186,7 +186,7 @@ suite('Buffer', () => {
...
@@ -186,7 +186,7 @@ suite('Buffer', () => {
});
});
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
stream
.
end
(
VSBuffer
.
fromString
(
'
World
'
));
...
@@ -206,7 +206,7 @@ suite('Buffer', () => {
...
@@ -206,7 +206,7 @@ suite('Buffer', () => {
});
});
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
data
(
VSBuffer
.
fromString
(
'
Hello
'
));
stream
.
write
(
VSBuffer
.
fromString
(
'
Hello
'
));
await
timeout
(
0
);
await
timeout
(
0
);
stream
.
error
(
new
Error
());
stream
.
error
(
new
Error
());
await
timeout
(
0
);
await
timeout
(
0
);
...
...
src/vs/workbench/services/files2/common/fileService2.ts
浏览文件 @
daa50ede
...
@@ -44,7 +44,7 @@ export class FileService2 extends Disposable implements IFileService {
...
@@ -44,7 +44,7 @@ export class FileService2 extends Disposable implements IFileService {
_serviceBrand
:
ServiceIdentifier
<
any
>
;
_serviceBrand
:
ServiceIdentifier
<
any
>
;
private
readonly
BUFFER_SIZE
=
16
*
1024
;
private
readonly
BUFFER_SIZE
=
64
*
1024
;
constructor
(@
ILogService
private
logService
:
ILogService
)
{
constructor
(@
ILogService
private
logService
:
ILogService
)
{
super
();
super
();
...
@@ -471,7 +471,7 @@ export class FileService2 extends Disposable implements IFileService {
...
@@ -471,7 +471,7 @@ export class FileService2 extends Disposable implements IFileService {
// when buffer full, create a new one and emit it through stream
// when buffer full, create a new one and emit it through stream
if
(
posInBuffer
===
buffer
.
byteLength
)
{
if
(
posInBuffer
===
buffer
.
byteLength
)
{
stream
.
data
(
buffer
);
stream
.
write
(
buffer
);
buffer
=
VSBuffer
.
alloc
(
this
.
BUFFER_SIZE
);
buffer
=
VSBuffer
.
alloc
(
this
.
BUFFER_SIZE
);
...
@@ -481,7 +481,7 @@ export class FileService2 extends Disposable implements IFileService {
...
@@ -481,7 +481,7 @@ export class FileService2 extends Disposable implements IFileService {
// wrap up with last buffer
// wrap up with last buffer
if
(
posInBuffer
>
0
)
{
if
(
posInBuffer
>
0
)
{
stream
.
data
(
buffer
.
slice
(
0
,
posInBuffer
));
stream
.
write
(
buffer
.
slice
(
0
,
posInBuffer
));
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
throw
error
;
throw
error
;
...
@@ -985,43 +985,11 @@ export class FileService2 extends Disposable implements IFileService {
...
@@ -985,43 +985,11 @@ export class FileService2 extends Disposable implements IFileService {
private
async
doPipeBufferedToUnbuffered
(
sourceProvider
:
IFileSystemProviderWithOpenReadWriteCloseCapability
,
source
:
URI
,
targetProvider
:
IFileSystemProviderWithFileReadWriteCapability
,
target
:
URI
):
Promise
<
void
>
{
private
async
doPipeBufferedToUnbuffered
(
sourceProvider
:
IFileSystemProviderWithOpenReadWriteCloseCapability
,
source
:
URI
,
targetProvider
:
IFileSystemProviderWithFileReadWriteCapability
,
target
:
URI
):
Promise
<
void
>
{
// Open handle
// Read buffer via stream buffered
const
sourceHandle
=
await
sourceProvider
.
open
(
source
,
{
create
:
false
});
const
buffer
=
await
streamToBuffer
(
this
.
readFileBuffered
(
sourceProvider
,
source
,
CancellationToken
.
None
));
try
{
const
buffers
:
VSBuffer
[]
=
[];
let
buffer
=
VSBuffer
.
alloc
(
this
.
BUFFER_SIZE
);
let
posInFile
=
0
;
let
totalBytesRead
=
0
;
let
bytesRead
=
0
;
let
posInBuffer
=
0
;
do
{
// read from source (sourceHandle) at current position (pos) into buffer (buffer) at
// buffer position (posInBuffer) up to the size of the buffer (buffer.byteLength).
bytesRead
=
await
sourceProvider
.
read
(
sourceHandle
,
posInFile
,
buffer
.
buffer
,
posInBuffer
,
buffer
.
byteLength
-
posInBuffer
);
posInFile
+=
bytesRead
;
posInBuffer
+=
bytesRead
;
totalBytesRead
+=
bytesRead
;
// when buffer full, create a new one
if
(
posInBuffer
===
buffer
.
byteLength
)
{
buffers
.
push
(
buffer
);
buffer
=
VSBuffer
.
alloc
(
this
.
BUFFER_SIZE
);
posInBuffer
=
0
;
}
}
while
(
bytesRead
>
0
);
// Write buffer into target at once
// Write buffer into target at once
await
this
.
doWriteUnbuffered
(
targetProvider
,
target
,
VSBuffer
.
concat
([...
buffers
,
buffer
.
slice
(
0
,
posInBuffer
)],
totalBytesRead
));
await
this
.
doWriteUnbuffered
(
targetProvider
,
target
,
buffer
);
}
catch
(
error
)
{
throw
error
;
}
finally
{
await
sourceProvider
.
close
(
sourceHandle
);
}
}
}
protected
throwIfFileSystemIsReadonly
<
T
extends
IFileSystemProvider
>
(
provider
:
T
):
T
{
protected
throwIfFileSystemIsReadonly
<
T
extends
IFileSystemProvider
>
(
provider
:
T
):
T
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录