base-sms: port to use object logging

1 files changed, 46 insertions, 27 deletions

diff --git a/src/mm-base-sms.c b/src/mm-base-sms.c
index be0f2045..e907637a 100644
--- a/src/mm-base-sms.c
+++ b/src/mm-base-sms.c
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or modify
@@ -34,10 +33,13 @@
 #include "mm-sms-part-3gpp.h"
 #include "mm-base-modem-at.h"
 #include "mm-base-modem.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
 #include "mm-modem-helpers.h"
 
-G_DEFINE_TYPE (MMBaseSms, mm_base_sms, MM_GDBUS_TYPE_SMS_SKELETON)
+static void log_object_iface_init (MMLogObjectInterface *iface);
+
+G_DEFINE_TYPE_EXTENDED (MMBaseSms, mm_base_sms, MM_GDBUS_TYPE_SMS_SKELETON, 0,
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_LOG_OBJECT, log_object_iface_init))
 
 enum {
     PROP_0,
@@ -176,14 +178,14 @@ generate_3gpp_submit_pdus (MMBaseSms *self,
             if (!split_text[i])
                 break;
             part_text = split_text[i];
-            mm_dbg ("  Processing chunk '%u' of text with '%u' bytes",
-                    i, (guint) strlen (part_text));
+            mm_obj_dbg (self, "  processing chunk '%u' of text with '%u' bytes",
+                        i, (guint) strlen (part_text));
         } else if (split_data) {
             if (!split_data[i])
                 break;
             part_data = split_data[i];
-            mm_dbg ("  Processing chunk '%u' of data with '%u' bytes",
-                    i, part_data->len);
+            mm_obj_dbg (self, "  processing chunk '%u' of data with '%u' bytes",
+                        i, part_data->len);
 
         } else
             g_assert_not_reached ();
@@ -203,11 +205,9 @@ generate_3gpp_submit_pdus (MMBaseSms *self,
             mm_sms_part_set_concat_reference (part, 0); /* We don't set a concat reference here */
             mm_sms_part_set_concat_sequence (part, i + 1);
             mm_sms_part_set_concat_max (part, n_parts);
-
-            mm_dbg ("Created SMS part '%u' for multipart SMS ('%u' parts expected)",
-                    i + 1, n_parts);
+            mm_obj_dbg (self, "created SMS part '%u' for multipart SMS ('%u' parts expected)", i + 1, n_parts);
         } else {
-            mm_dbg ("Created SMS part for singlepart SMS");
+            mm_obj_dbg (self, "created SMS part for singlepart SMS");
         }
 
         /* Add to the list of parts */
@@ -273,14 +273,14 @@ generate_cdma_submit_pdus (MMBaseSms *self,
 
     /* If creating a CDMA SMS part but we don't have a Teleservice ID, we default to WMT */
     if (mm_gdbus_sms_get_teleservice_id (MM_GDBUS_SMS (self)) == MM_SMS_CDMA_TELESERVICE_ID_UNKNOWN) {
-        mm_dbg ("Defaulting to WMT teleservice ID when creating SMS part");
+        mm_obj_dbg (self, "defaulting to WMT teleservice ID when creating SMS part");
         mm_sms_part_set_cdma_teleservice_id (part, MM_SMS_CDMA_TELESERVICE_ID_WMT);
     } else
         mm_sms_part_set_cdma_teleservice_id (part, mm_gdbus_sms_get_teleservice_id (MM_GDBUS_SMS (self)));
 
     mm_sms_part_set_cdma_service_category (part, mm_gdbus_sms_get_service_category (MM_GDBUS_SMS (self)));
 
-    mm_dbg ("Created SMS part for CDMA SMS");
+    mm_obj_dbg (self, "created SMS part for CDMA SMS");
 
     /* Add to the list of parts */
     self->priv->parts = g_list_append (self->priv->parts, part);
@@ -691,9 +691,7 @@ sms_dbus_export (MMBaseSms *self)
                                            self->priv->connection,
                                            self->priv->path,
                                            &error)) {
-        mm_warn ("couldn't export SMS at '%s': '%s'",
-                 self->priv->path,
-                 error->message);
+        mm_obj_warn (self, "couldn't export SMS: %s", error->message);
         g_error_free (error);
     }
 }
