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

cli: port mmcli_get_bearer to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-10-18 22:29:23 +02:00
parent 11e9b727b4
commit f94a93d66a
2 changed files with 97 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
cli/mmcli-common.c
View File

@@ -313,59 +313,66 @@ mmcli_get_modem_sync (GDBusConnection *connection,
return found; return found;
} }
/******************************************************************************/
/* Bearer */
typedef struct { typedef struct {
GSimpleAsyncResult *result; gchar *bearer_path;
GCancellable *cancellable;
gchar *bearer_path;
MMManager *manager; MMManager *manager;
GList *modems; GList *modems;
MMObject *current; MMObject *current;
MMBearer *bearer;
} GetBearerContext; } GetBearerContext;
typedef struct {
MMManager *manager;
MMObject *object;
MMBearer *bearer;
} GetBearerResults;
static void
get_bearer_results_free (GetBearerResults *results)
{
g_object_unref (results->manager);
g_object_unref (results->object);
g_object_unref (results->bearer);
g_free (results);
}
static void static void
get_bearer_context_free (GetBearerContext *ctx) get_bearer_context_free (GetBearerContext *ctx)
{ {
if (ctx->current) if (ctx->current)
g_object_unref (ctx->current); g_object_unref (ctx->current);
if (ctx->cancellable)
g_object_unref (ctx->cancellable);
if (ctx->manager) if (ctx->manager)
g_object_unref (ctx->manager); g_object_unref (ctx->manager);
if (ctx->bearer)
g_object_unref (ctx->bearer);
g_list_free_full (ctx->modems, g_object_unref); g_list_free_full (ctx->modems, g_object_unref);
g_free (ctx->bearer_path); g_free (ctx->bearer_path);
g_free (ctx); g_free (ctx);
} }
static void
get_bearer_context_complete (GetBearerContext *ctx)
{
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
ctx->result = NULL;
}
MMBearer * MMBearer *
mmcli_get_bearer_finish (GAsyncResult *res, mmcli_get_bearer_finish (GAsyncResult *res,
MMManager **o_manager, MMManager **o_manager,
MMObject **o_object) MMObject **o_object)
{ {
GetBearerContext *ctx; GetBearerResults *results;
MMBearer *obj;
ctx = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); results = g_task_propagate_pointer (G_TASK (res), NULL);
g_assert (results);
if (o_manager) if (o_manager)
*o_manager = g_object_ref (ctx->manager); *o_manager = g_object_ref (results->manager);
if (o_object) if (o_object)
*o_object = g_object_ref (ctx->current); *o_object = g_object_ref (results->object);
return g_object_ref (ctx->bearer); obj = g_object_ref (results->bearer);
get_bearer_results_free (results);
return obj;
} }
static void look_for_bearer_in_modem (GetBearerContext *ctx); static void look_for_bearer_in_modem (GTask *task);
static MMBearer * static MMBearer *
find_bearer_in_list (GList *list, find_bearer_in_list (GList *list,
const gchar *bearer_path) const gchar *bearer_path)
{ {
GList *l; GList *l;
@@ -383,12 +390,17 @@ find_bearer_in_list (GList *list,
} }
static void static void
list_bearers_ready (MMModem *modem, list_bearers_ready (MMModem *modem,
GAsyncResult *res, GAsyncResult *res,
GetBearerContext *ctx) GTask *task)
{ {
GList *bearers; GetBearerContext *ctx;
GError *error = NULL; GetBearerResults *results;
MMBearer *found;
GList *bearers;
GError *error = NULL;
ctx = g_task_get_task_data (task);
bearers = mm_modem_list_bearers_finish (modem, res, &error); bearers = mm_modem_list_bearers_finish (modem, res, &error);
if (error) { if (error) {
@@ -398,27 +410,31 @@ list_bearers_ready (MMModem *modem,
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ctx->bearer = find_bearer_in_list (bearers, ctx->bearer_path); found = find_bearer_in_list (bearers, ctx->bearer_path);
g_list_free_full (bearers, g_object_unref); g_list_free_full (bearers, g_object_unref);
/* Found! */ if (!found) {
if (ctx->bearer) { /* Not found, try with next modem */
g_simple_async_result_set_op_res_gpointer ( look_for_bearer_in_modem (task);
ctx->result,
ctx,
(GDestroyNotify)get_bearer_context_free);
get_bearer_context_complete (ctx);
return; return;
} }
/* Not found, try with next modem */ /* Found! */
look_for_bearer_in_modem (ctx); results = g_new (GetBearerResults, 1);
results->manager = g_object_ref (ctx->manager);
results->object = g_object_ref (ctx->current);
results->bearer = found;
g_task_return_pointer (task, results, (GDestroyNotify) get_bearer_results_free);
g_object_unref (task);
} }
static void static void
look_for_bearer_in_modem (GetBearerContext *ctx) look_for_bearer_in_modem (GTask *task)
{ {
MMModem *modem; GetBearerContext *ctx;
MMModem *modem;
ctx = g_task_get_task_data (task);
if (!ctx->modems) { if (!ctx->modems) {
g_printerr ("error: couldn't find bearer at '%s': 'not found in any modem'\n", g_printerr ("error: couldn't find bearer at '%s': 'not found in any modem'\n",
@@ -438,7 +454,7 @@ look_for_bearer_in_modem (GetBearerContext *ctx)
"(not fully initialized)", "(not fully initialized)",
mm_object_get_path (ctx->current)); mm_object_get_path (ctx->current));
g_object_unref (modem); g_object_unref (modem);
look_for_bearer_in_modem (ctx); look_for_bearer_in_modem (task);
return; return;
} }
@@ -447,17 +463,21 @@ look_for_bearer_in_modem (GetBearerContext *ctx)
mm_object_get_path (ctx->current)); mm_object_get_path (ctx->current));
mm_modem_list_bearers (modem, mm_modem_list_bearers (modem,
ctx->cancellable, g_task_get_cancellable (task),
(GAsyncReadyCallback)list_bearers_ready, (GAsyncReadyCallback)list_bearers_ready,
ctx); task);
g_object_unref (modem); g_object_unref (modem);
} }
static void static void
get_bearer_manager_ready (GDBusConnection *connection, get_bearer_manager_ready (GDBusConnection *connection,
GAsyncResult *res, GAsyncResult *res,
GetBearerContext *ctx) GTask *task)
{ {
GetBearerContext *ctx;
ctx = g_task_get_task_data (task);
ctx->manager = mmcli_get_manager_finish (res); ctx->manager = mmcli_get_manager_finish (res);
ctx->modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (ctx->manager)); ctx->modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (ctx->manager));
if (!ctx->modems) { if (!ctx->modems) {
@@ -466,7 +486,7 @@ get_bearer_manager_ready (GDBusConnection *connection,
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
look_for_bearer_in_modem (ctx); look_for_bearer_in_modem (task);
} }
static gchar * static gchar *
@@ -498,33 +518,32 @@ get_bearer_path (const gchar *path_or_index)
} }
void void
mmcli_get_bearer (GDBusConnection *connection, mmcli_get_bearer (GDBusConnection *connection,
const gchar *path_or_index, const gchar *path_or_index,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GTask *task;
GetBearerContext *ctx; GetBearerContext *ctx;
task = g_task_new (connection, cancellable, callback, user_data);
ctx = g_new0 (GetBearerContext, 1); ctx = g_new0 (GetBearerContext, 1);
ctx->bearer_path = get_bearer_path (path_or_index); ctx->bearer_path = get_bearer_path (path_or_index);
if (cancellable) g_task_set_task_data (task, ctx, (GDestroyNotify) get_bearer_context_free);
ctx->cancellable = g_object_ref (cancellable);
ctx->result = g_simple_async_result_new (G_OBJECT (connection),
callback,
user_data,
mmcli_get_bearer);
mmcli_get_manager (connection, mmcli_get_manager (connection,
cancellable, cancellable,
(GAsyncReadyCallback)get_bearer_manager_ready, (GAsyncReadyCallback)get_bearer_manager_ready,
ctx); task);
} }
MMBearer * MMBearer *
mmcli_get_bearer_sync (GDBusConnection *connection, mmcli_get_bearer_sync (GDBusConnection *connection,
const gchar *path_or_index, const gchar *path_or_index,
MMManager **o_manager, MMManager **o_manager,
MMObject **o_object) MMObject **o_object)
{ {
MMManager *manager; MMManager *manager;
GList *modems; GList *modems;

24
cli/mmcli-common.h
View File

@@ -44,18 +44,18 @@ MMObject *mmcli_get_modem_sync (GDBusConnection *connection,
const gchar *modem_str, const gchar *modem_str,
MMManager **o_manager); MMManager **o_manager);
void mmcli_get_bearer (GDBusConnection *connection, void mmcli_get_bearer (GDBusConnection *connection,
const gchar *path_or_index, const gchar *path_or_index,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
MMBearer *mmcli_get_bearer_finish (GAsyncResult *res, MMBearer *mmcli_get_bearer_finish (GAsyncResult *res,
MMManager **manager, MMManager **manager,
MMObject **object); MMObject **object);
MMBearer *mmcli_get_bearer_sync (GDBusConnection *connection, MMBearer *mmcli_get_bearer_sync (GDBusConnection *connection,
const gchar *path_or_index, const gchar *path_or_index,
MMManager **manager, MMManager **manager,
MMObject **object); MMObject **object);
void mmcli_get_sim (GDBusConnection *connection, void mmcli_get_sim (GDBusConnection *connection,
const gchar *path_or_index, const gchar *path_or_index,