diff options
author | Petr Hosek <phosek@chromium.org> | 2018-05-26 01:02:34 +0000 |
---|---|---|
committer | Petr Hosek <phosek@chromium.org> | 2018-05-26 01:02:34 +0000 |
commit | f59234b5f3396e43be4a8c9cc1684f1da057a457 (patch) | |
tree | d68742a57d23113963c69694f094a2abe20f9ec3 /lib/fuzzer/FuzzerUtilFuchsia.cpp | |
parent | 5bd497b5d66f79f6517606ad0470536c686b75fc (diff) |
[Fuzzer] Update _zx_port_wait function use in Fuchsia port
Fuchsia's _zx_port_wait no longer takes the count argument. This
change also updates all symbol uses to use the underscored versions.
Differential Revision: https://reviews.llvm.org/D47403
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333328 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerUtilFuchsia.cpp')
-rw-r--r-- | lib/fuzzer/FuzzerUtilFuchsia.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fuzzer/FuzzerUtilFuchsia.cpp b/lib/fuzzer/FuzzerUtilFuchsia.cpp index f98c68a8d..d51850eef 100644 --- a/lib/fuzzer/FuzzerUtilFuchsia.cpp +++ b/lib/fuzzer/FuzzerUtilFuchsia.cpp @@ -59,7 +59,7 @@ void InterruptHandler() { void CrashHandler(zx_handle_t *Port) { std::unique_ptr<zx_handle_t> ExceptionPort(Port); zx_port_packet_t Packet; - _zx_port_wait(*ExceptionPort, ZX_TIME_INFINITE, &Packet, 1); + _zx_port_wait(*ExceptionPort, ZX_TIME_INFINITE, &Packet); // Unbind as soon as possible so we don't receive exceptions from this thread. if (_zx_task_bind_exception_port(ZX_HANDLE_INVALID, ZX_HANDLE_INVALID, kFuzzingCrash, 0) != ZX_OK) { @@ -110,7 +110,7 @@ void SetSignalHandler(const FuzzingOptions &Options) { if ((rc = _zx_task_bind_exception_port(_zx_process_self(), *ExceptionPort, kFuzzingCrash, 0)) != ZX_OK) { Printf("libFuzzer: unable to bind exception port: %s\n", - zx_status_get_string(rc)); + _zx_status_get_string(rc)); exit(1); } @@ -126,10 +126,10 @@ void SleepSeconds(int Seconds) { unsigned long GetPid() { zx_status_t rc; zx_info_handle_basic_t Info; - if ((rc = zx_object_get_info(_zx_process_self(), ZX_INFO_HANDLE_BASIC, &Info, + if ((rc = _zx_object_get_info(_zx_process_self(), ZX_INFO_HANDLE_BASIC, &Info, sizeof(Info), NULL, NULL)) != ZX_OK) { Printf("libFuzzer: unable to get info about self: %s\n", - zx_status_get_string(rc)); + _zx_status_get_string(rc)); exit(1); } return Info.koid; @@ -229,7 +229,7 @@ int ExecuteCommand(const Command &Cmd) { if ((rc = _zx_object_get_info(ProcessHandle, ZX_INFO_PROCESS, &Info, sizeof(Info), nullptr, nullptr)) != ZX_OK) { Printf("libFuzzer: unable to get return code from '%s': %s\n", Argv[0], - zx_status_get_string(rc)); + _zx_status_get_string(rc)); return rc; } |