@@ -1154,12 +1152,14 @@ send_from_storage_ready (MMBaseModem *modem,
                          GAsyncResult *res,
                          GTask *task)
 {
+    MMBaseSms *self;
     SmsSendContext *ctx;
     GError *error = NULL;
     const gchar *response;
     gint message_reference;
 
-    ctx = g_task_get_task_data (task);
+    self = g_task_get_source_object (task);
+    ctx  = g_task_get_task_data (task);
 
     response = mm_base_modem_at_command_finish (modem, res, &error);
     if (error) {
@@ -1169,8 +1169,7 @@ send_from_storage_ready (MMBaseModem *modem,
             return;
         }
 
-        mm_dbg ("Couldn't send SMS from storage: '%s'; trying generic send...",
-                error->message);
+        mm_obj_dbg (self, "couldn't send SMS from storage: %s; trying generic send...", error->message);
         g_error_free (error);
 
         ctx->from_storage = FALSE;
@@ -1346,17 +1345,19 @@ delete_part_ready (MMBaseModem *modem,
                    GAsyncResult *res,
                    GTask *task)
 {
+    MMBaseSms *self;
     SmsDeletePartsContext *ctx;
     GError *error = NULL;
 
+    self = g_task_get_source_object (task);
     ctx = g_task_get_task_data (task);
 
     mm_base_modem_at_command_finish (modem, res, &error);
     if (error) {
         ctx->n_failed++;
-        mm_dbg ("Couldn't delete SMS part with index %u: '%s'",
-                mm_sms_part_get_index ((MMSmsPart *)ctx->current->data),
-                error->message);
+        mm_obj_dbg (self, "couldn't delete SMS part with index %u: %s",
+                    mm_sms_part_get_index ((MMSmsPart *)ctx->current->data),
+                    error->message);
         g_error_free (error);
     }
 
@@ -1448,7 +1449,7 @@ sms_delete (MMBaseSms *self,
     g_task_set_task_data (task, ctx, (GDestroyNotify)sms_delete_parts_context_free);
 
     if (mm_base_sms_get_storage (self) == MM_SMS_STORAGE_UNKNOWN) {
-        mm_dbg ("Not removing parts from non-stored SMS");
+        mm_obj_dbg (self, "not removing parts from non-stored SMS");
         g_task_return_boolean (task, TRUE);
         g_object_unref (task);
         return;
@@ -1570,12 +1571,12 @@ assemble_sms (MMBaseSms  *self,
             idx = mm_sms_part_get_concat_sequence ((MMSmsPart *)l->data);
 
             if (idx < 1 || idx > self->priv->max_parts) {
-                mm_warn ("Invalid part index (%u) found, ignoring", idx);
+                mm_obj_warn (self, "invalid part index (%u) found, ignoring", idx);
                 continue;
             }
 
             if (sorted_parts[idx - 1]) {
-                mm_warn ("Duplicate part index (%u) found, ignoring", idx);
+                mm_obj_warn (self, "duplicate part index (%u) found, ignoring", idx);
                 continue;
             }
 
@@ -1724,8 +1725,7 @@ mm_base_sms_multipart_take_part (MMBaseSms *self,
         if (!assemble_sms (self, &inner_error)) {
             /* We DO NOT propagate the error. The part was properly taken
              * so ownership passed to the MMBaseSms object. */
-            mm_warn ("Couldn't assemble SMS: '%s'",
-                     inner_error->message);
+            mm_obj_warn (self, "couldn't assemble SMS: %s", inner_error->message);
             g_error_free (inner_error);
         } else {
             /* Completed AND assembled
@@ -1899,6 +1899,17 @@ mm_base_sms_new_from_properties (MMBaseModem      *modem,
 
 /*****************************************************************************/
 
+static gchar *
+log_object_build_id (MMLogObject *_self)
+{
+    MMBaseSms *self;
+
+    self = MM_BASE_SMS (_self);
+    return g_strdup_printf ("sms%u", self->priv->dbus_id);
+}
+
+/*****************************************************************************/
+
 static void
 set_property (GObject *object,
               guint prop_id,
@@ -1932,6 +1943,8 @@ set_property (GObject *object,
         g_clear_object (&self->priv->modem);
         self->priv->modem = g_value_dup_object (value);
         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,
              * and unset when unexported) to the SMS's connection */
             g_object_bind_property (self->priv->modem, MM_BASE_MODEM_CONNECTION,
@@ -2030,6 +2043,12 @@ dispose (GObject *object)
 }
 
 static void
+log_object_iface_init (MMLogObjectInterface *iface)
+{
+    iface->build_id = log_object_build_id;
+}
+
+static void
 mm_base_sms_class_init (MMBaseSmsClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);