fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 06:40:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop using deprecated g_get_current_time

Browse source 
g_get_current_time was deprecated in 2.62 and can be directly replaced with
g_get_real_time.
This commit is contained in:
Jelle van der Waa 2024-03-09 17:20:07 +01:00
parent dffb485a15
commit 1e58e8218a
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libupower-glib/up-history-item.c
View file

@ -116,12 +116,12 @@ up_history_item_set_time (UpHistoryItem *history_item, guint time)
void void
up_history_item_set_time_to_present (UpHistoryItem *history_item) up_history_item_set_time_to_present (UpHistoryItem *history_item)
{ {
GTimeVal timeval; guint64 time_now;
g_return_if_fail (UP_IS_HISTORY_ITEM (history_item)); g_return_if_fail (UP_IS_HISTORY_ITEM (history_item));
g_get_current_time (&timeval); time_now = g_get_real_time ();
history_item->priv->time = timeval.tv_sec; history_item->priv->time = time_now / 1000000;
g_object_notify (G_OBJECT(history_item), "time"); g_object_notify (G_OBJECT(history_item), "time");
} }

2
src/linux/up-device-supply-battery.c
View file

@ -47,10 +47,10 @@ enum {
struct _UpDeviceSupplyBattery struct _UpDeviceSupplyBattery
{ {
UpDeviceBattery parent;
gboolean has_coldplug_values; gboolean has_coldplug_values;
gboolean coldplug_units; gboolean coldplug_units;
gdouble *energy_old; gdouble *energy_old;
GTimeVal *energy_old_timespec;
guint energy_old_first; guint energy_old_first;
gdouble rate_old; gdouble rate_old;
gboolean shown_invalid_voltage_warning; gboolean shown_invalid_voltage_warning;

12
src/up-history.c
View file

@ -203,7 +203,7 @@ up_history_copy_array_timespan (const GPtrArray *array, guint timespan)
guint i; guint i;
UpHistoryItem *item; UpHistoryItem *item;
GPtrArray *array_new; GPtrArray *array_new;
GTimeVal timeval; gint64 time_now;
/* no data */ /* no data */
if (array->len == 0) if (array->len == 0)
@ -217,14 +217,14 @@ up_history_copy_array_timespan (const GPtrArray *array, guint timespan)
/* new data */ /* new data */
array_new = g_ptr_array_new (); array_new = g_ptr_array_new ();
g_get_current_time (&timeval); time_now = g_get_real_time ();
g_debug ("limiting data to last %i seconds", timespan); g_debug ("limiting data to last %i seconds", timespan);
/* treat the timespan like a range, and search backwards */ /* treat the timespan like a range, and search backwards */
timespan *= 0.95f; timespan *= 0.95f;
for (i=array->len-1; i>0; i--) { for (i=array->len-1; i>0; i--) {
item = (UpHistoryItem *) g_ptr_array_index (array, i); item = (UpHistoryItem *) g_ptr_array_index (array, i);
if (timeval.tv_sec - up_history_item_get_time (item) < timespan) if ((time_now / 1000000) - up_history_item_get_time (item) < timespan)
g_ptr_array_add (array_new, g_object_ref (item)); g_ptr_array_add (array_new, g_object_ref (item));
} }
out: out:
@ -429,12 +429,12 @@ up_history_array_to_file (UpHistory *history, GPtrArray *list, const gchar *file
GString *string; GString *string;
gboolean ret = TRUE; gboolean ret = TRUE;
GError *error = NULL; GError *error = NULL;
GTimeVal time_now; gint64 time_now;
guint time_item; guint time_item;
guint cull_count = 0; guint cull_count = 0;
/* get current time */ /* get current time */
g_get_current_time (&time_now); time_now = g_get_real_time ();
/* generate data */ /* generate data */
string = g_string_new (""); string = g_string_new ("");
@ -443,7 +443,7 @@ up_history_array_to_file (UpHistory *history, GPtrArray *list, const gchar *file
/* only save entries for the last 24 hours */ /* only save entries for the last 24 hours */
time_item = up_history_item_get_time (item); time_item = up_history_item_get_time (item);
if (time_now.tv_sec - time_item > history->priv->max_data_age) { if ((time_now / 1000000) - time_item > history->priv->max_data_age) {
cull_count++; cull_count++;
continue; continue;
} }