On 29/06/17 06:44, Ben Chan wrote: > --- > src/mm-iface-modem-time.c | 93 > ++++++++++++++++++++--------------------------- > 1 file changed, 40 insertions(+), 53 deletions(-) >
Pushed to git master, thanks. > diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c > index 85588d3f..efb8d386 100644 > --- a/src/mm-iface-modem-time.c > +++ b/src/mm-iface-modem-time.c > @@ -774,7 +774,7 @@ mm_iface_modem_time_enable (MMIfaceModemTime *self, > > /*****************************************************************************/ > > typedef struct _InitializationContext InitializationContext; > -static void interface_initialization_step (InitializationContext *ctx); > +static void interface_initialization_step (GTask *task); > > typedef enum { > INITIALIZATION_STEP_FIRST, > @@ -784,43 +784,23 @@ typedef enum { > } InitializationStep; > > struct _InitializationContext { > - MMIfaceModemTime *self; > MmGdbusModemTime *skeleton; > - GSimpleAsyncResult *result; > - GCancellable *cancellable; > InitializationStep step; > }; > > static void > -initialization_context_complete_and_free (InitializationContext *ctx) > +initialization_context_free (InitializationContext *ctx) > { > - g_simple_async_result_complete_in_idle (ctx->result); > - g_object_unref (ctx->self); > - g_object_unref (ctx->result); > - g_object_unref (ctx->cancellable); > g_object_unref (ctx->skeleton); > g_free (ctx); > } > > -static gboolean > -initialization_context_complete_and_free_if_cancelled (InitializationContext > *ctx) > -{ > - if (!g_cancellable_is_cancelled (ctx->cancellable)) > - return FALSE; > - > - g_simple_async_result_set_error (ctx->result, > - MM_CORE_ERROR, > - MM_CORE_ERROR_CANCELLED, > - "Interface initialization cancelled"); > - initialization_context_complete_and_free (ctx); > - return TRUE; > -} > - > static void > check_support_ready (MMIfaceModemTime *self, > GAsyncResult *res, > - InitializationContext *ctx) > + GTask *task) > { > + InitializationContext *ctx; > GError *error = NULL; > > if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support_finish > (self, > @@ -839,16 +819,25 @@ check_support_ready (MMIfaceModemTime *self, > } > > /* Go on to next step */ > + ctx = g_task_get_task_data (task); > ctx->step++; > - interface_initialization_step (ctx); > + interface_initialization_step (task); > } > > static void > -interface_initialization_step (InitializationContext *ctx) > +interface_initialization_step (GTask *task) > { > + MMIfaceModemTime *self; > + InitializationContext *ctx; > + > /* Don't run new steps if we're cancelled */ > - if (initialization_context_complete_and_free_if_cancelled (ctx)) > + if (g_task_return_error_if_cancelled (task)) { > + g_object_unref (task); > return; > + } > + > + self = g_task_get_source_object (task); > + ctx = g_task_get_task_data (task); > > switch (ctx->step) { > case INITIALIZATION_STEP_FIRST: > @@ -864,23 +853,23 @@ interface_initialization_step (InitializationContext > *ctx) > ctx->step++; > > case INITIALIZATION_STEP_CHECK_SUPPORT: > - if (!GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (ctx->self), > + if (!GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (self), > support_checked_quark))) { > /* Set the checked flag so that we don't run it again */ > - g_object_set_qdata (G_OBJECT (ctx->self), > + g_object_set_qdata (G_OBJECT (self), > support_checked_quark, > GUINT_TO_POINTER (TRUE)); > /* Initially, assume we don't support it */ > - g_object_set_qdata (G_OBJECT (ctx->self), > + g_object_set_qdata (G_OBJECT (self), > supported_quark, > GUINT_TO_POINTER (FALSE)); > > - if (MM_IFACE_MODEM_TIME_GET_INTERFACE (ctx->self)->check_support > && > - MM_IFACE_MODEM_TIME_GET_INTERFACE > (ctx->self)->check_support_finish) { > - MM_IFACE_MODEM_TIME_GET_INTERFACE (ctx->self)->check_support > ( > - ctx->self, > + if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support && > + MM_IFACE_MODEM_TIME_GET_INTERFACE > (self)->check_support_finish) { > + MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support ( > + self, > (GAsyncReadyCallback)check_support_ready, > - ctx); > + task); > return; > } > > @@ -891,13 +880,13 @@ interface_initialization_step (InitializationContext > *ctx) > ctx->step++; > > case INITIALIZATION_STEP_FAIL_IF_UNSUPPORTED: > - if (!GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (ctx->self), > + if (!GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (self), > supported_quark))) { > - g_simple_async_result_set_error (ctx->result, > - MM_CORE_ERROR, > - MM_CORE_ERROR_UNSUPPORTED, > - "Time not supported"); > - initialization_context_complete_and_free (ctx); > + g_task_return_new_error (task, > + MM_CORE_ERROR, > + MM_CORE_ERROR_UNSUPPORTED, > + "Time not supported"); > + g_object_unref (task); > return; > } > /* Fall down to next step */ > @@ -910,14 +899,14 @@ interface_initialization_step (InitializationContext > *ctx) > g_signal_connect (ctx->skeleton, > "handle-get-network-time", > G_CALLBACK (handle_get_network_time), > - ctx->self); > + self); > > /* Finally, export the new interface */ > - mm_gdbus_object_skeleton_set_modem_time (MM_GDBUS_OBJECT_SKELETON > (ctx->self), > + mm_gdbus_object_skeleton_set_modem_time (MM_GDBUS_OBJECT_SKELETON > (self), > MM_GDBUS_MODEM_TIME > (ctx->skeleton)); > > - g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); > - initialization_context_complete_and_free (ctx); > + g_task_return_boolean (task, TRUE); > + g_object_unref (task); > return; > } > > @@ -929,7 +918,7 @@ mm_iface_modem_time_initialize_finish (MMIfaceModemTime > *self, > GAsyncResult *res, > GError **error) > { > - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT > (res), error); > + return g_task_propagate_boolean (G_TASK (res), error); > } > > void > @@ -940,6 +929,7 @@ mm_iface_modem_time_initialize (MMIfaceModemTime *self, > { > InitializationContext *ctx; > MmGdbusModemTime *skeleton = NULL; > + GTask *task; > > /* Did we already create it? */ > g_object_get (self, > @@ -955,16 +945,13 @@ mm_iface_modem_time_initialize (MMIfaceModemTime *self, > /* Perform async initialization here */ > > ctx = g_new0 (InitializationContext, 1); > - ctx->self = g_object_ref (self); > - ctx->cancellable = g_object_ref (cancellable); > - ctx->result = g_simple_async_result_new (G_OBJECT (self), > - callback, > - user_data, > - mm_iface_modem_time_initialize); > ctx->step = INITIALIZATION_STEP_FIRST; > ctx->skeleton = skeleton; > > - interface_initialization_step (ctx); > + task = g_task_new (self, cancellable, callback, user_data); > + g_task_set_task_data (task, ctx, > (GDestroyNotify)initialization_context_free); > + > + interface_initialization_step (task); > } > > void > -- Aleksander https://aleksander.es _______________________________________________ ModemManager-devel mailing list ModemManager-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel