[PATCH 1/3] iface-modem-oma: port mm_iface_modem_oma_initialize to use GTask

Aleksander Morgado aleksander at aleksander.es
Thu Jun 29 09:05:15 UTC 2017


On 29/06/17 06:43, Ben Chan wrote:
> ---
>  src/mm-iface-modem-oma.c | 99 +++++++++++++++++++++---------------------------
>  1 file changed, 43 insertions(+), 56 deletions(-)
> 

Pushed to git master, thanks.

> diff --git a/src/mm-iface-modem-oma.c b/src/mm-iface-modem-oma.c
> index b8c48417..03e3deb6 100644
> --- a/src/mm-iface-modem-oma.c
> +++ b/src/mm-iface-modem-oma.c
> @@ -1000,7 +1000,7 @@ mm_iface_modem_oma_enable (MMIfaceModemOma *self,
>  /*****************************************************************************/
>  
>  typedef struct _InitializationContext InitializationContext;
> -static void interface_initialization_step (InitializationContext *ctx);
> +static void interface_initialization_step (GTask *task);
>  
>  typedef enum {
>      INITIALIZATION_STEP_FIRST,
> @@ -1010,43 +1010,23 @@ typedef enum {
>  } InitializationStep;
>  
>  struct _InitializationContext {
> -    MMIfaceModemOma *self;
>      MmGdbusModemOma *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 (MMIfaceModemOma *self,
>                       GAsyncResult *res,
> -                     InitializationContext *ctx)
> +                     GTask *task)
>  {
> +    InitializationContext *ctx;
>      GError *error = NULL;
>  
>      if (!MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->check_support_finish (self, res, &error)) {
> @@ -1063,16 +1043,25 @@ check_support_ready (MMIfaceModemOma *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)
>  {
> +    MMIfaceModemOma *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:
> @@ -1088,23 +1077,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_OMA_GET_INTERFACE (ctx->self)->check_support &&
> -                MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->check_support_finish) {
> -                MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->check_support (
> -                    ctx->self,
> +            if (MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->check_support &&
> +                MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->check_support_finish) {
> +                MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->check_support (
> +                    self,
>                      (GAsyncReadyCallback)check_support_ready,
> -                    ctx);
> +                    task);
>                  return;
>              }
>  
> @@ -1115,13 +1104,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,
> -                                             "OMA not supported");
> -            initialization_context_complete_and_free (ctx);
> +            g_task_return_new_error (task,
> +                                     MM_CORE_ERROR,
> +                                     MM_CORE_ERROR_UNSUPPORTED,
> +                                     "OMA not supported");
> +            g_object_unref (task);
>              return;
>          }
>          /* Fall down to next step */
> @@ -1134,26 +1123,26 @@ interface_initialization_step (InitializationContext *ctx)
>          g_signal_connect (ctx->skeleton,
>                            "handle-setup",
>                            G_CALLBACK (handle_setup),
> -                          ctx->self);
> +                          self);
>          g_signal_connect (ctx->skeleton,
>                            "handle-start-client-initiated-session",
>                            G_CALLBACK (handle_start_client_initiated_session),
> -                          ctx->self);
> +                          self);
>          g_signal_connect (ctx->skeleton,
>                            "handle-accept-network-initiated-session",
>                            G_CALLBACK (handle_accept_network_initiated_session),
> -                          ctx->self);
> +                          self);
>          g_signal_connect (ctx->skeleton,
>                            "handle-cancel-session",
>                            G_CALLBACK (handle_cancel_session),
> -                          ctx->self);
> +                          self);
>  
>          /* Finally, export the new interface */
> -        mm_gdbus_object_skeleton_set_modem_oma (MM_GDBUS_OBJECT_SKELETON (ctx->self),
> +        mm_gdbus_object_skeleton_set_modem_oma (MM_GDBUS_OBJECT_SKELETON (self),
>                                                  MM_GDBUS_MODEM_OMA (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;
>      }
>  
> @@ -1165,7 +1154,7 @@ mm_iface_modem_oma_initialize_finish (MMIfaceModemOma *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
> @@ -1176,6 +1165,7 @@ mm_iface_modem_oma_initialize (MMIfaceModemOma *self,
>  {
>      InitializationContext *ctx;
>      MmGdbusModemOma *skeleton = NULL;
> +    GTask *task;
>  
>      /* Did we already create it? */
>      g_object_get (self,
> @@ -1197,16 +1187,13 @@ mm_iface_modem_oma_initialize (MMIfaceModemOma *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_oma_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


More information about the ModemManager-devel mailing list