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

iface-modem-oma: port mm_iface_modem_oma_disable to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-28 21:43:50 -07:00
committed by Aleksander Morgado
parent 193784ebf8
commit b7a0afaf95
1 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/mm-iface-modem-oma.c
View File

@@ -645,7 +645,7 @@ handle_cancel_session (MmGdbusModemOma *skeleton,
/*****************************************************************************/ /*****************************************************************************/
typedef struct _DisablingContext DisablingContext; typedef struct _DisablingContext DisablingContext;
static void interface_disabling_step (DisablingContext *ctx); static void interface_disabling_step (GTask *task);
typedef enum { typedef enum {
DISABLING_STEP_FIRST, DISABLING_STEP_FIRST,
@@ -655,18 +655,13 @@ typedef enum {
} DisablingStep; } DisablingStep;
struct _DisablingContext { struct _DisablingContext {
MMIfaceModemOma *self;
DisablingStep step; DisablingStep step;
GSimpleAsyncResult *result;
MmGdbusModemOma *skeleton; MmGdbusModemOma *skeleton;
}; };
static void static void
disabling_context_complete_and_free (DisablingContext *ctx) disabling_context_free (DisablingContext *ctx)
{ {
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->self);
g_object_unref (ctx->result);
if (ctx->skeleton) if (ctx->skeleton)
g_object_unref (ctx->skeleton); g_object_unref (ctx->skeleton);
g_free (ctx); g_free (ctx);
@@ -677,50 +672,60 @@ mm_iface_modem_oma_disable_finish (MMIfaceModemOma *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 void static void
disable_unsolicited_events_ready (MMIfaceModemOma *self, disable_unsolicited_events_ready (MMIfaceModemOma *self,
GAsyncResult *res, GAsyncResult *res,
DisablingContext *ctx) GTask *task)
{ {
DisablingContext *ctx;
GError *error = NULL; GError *error = NULL;
MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->disable_unsolicited_events_finish (self, res, &error); MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->disable_unsolicited_events_finish (self, res, &error);
if (error) { if (error) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
/* Go on to next step */ /* Go on to next step */
ctx = g_task_get_task_data (task);
ctx->step++; ctx->step++;
interface_disabling_step (ctx); interface_disabling_step (task);
} }
static void static void
cleanup_unsolicited_events_ready (MMIfaceModemOma *self, cleanup_unsolicited_events_ready (MMIfaceModemOma *self,
GAsyncResult *res, GAsyncResult *res,
DisablingContext *ctx) GTask *task)
{ {
DisablingContext *ctx;
GError *error = NULL; GError *error = NULL;
MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->cleanup_unsolicited_events_finish (self, res, &error); MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->cleanup_unsolicited_events_finish (self, res, &error);
if (error) { if (error) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
/* Go on to next step */ /* Go on to next step */
ctx = g_task_get_task_data (task);
ctx->step++; ctx->step++;
interface_disabling_step (ctx); interface_disabling_step (task);
} }
static void static void
interface_disabling_step (DisablingContext *ctx) interface_disabling_step (GTask *task)
{ {
MMIfaceModemOma *self;
DisablingContext *ctx;
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
switch (ctx->step) { switch (ctx->step) {
case DISABLING_STEP_FIRST: case DISABLING_STEP_FIRST:
/* Fall down to next step */ /* Fall down to next step */
@@ -728,12 +733,12 @@ interface_disabling_step (DisablingContext *ctx)
case DISABLING_STEP_DISABLE_UNSOLICITED_EVENTS: case DISABLING_STEP_DISABLE_UNSOLICITED_EVENTS:
/* Allow cleaning up unsolicited events */ /* Allow cleaning up unsolicited events */
if (MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->disable_unsolicited_events && if (MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->disable_unsolicited_events &&
MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->disable_unsolicited_events_finish) { MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->disable_unsolicited_events_finish) {
MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->disable_unsolicited_events ( MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->disable_unsolicited_events (
ctx->self, self,
(GAsyncReadyCallback)disable_unsolicited_events_ready, (GAsyncReadyCallback)disable_unsolicited_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
@@ -741,12 +746,12 @@ interface_disabling_step (DisablingContext *ctx)
case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS: case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS:
/* Allow cleaning up unsolicited events */ /* Allow cleaning up unsolicited events */
if (MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events && if (MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->cleanup_unsolicited_events &&
MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events_finish) { MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->cleanup_unsolicited_events_finish) {
MM_IFACE_MODEM_OMA_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events ( MM_IFACE_MODEM_OMA_GET_INTERFACE (self)->cleanup_unsolicited_events (
ctx->self, self,
(GAsyncReadyCallback)cleanup_unsolicited_events_ready, (GAsyncReadyCallback)cleanup_unsolicited_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
@@ -754,8 +759,8 @@ interface_disabling_step (DisablingContext *ctx)
case DISABLING_STEP_LAST: case DISABLING_STEP_LAST:
/* We are done without errors! */ /* We are done without errors! */
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_boolean (task, TRUE);
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -768,27 +773,27 @@ mm_iface_modem_oma_disable (MMIfaceModemOma *self,
gpointer user_data) gpointer user_data)
{ {
DisablingContext *ctx; DisablingContext *ctx;
GTask *task;
ctx = g_new0 (DisablingContext, 1); ctx = g_new0 (DisablingContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
mm_iface_modem_oma_disable);
ctx->step = DISABLING_STEP_FIRST; ctx->step = DISABLING_STEP_FIRST;
g_object_get (ctx->self,
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)disabling_context_free);
g_object_get (self,
MM_IFACE_MODEM_OMA_DBUS_SKELETON, &ctx->skeleton, MM_IFACE_MODEM_OMA_DBUS_SKELETON, &ctx->skeleton,
NULL); NULL);
if (!ctx->skeleton) { if (!ctx->skeleton) {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't get interface skeleton"); "Couldn't get interface skeleton");
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
interface_disabling_step (ctx); interface_disabling_step (task);
} }
/*****************************************************************************/ /*****************************************************************************/