DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fuchsia] CloneChannelFromFD fix for system.cc (flutter/engine#10635)

Browse Source 
This is a utils method currently not exposed from fuchsia.
Ported over from [garnet
fd.cc](https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/lib/fsl/io/fd.cc).
This commit is contained in:
Kaushik Iska 2019-08-05 12:05:20 -07:00 committed by GitHub
parent 07c95d9e55
commit fcfa19d97a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
View File

@ -208,25 +208,36 @@ zx_status_t System::Reboot() {
#endif // !defined(FUCHSIA_SDK)
}
zx::channel System::CloneChannelFromFileDescriptor(int fd) {
zx::handle handle;
zx_status_t status = fdio_fd_clone(fd, handle.reset_and_get_address());
if (status != ZX_OK)
return zx::channel();
zx_info_handle_basic_t info = {};
status =
handle.get_info(ZX_INFO_HANDLE_BASIC, &info, sizeof(info), NULL, NULL);
if (status != ZX_OK || info.type != ZX_OBJ_TYPE_CHANNEL)
return zx::channel();
return zx::channel(handle.release());
}
Dart_Handle System::ChannelFromFile(std::string path) {
#if defined(FUCHSIA_SDK)
FML_CHECK(false);
return Dart_Null();
#else // !defined(FUCHSIA_SDK)
fml::UniqueFD fd = FdFromPath(path);
if (!fd.is_valid()) {
return ConstructDartObject(kHandleResult, ToDart(ZX_ERR_IO));
}
// Get channel from fd.
zx::channel channel = fsl::CloneChannelFromFileDescriptor(fd.get());
zx::channel channel = CloneChannelFromFileDescriptor(fd.get());
if (!channel) {
return ConstructDartObject(kHandleResult, ToDart(ZX_ERR_IO));
}
return ConstructDartObject(kHandleResult, ToDart(ZX_OK),
ToDart(Handle::Create(channel.release())));
#endif // !defined(FUCHSIA_SDK)
}
zx_status_t System::ChannelWrite(fml::RefPtr<Handle> channel,

2
engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h
View File

@ -62,6 +62,8 @@ class System : public fml::RefCountedThreadSafe<System>,
static void VmoMapFinalizer(void* isolate_callback_data,
Dart_WeakPersistentHandle handle,
void* peer);
static zx::channel CloneChannelFromFileDescriptor(int fd);
};
} // namespace dart