colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-signal: port mm_iface_modem_signal_initialize to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-04-12 18:52:49 -07:00
committed by Aleksander Morgado
parent ed8bea8a3c
commit 01cba808e4
1 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/mm-iface-modem-signal.c
View File

@@ -355,7 +355,7 @@ mm_iface_modem_signal_enable (MMIfaceModemSignal *self,
/*****************************************************************************/ /*****************************************************************************/
typedef struct _InitializationContext InitializationContext; typedef struct _InitializationContext InitializationContext;
static void interface_initialization_step (InitializationContext *ctx); static void interface_initialization_step (GTask *task);
typedef enum { typedef enum {
INITIALIZATION_STEP_FIRST, INITIALIZATION_STEP_FIRST,
@@ -365,52 +365,31 @@ typedef enum {
} InitializationStep; } InitializationStep;
struct _InitializationContext { struct _InitializationContext {
MMIfaceModemSignal *self;
MmGdbusModemSignal *skeleton; MmGdbusModemSignal *skeleton;
GCancellable *cancellable;
GSimpleAsyncResult *result;
InitializationStep step; InitializationStep step;
}; };
static void 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_object_unref (ctx->skeleton);
g_slice_free (InitializationContext, ctx); g_slice_free (InitializationContext, ctx);
} }
gboolean gboolean
mm_iface_modem_signal_initialize_finish (MMIfaceModemSignal *self, mm_iface_modem_signal_initialize_finish (MMIfaceModemSignal *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
}
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 static void
check_support_ready (MMIfaceModemSignal *self, check_support_ready (MMIfaceModemSignal *self,
GAsyncResult *res, GAsyncResult *res,
InitializationContext *ctx) GTask *task)
{ {
InitializationContext *ctx;
GError *error = NULL; GError *error = NULL;
if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support_finish (self, res, &error)) { if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support_finish (self, res, &error)) {
@@ -427,16 +406,29 @@ check_support_ready (MMIfaceModemSignal *self,
} }
/* Go on to next step */ /* Go on to next step */
ctx = g_task_get_task_data (task);
ctx->step++; ctx->step++;
interface_initialization_step (ctx); interface_initialization_step (task);
} }
static void static void
interface_initialization_step (InitializationContext *ctx) interface_initialization_step (GTask *task)
{ {
MMIfaceModemSignal *self;
InitializationContext *ctx;
/* Don't run new steps if we're cancelled */ /* Don't run new steps if we're cancelled */
if (initialization_context_complete_and_free_if_cancelled (ctx)) if (g_cancellable_is_cancelled (g_task_get_cancellable (task))) {
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_CANCELLED,
"Interface initialization cancelled");
g_object_unref (task);
return; return;
}
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
switch (ctx->step) { switch (ctx->step) {
case INITIALIZATION_STEP_FIRST: case INITIALIZATION_STEP_FIRST:
@@ -452,23 +444,23 @@ interface_initialization_step (InitializationContext *ctx)
ctx->step++; ctx->step++;
case INITIALIZATION_STEP_CHECK_SUPPORT: 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))) { support_checked_quark))) {
/* Set the checked flag so that we don't run it again */ /* 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, support_checked_quark,
GUINT_TO_POINTER (TRUE)); GUINT_TO_POINTER (TRUE));
/* Initially, assume we don't support it */ /* Initially, assume we don't support it */
g_object_set_qdata (G_OBJECT (ctx->self), g_object_set_qdata (G_OBJECT (self),
supported_quark, supported_quark,
GUINT_TO_POINTER (FALSE)); GUINT_TO_POINTER (FALSE));
if (MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (ctx->self)->check_support && if (MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support &&
MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (ctx->self)->check_support_finish) { MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support_finish) {
MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (ctx->self)->check_support ( MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support (
ctx->self, self,
(GAsyncReadyCallback)check_support_ready, (GAsyncReadyCallback)check_support_ready,
ctx); task);
return; return;
} }
@@ -479,13 +471,13 @@ interface_initialization_step (InitializationContext *ctx)
ctx->step++; ctx->step++;
case INITIALIZATION_STEP_FAIL_IF_UNSUPPORTED: 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))) { supported_quark))) {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED, MM_CORE_ERROR_UNSUPPORTED,
"Extended Signal information not supported"); "Extended Signal information not supported");
initialization_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
@@ -498,13 +490,13 @@ interface_initialization_step (InitializationContext *ctx)
g_signal_connect (ctx->skeleton, g_signal_connect (ctx->skeleton,
"handle-setup", "handle-setup",
G_CALLBACK (handle_setup), G_CALLBACK (handle_setup),
ctx->self); self);
/* Finally, export the new interface */ /* Finally, export the new interface */
mm_gdbus_object_skeleton_set_modem_signal (MM_GDBUS_OBJECT_SKELETON (ctx->self), mm_gdbus_object_skeleton_set_modem_signal (MM_GDBUS_OBJECT_SKELETON (self),
MM_GDBUS_MODEM_SIGNAL (ctx->skeleton)); MM_GDBUS_MODEM_SIGNAL (ctx->skeleton));
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_boolean (task, TRUE);
initialization_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -519,6 +511,7 @@ mm_iface_modem_signal_initialize (MMIfaceModemSignal *self,
{ {
InitializationContext *ctx; InitializationContext *ctx;
MmGdbusModemSignal *skeleton = NULL; MmGdbusModemSignal *skeleton = NULL;
GTask *task;
/* Did we already create it? */ /* Did we already create it? */
g_object_get (self, g_object_get (self,
@@ -535,16 +528,13 @@ mm_iface_modem_signal_initialize (MMIfaceModemSignal *self,
/* Perform async initialization here */ /* Perform async initialization here */
ctx = g_slice_new0 (InitializationContext); ctx = g_slice_new0 (InitializationContext);
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_signal_initialize);
ctx->step = INITIALIZATION_STEP_FIRST; ctx->step = INITIALIZATION_STEP_FIRST;
ctx->skeleton = skeleton; 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 void