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

iface-modem: port mm_iface_modem_create_bearer to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-30 02:23:41 -07:00
committed by Aleksander Morgado
parent c09b3b9426
commit 0bc40c8c95
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/mm-iface-modem.c
View File

@@ -454,17 +454,12 @@ bearer_status_changed (MMBaseBearer *bearer,
} }
typedef struct { typedef struct {
MMIfaceModem *self;
MMBearerList *list; MMBearerList *list;
GSimpleAsyncResult *result;
} CreateBearerContext; } CreateBearerContext;
static void static void
create_bearer_context_complete_and_free (CreateBearerContext *ctx) create_bearer_context_free (CreateBearerContext *ctx)
{ {
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
if (ctx->list) if (ctx->list)
g_object_unref (ctx->list); g_object_unref (ctx->list);
g_slice_free (CreateBearerContext, ctx); g_slice_free (CreateBearerContext, ctx);
@@ -475,30 +470,30 @@ mm_iface_modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return g_task_propagate_pointer (G_TASK (res), error);
return NULL;
return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
} }
static void static void
create_bearer_ready (MMIfaceModem *self, create_bearer_ready (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
CreateBearerContext *ctx) GTask *task)
{ {
CreateBearerContext *ctx;
MMBaseBearer *bearer; MMBaseBearer *bearer;
GError *error = NULL; GError *error = NULL;
bearer = MM_IFACE_MODEM_GET_INTERFACE (self)->create_bearer_finish (self, res, &error); bearer = MM_IFACE_MODEM_GET_INTERFACE (self)->create_bearer_finish (self, res, &error);
if (error) { if (error) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
create_bearer_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
ctx = g_task_get_task_data (task);
if (!mm_bearer_list_add_bearer (ctx->list, bearer, &error)) { if (!mm_bearer_list_add_bearer (ctx->list, bearer, &error)) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
create_bearer_context_complete_and_free (ctx); g_object_unref (task);
g_object_unref (bearer); g_object_unref (bearer);
return; return;
} }
@@ -509,8 +504,8 @@ create_bearer_ready (MMIfaceModem *self,
"notify::" MM_BASE_BEARER_STATUS, "notify::" MM_BASE_BEARER_STATUS,
(GCallback)bearer_status_changed, (GCallback)bearer_status_changed,
self); self);
g_simple_async_result_set_op_res_gpointer (ctx->result, bearer, g_object_unref); g_task_return_pointer (task, bearer, g_object_unref);
create_bearer_context_complete_and_free (ctx); g_object_unref (task);
} }
void void
@@ -520,34 +515,34 @@ mm_iface_modem_create_bearer (MMIfaceModem *self,
gpointer user_data) gpointer user_data)
{ {
CreateBearerContext *ctx; CreateBearerContext *ctx;
GTask *task;
ctx = g_slice_new (CreateBearerContext); ctx = g_slice_new (CreateBearerContext);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback, g_task_set_task_data (task, ctx, (GDestroyNotify)create_bearer_context_free);
user_data,
mm_iface_modem_create_bearer);
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_BEARER_LIST, &ctx->list, MM_IFACE_MODEM_BEARER_LIST, &ctx->list,
NULL); NULL);
if (!ctx->list) { if (!ctx->list) {
g_simple_async_result_set_error ( g_task_return_new_error (
ctx->result, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Cannot add new bearer: bearer list not found"); "Cannot add new bearer: bearer list not found");
create_bearer_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
if (mm_bearer_list_get_count (ctx->list) == mm_bearer_list_get_max (ctx->list)) { if (mm_bearer_list_get_count (ctx->list) == mm_bearer_list_get_max (ctx->list)) {
g_simple_async_result_set_error ( g_task_return_new_error (
ctx->result, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_TOO_MANY, MM_CORE_ERROR_TOO_MANY,
"Cannot add new bearer: already reached maximum (%u)", "Cannot add new bearer: already reached maximum (%u)",
mm_bearer_list_get_count (ctx->list)); mm_bearer_list_get_count (ctx->list));
create_bearer_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -555,7 +550,7 @@ mm_iface_modem_create_bearer (MMIfaceModem *self,
self, self,
properties, properties,
(GAsyncReadyCallback)create_bearer_ready, (GAsyncReadyCallback)create_bearer_ready,
ctx); task);
} }
typedef struct { typedef struct {