Merge lp:~rsalveti/powerd/powerd-better_log into lp:powerd

[Ricardo Salveti]

Better log for powerd when suspending, to make debug easier.

Better log for 1. show suspend module used, 2. use libsuspend function name as call it to make debug easier.

[Ricardo Salveti (rsalveti)]

Looks good, thanks.

Just creating a new bzr branch because you don't need to change debian/changelog, that is done by our CI engine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/powerd-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/159/rebuild

review: Approve (continuous-integration)

=== modified file 'libsuspend/autosleep.c'
--- libsuspend/autosleep.c	2013-05-23 14:45:14 +0000
+++ libsuspend/autosleep.c	2014-08-18 15:14:31 +0000
@@ -21,6 +21,7 @@
 #include "common.h"
 #include "sysfs.h"
 
+static const char autosleep_name[] = "autosleep";
 static const char autosleep_path[] = "/sys/power/autosleep";
 static const char wakelock_path[] = "/sys/power/wake_lock";
 static const char wakeunlock_path[] = "/sys/power/wake_unlock";
@@ -52,6 +53,7 @@
 }
 
 static const struct suspend_handler autosleep_handler = {
+    .name = autosleep_name,
     .enter = autosleep_enter,
     .exit = autosleep_exit,
     .acquire_wake_lock = autosleep_acquire_wake_lock,

=== modified file 'libsuspend/common.h'
--- libsuspend/common.h	2013-05-23 14:45:14 +0000
+++ libsuspend/common.h	2014-08-18 15:14:31 +0000
@@ -22,6 +22,7 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 struct suspend_handler {
+    const char *name;
     int (*prepare)(void);
     int (*enter)(void);
     int (*exit)(void);

=== modified file 'libsuspend/earlysuspend.c'
--- libsuspend/earlysuspend.c	2014-01-06 16:12:54 +0000
+++ libsuspend/earlysuspend.c	2014-08-18 15:14:31 +0000
@@ -46,6 +46,7 @@
 static pthread_cond_t fb_state_cond = PTHREAD_COND_INITIALIZER;
 static int wait_for_fb = 0;
 
+static const char earlysuspend_name[] = "earlysuspend";
 static const char state_path[] = "/sys/power/state";
 static const char wakelock_path[] = "/sys/power/wake_lock";
 static const char wakeunlock_path[] = "/sys/power/wake_unlock";
@@ -147,6 +148,7 @@
 }
 
 static const struct suspend_handler earlysuspend_handler = {
+    .name = earlysuspend_name,
     .enter = earlysuspend_enter,
     .exit = earlysuspend_exit,
     .acquire_wake_lock = earlysuspend_acquire_wake_lock,

=== modified file 'libsuspend/legacy.c'
--- libsuspend/legacy.c	2013-05-15 14:14:35 +0000
+++ libsuspend/legacy.c	2014-08-18 15:14:31 +0000
@@ -21,6 +21,7 @@
 #include "common.h"
 #include "sysfs.h"
 
+static const char legacy_name[] = "legacy";
 static const char state_path[] = "/sys/power/state";
 static const char wakelock_path[] = "/sys/power/wake_lock";
 static const char wakeup_count_path[] = "/sys/power/wakeup_count";
@@ -67,6 +68,7 @@
 }
 
 static const struct suspend_handler legacy_handler = {
+    .name = legacy_name,
     .prepare = legacy_prepare,
     .enter = legacy_enter,
 };

=== modified file 'libsuspend/libsuspend.c'
--- libsuspend/libsuspend.c	2013-05-23 14:45:14 +0000
+++ libsuspend/libsuspend.c	2014-08-18 15:14:31 +0000
@@ -44,6 +44,14 @@
     handler = mocksuspend_detect();
 }
 
