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

iface-modem-3gpp: port mm_iface_modem_3gpp_initialize to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-29 04:46:18 -07:00
committed by Aleksander Morgado
parent 35837208df
commit c08de58668
1 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/mm-iface-modem-3gpp.c
View File

@@ -1842,7 +1842,7 @@ mm_iface_modem_3gpp_enable (MMIfaceModem3gpp *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,
@@ -1852,38 +1852,17 @@ typedef enum {
} InitializationStep; } InitializationStep;
struct _InitializationContext { struct _InitializationContext {
MMIfaceModem3gpp *self;
MmGdbusModem3gpp *skeleton; MmGdbusModem3gpp *skeleton;
GSimpleAsyncResult *result;
GCancellable *cancellable;
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_free (ctx); 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 static void
sim_pin_lock_enabled_cb (MMBaseSim *self, sim_pin_lock_enabled_cb (MMBaseSim *self,
gboolean enabled, gboolean enabled,
@@ -1903,11 +1882,14 @@ sim_pin_lock_enabled_cb (MMBaseSim *self,
static void static void
load_enabled_facility_locks_ready (MMIfaceModem3gpp *self, load_enabled_facility_locks_ready (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
InitializationContext *ctx) GTask *task)
{ {
InitializationContext *ctx;
GError *error = NULL; GError *error = NULL;
MMModem3gppFacility facilities; MMModem3gppFacility facilities;
ctx = g_task_get_task_data (task);
facilities = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_enabled_facility_locks_finish (self, res, &error); facilities = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_enabled_facility_locks_finish (self, res, &error);
mm_gdbus_modem3gpp_set_enabled_facility_locks (ctx->skeleton, facilities); mm_gdbus_modem3gpp_set_enabled_facility_locks (ctx->skeleton, facilities);
@@ -1933,17 +1915,20 @@ load_enabled_facility_locks_ready (MMIfaceModem3gpp *self,
/* Go on to next step */ /* Go on to next step */
ctx->step++; ctx->step++;
interface_initialization_step (ctx); interface_initialization_step (task);
} }
static void static void
load_imei_ready (MMIfaceModem3gpp *self, load_imei_ready (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
InitializationContext *ctx) GTask *task)
{ {
InitializationContext *ctx;
GError *error = NULL; GError *error = NULL;
gchar *imei; gchar *imei;
ctx = g_task_get_task_data (task);
imei = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_imei_finish (self, res, &error); imei = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_imei_finish (self, res, &error);
mm_gdbus_modem3gpp_set_imei (ctx->skeleton, imei); mm_gdbus_modem3gpp_set_imei (ctx->skeleton, imei);
g_free (imei); g_free (imei);
@@ -1955,15 +1940,23 @@ load_imei_ready (MMIfaceModem3gpp *self,
/* Go on to next step */ /* Go on to next step */
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)
{ {
MMIfaceModem3gpp *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_task_return_error_if_cancelled (task)) {
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:
@@ -1975,24 +1968,24 @@ interface_initialization_step (InitializationContext *ctx)
* lifetime of the modem. Therefore, if we already have it loaded, * lifetime of the modem. Therefore, if we already have it loaded,
* don't try to load it again. */ * don't try to load it again. */
if (!mm_gdbus_modem3gpp_get_imei (ctx->skeleton) && if (!mm_gdbus_modem3gpp_get_imei (ctx->skeleton) &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_imei && MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_imei &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_imei_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_imei_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_imei ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_imei (
ctx->self, self,
(GAsyncReadyCallback)load_imei_ready, (GAsyncReadyCallback)load_imei_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case INITIALIZATION_STEP_ENABLED_FACILITY_LOCKS: case INITIALIZATION_STEP_ENABLED_FACILITY_LOCKS:
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_enabled_facility_locks && if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_enabled_facility_locks &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_enabled_facility_locks_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_enabled_facility_locks_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->load_enabled_facility_locks ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_enabled_facility_locks (
ctx->self, self,
(GAsyncReadyCallback)load_enabled_facility_locks_ready, (GAsyncReadyCallback)load_enabled_facility_locks_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
@@ -2005,19 +1998,19 @@ interface_initialization_step (InitializationContext *ctx)
g_signal_connect (ctx->skeleton, g_signal_connect (ctx->skeleton,
"handle-register", "handle-register",
G_CALLBACK (handle_register), G_CALLBACK (handle_register),
ctx->self); self);
g_signal_connect (ctx->skeleton, g_signal_connect (ctx->skeleton,
"handle-scan", "handle-scan",
G_CALLBACK (handle_scan), G_CALLBACK (handle_scan),
ctx->self); self);
/* Finally, export the new interface */ /* Finally, export the new interface */
mm_gdbus_object_skeleton_set_modem3gpp (MM_GDBUS_OBJECT_SKELETON (ctx->self), mm_gdbus_object_skeleton_set_modem3gpp (MM_GDBUS_OBJECT_SKELETON (self),
MM_GDBUS_MODEM3GPP (ctx->skeleton)); MM_GDBUS_MODEM3GPP (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;
} }
@@ -2029,7 +2022,7 @@ mm_iface_modem_3gpp_initialize_finish (MMIfaceModem3gpp *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);
} }
void void
@@ -2040,6 +2033,7 @@ mm_iface_modem_3gpp_initialize (MMIfaceModem3gpp *self,
{ {
MmGdbusModem3gpp *skeleton = NULL; MmGdbusModem3gpp *skeleton = NULL;
InitializationContext *ctx; InitializationContext *ctx;
GTask *task;
/* Did we already create it? */ /* Did we already create it? */
g_object_get (self, g_object_get (self,
@@ -2075,17 +2069,14 @@ mm_iface_modem_3gpp_initialize (MMIfaceModem3gpp *self,
} }
ctx = g_new0 (InitializationContext, 1); 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_3gpp_initialize);
ctx->step = INITIALIZATION_STEP_FIRST; ctx->step = INITIALIZATION_STEP_FIRST;
ctx->skeleton = skeleton; ctx->skeleton = skeleton;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)initialization_context_free);
/* Perform async initialization here */ /* Perform async initialization here */
interface_initialization_step (ctx); interface_initialization_step (task);
} }
void void