[PATCH 1/2] novatel: port custom init to use GTask

[Ben Chan]

On Thu, Apr 6, 2017 at 11:36 AM, Aleksander Morgado
<aleksander at aleksander.es> wrote:
> On 03/04/17 21:37, Ben Chan wrote:
>> ---
>>  plugins/novatel/mm-common-novatel.c | 62 +++++++++++++++++--------------------
>>  1 file changed, 29 insertions(+), 33 deletions(-)
>>
>
> Pushed to git master.
>
> In this case, though, we may have been able to avoid the ctx->probe
> reference, right?

Oh, right. I was fooled by the fact that the variable isn't named
|self| :p   Will upload a fix if no one objects the removal of self
reference in context object for GTask.


>
>> diff --git a/plugins/novatel/mm-common-novatel.c b/plugins/novatel/mm-common-novatel.c
>> index 4c39c7c7..a8f2da90 100644
>> --- a/plugins/novatel/mm-common-novatel.c
>> +++ b/plugins/novatel/mm-common-novatel.c
>> @@ -22,22 +22,15 @@
>>  typedef struct {
>>      MMPortProbe *probe;
>>      MMPortSerialAt *port;
>> -    GCancellable *cancellable;
>> -    GSimpleAsyncResult *result;
>>      guint nwdmat_retries;
>>      guint wait_time;
>>  } CustomInitContext;
>>
>>  static void
>> -custom_init_context_complete_and_free (CustomInitContext *ctx)
>> +custom_init_context_free (CustomInitContext *ctx)
>>  {
>> -    g_simple_async_result_complete_in_idle (ctx->result);
>> -
>> -    if (ctx->cancellable)
>> -        g_object_unref (ctx->cancellable);
>>      g_object_unref (ctx->port);
>>      g_object_unref (ctx->probe);
>> -    g_object_unref (ctx->result);
>>      g_slice_free (CustomInitContext, ctx);
>>  }
>>
>> @@ -46,15 +39,15 @@ mm_common_novatel_custom_init_finish (MMPortProbe *probe,
>>                                        GAsyncResult *result,
>>                                        GError **error)
>>  {
>> -    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
>> +    return g_task_propagate_boolean (G_TASK (result), error);
>>  }
>>
>> -static void custom_init_step (CustomInitContext *ctx);
>> +static void custom_init_step (GTask *task);
>>
>>  static void
>>  nwdmat_ready (MMPortSerialAt *port,
>>                GAsyncResult *res,
>> -              CustomInitContext *ctx)
>> +              GTask* task)
>>  {
>>      const gchar *response;
>>      GError *error = NULL;
>> @@ -64,7 +57,7 @@ nwdmat_ready (MMPortSerialAt *port,
>>          if (g_error_matches (error,
>>                               MM_SERIAL_ERROR,
>>                               MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
>> -            custom_init_step (ctx);
>> +            custom_init_step (task);
>>              goto out;
>>          }
>>
>> @@ -72,8 +65,8 @@ nwdmat_ready (MMPortSerialAt *port,
>>      }
>>
>>      /* Finish custom_init */
>> -    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>> -    custom_init_context_complete_and_free (ctx);
>> +    g_task_return_boolean (task, TRUE);
>> +    g_object_unref (task);
>>
>>  out:
>>      if (error)
>> @@ -81,21 +74,25 @@ out:
>>  }
>>
>>  static gboolean
>> -custom_init_wait_cb (CustomInitContext *ctx)
>> +custom_init_wait_cb (GTask *task)
>>  {
>> -    custom_init_step (ctx);
>> +    custom_init_step (task);
>>      return G_SOURCE_REMOVE;
>>  }
>>
>>  static void
>> -custom_init_step (CustomInitContext *ctx)
>> +custom_init_step (GTask *task)
>>  {
>> +    CustomInitContext *ctx;
>> +
>> +    ctx = g_task_get_task_data (task);
>> +
>>      /* If cancelled, end */
>> -    if (g_cancellable_is_cancelled (ctx->cancellable)) {
>> +    if (g_cancellable_is_cancelled (g_task_get_cancellable (task))) {
>>          mm_dbg ("(Novatel) no need to keep on running custom init in (%s)",
>>                  mm_port_get_device (MM_PORT (ctx->port)));
>> -        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>> -        custom_init_context_complete_and_free (ctx);
>> +        g_task_return_boolean (task, TRUE);
>> +        g_object_unref (task);
>>          return;
>>      }
>>
>> @@ -103,14 +100,14 @@ custom_init_step (CustomInitContext *ctx)
>>      if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (ctx->probe)))) {
>>          mm_dbg ("(Novatel) no need to run custom init in (%s): device has QMI port",
>>                  mm_port_get_device (MM_PORT (ctx->port)));
>> -        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>> -        custom_init_context_complete_and_free (ctx);
>> +        g_task_return_boolean (task, TRUE);
>> +        g_object_unref (task);
>>          return;
>>      }
>>
>>      if (ctx->wait_time > 0) {
>>          ctx->wait_time--;
>> -        g_timeout_add_seconds (1, (GSourceFunc)custom_init_wait_cb, ctx);
>> +        g_timeout_add_seconds (1, (GSourceFunc)custom_init_wait_cb, task);
>>          return;
>>      }
>>
>> @@ -121,17 +118,17 @@ custom_init_step (CustomInitContext *ctx)
>>                                     3,
>>                                     FALSE, /* raw */
>>                                     FALSE, /* allow_cached */
>> -                                   ctx->cancellable,
>> +                                   g_task_get_cancellable (task),
>>                                     (GAsyncReadyCallback)nwdmat_ready,
>> -                                   ctx);
>> +                                   task);
>>          return;
>>      }
>>
>>      /* Finish custom_init */
>>      mm_dbg ("(Novatel) couldn't flip secondary port to AT in (%s): all retries consumed",
>>              mm_port_get_device (MM_PORT (ctx->port)));
>> -    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>> -    custom_init_context_complete_and_free (ctx);
>> +    g_task_return_boolean (task, TRUE);
>> +    g_object_unref (task);
>>  }
>>
>>  void
>> @@ -142,17 +139,16 @@ mm_common_novatel_custom_init (MMPortProbe *probe,
>>                                 gpointer user_data)
>>  {
>>      CustomInitContext *ctx;
>> +    GTask *task;
>>
>>      ctx = g_slice_new (CustomInitContext);
>> -    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
>> -                                             callback,
>> -                                             user_data,
>> -                                             mm_common_novatel_custom_init);
>>      ctx->probe = g_object_ref (probe);
>>      ctx->port = g_object_ref (port);
>> -    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
>>      ctx->nwdmat_retries = 3;
>>      ctx->wait_time = 2;
>>
>> -    custom_init_step (ctx);
>> +    task = g_task_new (probe, cancellable, callback, user_data);
>> +    g_task_set_task_data (task, ctx, (GDestroyNotify)custom_init_context_free);
>> +
>> +    custom_init_step (task);
>>  }
>>
>
>
> --
> Aleksander
> https://aleksander.es