+const char *libsuspend_getname(void)
+{
+    if (!handler)
+        return "not-initialized yet";
+
+    return handler->name;
+}
+
 int libsuspend_prepare_suspend(void)
 {
     if (!handler)

=== modified file 'libsuspend/libsuspend.h'
--- libsuspend/libsuspend.h	2013-05-23 14:45:14 +0000
+++ libsuspend/libsuspend.h	2014-08-18 15:14:31 +0000
@@ -24,6 +24,7 @@
 #endif
 
 void libsuspend_init(int force_mock);
+const char *libsuspend_getname(void);
 int libsuspend_prepare_suspend(void);
 int libsuspend_enter_suspend(void);
 int libsuspend_exit_suspend(void);

=== modified file 'libsuspend/mocksuspend.c'
--- libsuspend/mocksuspend.c	2013-05-23 14:45:14 +0000
+++ libsuspend/mocksuspend.c	2014-08-18 15:14:31 +0000
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include "common.h"
 
+static const char mocksuspend_name[] = "mocksuspend";
+
 static int mocksuspend_prepare(void)
 {
     printf("mocksuspend prepare\n");
@@ -50,6 +52,7 @@
 }
 
 static const struct suspend_handler mocksuspend_handler = {
+    .name = mocksuspend_name,
     .prepare = mocksuspend_prepare,
     .enter = mocksuspend_enter,
     .exit = mocksuspend_exit,

=== modified file 'src/backlight.c'
--- src/backlight.c	2014-05-13 22:05:20 +0000
+++ src/backlight.c	2014-08-18 15:14:31 +0000
@@ -90,8 +90,13 @@
                         (scaled_brightness << 8) | scaled_brightness);
 
     ret = light_dev->set_light(light_dev, &state);
-    if (!ret)
+    if (!ret) {
+        powerd_debug("light_dev: set_light to brightness %i succ", brightness);
         current_brightness = brightness;
+    } else {
+        powerd_debug("light_dev: set_light to brightness %i failed", brightness);
+    }
+
     return ret;
 }
 

=== modified file 'src/power-request.c'
--- src/power-request.c	2014-05-13 22:05:20 +0000
+++ src/power-request.c	2014-08-18 15:14:31 +0000
@@ -120,7 +120,7 @@
     int ret;
 
     if (g_atomic_int_add(&suspend_block_count, 1) == 0) {
-        powerd_debug("Blocking suspend");
+        powerd_debug("libsuspend: acquire_wake_lock: %s", power_request_wakelock_name);
         ret = libsuspend_acquire_wake_lock(power_request_wakelock_name);
         if (ret)
             powerd_warn("Could not acquire wake lock");
@@ -142,7 +142,7 @@
         retry = !g_atomic_int_compare_and_exchange(&suspend_block_count,
                                                    old_count, old_count - 1);
         if (!retry && old_count == 1) {
-            powerd_debug("Unblocking suspend");
+            powerd_debug("libsuspend: release_wake_lock: %s", power_request_wakelock_name);
             ret = libsuspend_release_wake_lock(power_request_wakelock_name);
             if (ret)
                 powerd_warn("Could not release wake lock");
@@ -361,6 +361,7 @@
 
 static int enter_suspend(void)
 {
+    powerd_debug("libsuspend: enter_suspend.");
     int ret = libsuspend_enter_suspend();
     if (!ret)
         suspend_active = TRUE;
@@ -369,6 +370,7 @@
 
 static int exit_suspend(void)
 {
+    powerd_debug("libsuspend: exit_suspend.");
     int ret = libsuspend_exit_suspend();
     if (!ret) {
         suspend_active = FALSE;
@@ -431,7 +433,7 @@
 
     /* Must call libsuspend_prepare_suspend() _before_ emitting signal */
     if (pending_system_state == POWERD_SYS_STATE_SUSPEND) {
-        powerd_debug("preparing for suspend");
+        powerd_debug("libsuspend: prepare_suspend.");
         ret = libsuspend_prepare_suspend();
         if (ret)
             powerd_warn("Failed to prepare for suspend: %d", ret);

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-07-02 16:24:51 +0000
+++ src/powerd.cpp	2014-08-18 15:14:31 +0000
@@ -568,6 +568,7 @@
     device_config_init();
 
     libsuspend_init(0);
+    powerd_info("libsuspend: detect module: %s.", libsuspend_getname());
     powerd_stats_init();
     powerd_client_init();
     power_request_init();