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

base-sim: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-03-29 19:37:09 +02:00
parent 7e5af3b38d
commit ae38106ad2
1 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/mm-base-sim.c
View File

@@ -30,14 +30,15 @@
#include "mm-base-sim.h" #include "mm-base-sim.h"
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
#include "mm-base-modem.h" #include "mm-base-modem.h"
#include "mm-log.h" #include "mm-log-object.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
static void async_initable_iface_init (GAsyncInitableIface *iface); static void async_initable_iface_init (GAsyncInitableIface *iface);
static void log_object_iface_init (MMLogObjectInterface *iface);
G_DEFINE_TYPE_EXTENDED (MMBaseSim, mm_base_sim, MM_GDBUS_TYPE_SIM_SKELETON, 0, G_DEFINE_TYPE_EXTENDED (MMBaseSim, mm_base_sim, MM_GDBUS_TYPE_SIM_SKELETON, 0,
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
async_initable_iface_init)) G_IMPLEMENT_INTERFACE (MM_TYPE_LOG_OBJECT, log_object_iface_init))
enum { enum {
PROP_0, PROP_0,
@@ -913,9 +914,7 @@ sim_dbus_export (MMBaseSim *self)
self->priv->connection, self->priv->connection,
self->priv->path, self->priv->path,
&error)) { &error)) {
mm_warn ("couldn't export SIM at '%s': '%s'", mm_obj_warn (self, "couldn't export SIM: %s", error->message);
self->priv->path,
error->message);
g_error_free (error); g_error_free (error);
} }
} }
@@ -1032,7 +1031,7 @@ load_emergency_numbers_finish (MMBaseSim *self,
return NULL; return NULL;
for (i = 0; emergency_numbers[i]; i++) for (i = 0; emergency_numbers[i]; i++)
mm_dbg ("loaded emergency number: %s", emergency_numbers[i]); mm_obj_dbg (self, "loaded emergency number: %s", emergency_numbers[i]);
return emergency_numbers; return emergency_numbers;
} }
@@ -1044,7 +1043,7 @@ load_emergency_numbers (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("loading emergency numbers..."); mm_obj_dbg (self, "loading emergency numbers...");
/* READ BINARY of EF_ECC (Emergency Call Codes) ETSI TS 51.011 section 10.3.27 */ /* READ BINARY of EF_ECC (Emergency Call Codes) ETSI TS 51.011 section 10.3.27 */
mm_base_modem_at_command ( mm_base_modem_at_command (
@@ -1110,7 +1109,7 @@ load_sim_identifier_finish (MMBaseSim *self,
if (!sim_identifier) if (!sim_identifier)
return NULL; return NULL;
mm_dbg ("loaded SIM identifier: %s", sim_identifier); mm_obj_dbg (self, "loaded SIM identifier: %s", sim_identifier);
return sim_identifier; return sim_identifier;
} }
@@ -1121,7 +1120,7 @@ load_sim_identifier (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("loading SIM identifier..."); mm_obj_dbg (self, "loading SIM identifier...");
/* READ BINARY of EFiccid (ICC Identification) ETSI TS 102.221 section 13.2 */ /* READ BINARY of EFiccid (ICC Identification) ETSI TS 102.221 section 13.2 */
mm_base_modem_at_command ( mm_base_modem_at_command (
@@ -1178,7 +1177,7 @@ load_imsi_finish (MMBaseSim *self,
if (!imsi) if (!imsi)
return NULL; return NULL;
mm_dbg ("loaded IMSI: %s", imsi); mm_obj_dbg (self, "loaded IMSI: %s", imsi);
return imsi; return imsi;
} }
@@ -1189,7 +1188,7 @@ load_imsi (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("loading IMSI..."); mm_obj_dbg (self, "loading IMSI...");
mm_base_modem_at_command ( mm_base_modem_at_command (
self->priv->modem, self->priv->modem,
@@ -1307,7 +1306,7 @@ load_operator_identifier (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("loading Operator ID..."); mm_obj_dbg (self, "loading operator ID...");
/* READ BINARY of EFad (Administrative Data) ETSI 51.011 section 10.3.18 */ /* READ BINARY of EFad (Administrative Data) ETSI 51.011 section 10.3.18 */
mm_base_modem_at_command ( mm_base_modem_at_command (
@@ -1402,7 +1401,7 @@ load_operator_name (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("loading Operator Name..."); mm_obj_dbg (self, "loading operator name...");
/* READ BINARY of EFspn (Service Provider Name) ETSI 51.011 section 10.3.11 */ /* READ BINARY of EFspn (Service Provider Name) ETSI 51.011 section 10.3.11 */
mm_base_modem_at_command ( mm_base_modem_at_command (
@@ -1486,8 +1485,7 @@ init_load_sim_identifier_ready (MMBaseSim *self,
return; return;
} }
mm_warn ("couldn't load SIM identifier: '%s'", mm_obj_warn (self, "couldn't load SIM identifier: %s", error ? error->message : "unknown error");
error ? error->message : "unknown error");
g_clear_error (&error); g_clear_error (&error);
} }
@@ -1510,7 +1508,7 @@ init_load_emergency_numbers_ready (MMBaseSim *self,
str_list = MM_BASE_SIM_GET_CLASS (self)->load_emergency_numbers_finish (self, res, &error); str_list = MM_BASE_SIM_GET_CLASS (self)->load_emergency_numbers_finish (self, res, &error);
if (error) { if (error) {
mm_warn ("couldn't load list of Emergency Numbers: '%s'", error->message); mm_obj_warn (self, "couldn't load list of emergency numbers: %s", error->message);
g_error_free (error); g_error_free (error);
} }
@@ -1541,7 +1539,7 @@ init_load_emergency_numbers_ready (MMBaseSim *self,
g_free (val); \ g_free (val); \
\ \
if (error) { \ if (error) { \
mm_warn ("couldn't load %s: '%s'", DISPLAY, error->message); \ mm_obj_warn (self, "couldn't load %s: %s", DISPLAY, error->message); \
g_error_free (error); \ g_error_free (error); \
} \ } \
\ \
@@ -1552,8 +1550,8 @@ init_load_emergency_numbers_ready (MMBaseSim *self,
} }
STR_REPLY_READY_FN (imsi, "IMSI") STR_REPLY_READY_FN (imsi, "IMSI")
STR_REPLY_READY_FN (operator_identifier, "Operator identifier") STR_REPLY_READY_FN (operator_identifier, "operator identifier")
STR_REPLY_READY_FN (operator_name, "Operator name") STR_REPLY_READY_FN (operator_name, "operator name")
static void static void
interface_initialization_step (GTask *task) interface_initialization_step (GTask *task)
@@ -1740,6 +1738,19 @@ mm_base_sim_initialize (MMBaseSim *self,
user_data); user_data);
} }
/*****************************************************************************/
static gchar *
log_object_build_id (MMLogObject *_self)
{
MMBaseSim *self;
self = MM_BASE_SIM (_self);
return g_strdup_printf ("sim%u", self->priv->dbus_id);
}
/*****************************************************************************/
static void static void
set_property (GObject *object, set_property (GObject *object,
guint prop_id, guint prop_id,
@@ -1772,6 +1783,8 @@ set_property (GObject *object,
g_clear_object (&self->priv->modem); g_clear_object (&self->priv->modem);
self->priv->modem = g_value_dup_object (value); self->priv->modem = g_value_dup_object (value);
if (self->priv->modem) { if (self->priv->modem) {
/* Set owner ID */
mm_log_object_set_owner_id (MM_LOG_OBJECT (self), mm_log_object_get_id (MM_LOG_OBJECT (self->priv->modem)));
/* Bind the modem's connection (which is set when it is exported, /* Bind the modem's connection (which is set when it is exported,
* and unset when unexported) to the SIM's connection */ * and unset when unexported) to the SIM's connection */
g_object_bind_property (self->priv->modem, MM_BASE_MODEM_CONNECTION, g_object_bind_property (self->priv->modem, MM_BASE_MODEM_CONNECTION,
@@ -1855,6 +1868,12 @@ async_initable_iface_init (GAsyncInitableIface *iface)
iface->init_finish = initable_init_finish; iface->init_finish = initable_init_finish;
} }
static void
log_object_iface_init (MMLogObjectInterface *iface)
{
iface->build_id = log_object_build_id;
}
static void static void
mm_base_sim_class_init (MMBaseSimClass *klass) mm_base_sim_class_init (MMBaseSimClass *klass)
{ {