[at-spi2-atk] Use g_get_monotonic_time, rather than g_get_current_time
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Use g_get_monotonic_time, rather than g_get_current_time
- Date: Tue, 12 Apr 2022 15:31:20 +0000 (UTC)
commit c52a5d21b42569dfd5dce5f8568262c75f68b27d
Author: Mike Gorse <mgorse suse com>
Date: Tue Apr 12 10:30:43 2022 -0500
Use g_get_monotonic_time, rather than g_get_current_time
g_get_current_time is deprecated and not year 2038 compatible.
atk-adaptor/accessible-leasing.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/atk-adaptor/accessible-leasing.c b/atk-adaptor/accessible-leasing.c
index 65b8bfce..f60d7ffb 100644
--- a/atk-adaptor/accessible-leasing.c
+++ b/atk-adaptor/accessible-leasing.c
@@ -37,7 +37,7 @@ SpiLeasing *spi_global_leasing;
typedef struct _ExpiryElement
{
- guint expiry_s;
+ gint64 expiry_s;
GObject *object;
} ExpiryElement;
@@ -106,12 +106,10 @@ expiry_func (gpointer data)
SpiLeasing *leasing = SPI_LEASING (data);
ExpiryElement *head, *current;
- GTimeVal t;
-
- g_get_current_time (&t);
+ gint64 secs = g_get_monotonic_time () / 1000000;
head = g_queue_peek_head (leasing->expiry_queue);
- while (head != NULL && head->expiry_s <= t.tv_sec)
+ while (head != NULL && head->expiry_s <= secs)
{
current = g_queue_pop_head (leasing->expiry_queue);
@@ -149,7 +147,7 @@ static void
add_expiry_timeout (SpiLeasing * leasing)
{
ExpiryElement *elem;
- GTimeVal t;
+ gint64 secs = g_get_monotonic_time () / 1000000;
guint next_expiry;
if (leasing->expiry_func_id != 0)
@@ -159,9 +157,7 @@ add_expiry_timeout (SpiLeasing * leasing)
if (elem == NULL)
return;
- /* The current time is implicitly rounded down here by ignoring the us */
- g_get_current_time (&t);
- next_expiry = elem->expiry_s - t.tv_sec;
+ next_expiry = elem->expiry_s - secs;
leasing->expiry_func_id = spi_timeout_add_seconds (next_expiry,
expiry_func, leasing);
}
@@ -188,13 +184,12 @@ spi_leasing_take (SpiLeasing * leasing, GObject * object)
Check the next expiry.
*/
- GTimeVal t;
+ gint64 secs = g_get_monotonic_time () / 1000000;
guint expiry_s;
ExpiryElement *elem;
- g_get_current_time (&t);
- expiry_s = t.tv_sec + EXPIRY_TIME_S;
+ expiry_s = secs + EXPIRY_TIME_S;
elem = g_slice_new (ExpiryElement);
elem->expiry_s = expiry_s;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]