Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec76095b authored by Tim Murray's avatar Tim Murray Committed by Automerger Merge Worker
Browse files

dumpstate: only poll 30s for initial data am: ed65c767 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19244252



Change-Id: Id89531ba9b95c490137b1faea326ea547eebd79a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fbf2938 ed65c767

cmds/dumpstate/DumpstateInternal.cpp

+5 −5
Original line number Diff line number Diff line
@@ -162,17 +162,16 @@ int DumpFileFromFdToFd(const std::string& title, const std::string& path_string, 
        return 0;

    }

    bool newline = false;

    int poll_timeout_ms = 30 * 1000;

    while (true) {

        uint64_t start_time = Nanotime();

        pollfd fds[] = { { .fd = fd, .events = POLLIN } };

        int ret = TEMP_FAILURE_RETRY(poll(fds, arraysize(fds), 30 * 1000));

        int ret = TEMP_FAILURE_RETRY(poll(fds, arraysize(fds), poll_timeout_ms));

        if (ret == -1) {

            dprintf(out_fd, "*** %s: poll failed: %s\n", path, strerror(errno));

            newline = true;

            break;

        } else if (ret == 0) {

            uint64_t elapsed = Nanotime() - start_time;

            dprintf(out_fd, "*** %s: Timed out after %.3fs\n", path, (float)elapsed / NANOS_PER_SEC);

        } else if (ret == 0 && poll_timeout_ms != 0) {

            dprintf(out_fd, "*** %s: Timed out after %ds\n", path, poll_timeout_ms / 1000 );

            newline = true;

            break;

        } else {
@@ -189,6 +188,7 @@ int DumpFileFromFdToFd(const std::string& title, const std::string& path_string, 
                break;

            }

        }

        poll_timeout_ms = 0;

    }



    if (!newline) dprintf(out_fd, "\n");