diff options
| -rw-r--r-- | lib/utils/mu-utils-file.cc | 52 | ||||
| -rw-r--r-- | lib/utils/mu-utils-file.hh | 11 |
2 files changed, 1 insertions, 62 deletions
diff --git a/lib/utils/mu-utils-file.cc b/lib/utils/mu-utils-file.cc index 56b1c6f..3da9751 100644 --- a/lib/utils/mu-utils-file.cc +++ b/lib/utils/mu-utils-file.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2023-2024 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> +** Copyright (C) 2023-2026 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** ** This program is free software; you can redistribute it and/or modify it ** under the terms of the GNU General Public License as published by the @@ -177,56 +177,6 @@ Mu::runtime_path(Mu::RuntimePath path, const std::string& muhome) } /* LCOV_EXCL_START*/ -static gpointer -cancel_wait(gpointer data) -{ - guint timeout, deadline; - GCancellable *cancel; - - cancel = (GCancellable*)data; - timeout = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(cancel), "timeout")); - deadline = g_get_monotonic_time() + 1000 * timeout; - - while (g_get_monotonic_time() < deadline && !g_cancellable_is_cancelled(cancel)) { - g_usleep(50 * 1000); /* 50 ms */ - g_thread_yield(); - } - - g_cancellable_cancel(cancel); - - return NULL; -} - -static void -cancel_wait_free(gpointer data) -{ - GThread *thread; - GCancellable *cancel; - - cancel = (GCancellable*)data; - thread = (GThread*)g_object_get_data(G_OBJECT(cancel), "thread"); - - g_cancellable_cancel(cancel); - g_thread_join(thread); -} - -GCancellable* -Mu::g_cancellable_new_with_timeout(guint timeout) -{ - GCancellable *cancel; - - cancel = g_cancellable_new(); - - g_object_set_data(G_OBJECT(cancel), "timeout", GUINT_TO_POINTER(timeout)); - g_object_set_data(G_OBJECT(cancel), "thread", - g_thread_new("cancel-wait", cancel_wait, cancel)); - g_object_set_data_full(G_OBJECT(cancel), "cancel", cancel, cancel_wait_free); - - return cancel; -} -/* LCOV_EXCL_STOP*/ - -/* LCOV_EXCL_START*/ Result<std::string> Mu::read_from_stdin() { diff --git a/lib/utils/mu-utils-file.hh b/lib/utils/mu-utils-file.hh index 1ef5a17..86b6b11 100644 --- a/lib/utils/mu-utils-file.hh +++ b/lib/utils/mu-utils-file.hh @@ -187,17 +187,6 @@ std::string join_paths(S&& s, Args...args) { } /** - * Like g_cancellable_new(), but automatically cancels itself - * after timeout - * - * @param timeout timeout in millisecs - * - * @return A GCancellable* instances; free with g_object_unref() when - * no longer needed. - */ -GCancellable* g_cancellable_new_with_timeout(guint timeout); - -/** * Read for standard input * * @return data from standard input or an error. |