Merge lp:~mfisch/powerd/lp1195800 into lp:powerd

[Matt Fischer]

Cleanup upstart job by removing unneeded environment variables and have the job respawn if powerd dies unexpectedly. Simplify the sigterm handler, which also removes the duplicate calls to unown name which were causing warnings.
Finally, fix LP: #1195800 by simply exiting if we lose or never get our dbus name.

Cleanup upstart job by removing unneeded environment variables. Also have the
job respawn if powerd dies unexpectedly. Simplify the sigterm handler, which
also removes the duplicate calls to unown name which were causing warnings.
Finally, fix LP: #1195800 by simply exiting if we lose or never get our
dbus name. This will cause the 2nd instance of powerd to bail, the first
instance will be left alone.

[lp:~mfisch/powerd/lp1195800]

64. By Matt Fischer on 2013-07-10

Fixing some CR comments. Disable debugging by default.

[Seth Forshee (sforshee)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/powerd-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/37/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mfisch/powerd/lp1195800]

65. By Matt Fischer on 2013-07-10

Switching the logging to go to stderr when we lose the bus name and
have better exit codes now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/powerd-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/38/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/powerd-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/upstart'
--- debian/upstart	2013-06-10 20:02:23 +0000
+++ debian/upstart	2013-07-10 19:15:30 +0000
@@ -2,28 +2,9 @@
 
 start on started dbus
 
-script
-export HOSTNAME=android
-export SHELL=/system/bin/sh
-export TERM=vt100
-export ANDROID_CACHE=/cache
-export LOOP_MOUNTPOINT=/mnt/obb
-export ASEC_MOUNTPOINT=/mnt/asec
-export ANDROID_PROPERTY_WORKSPACE=8,49152
-export ANDROID_ASSETS=/system/app
-export ANDROID_BOOTLOGO=1
-export USER=phablet
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-export ANDROID_DATA=/data
-export QT_QPA_PLATFORM=hybris
-export SHLVL=1
-export MKSH=/system/bin/sh
-export ANDROID_ROOT=/system
-export EXTERNAL_STORAGE=/mnt/sdcard
-# for debugging purposes, remove when closer to shipping (mfisch)
-export POWERD_DEBUG=1
-
-
-        exec /usr/bin/powerd
-
-end script
+respawn
+
+#uncomment the line below to enable debugging
+#env POWERD_DEBUG=1
+
+exec /usr/bin/powerd

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-07-02 13:52:40 +0000
+++ src/powerd-internal.h	2013-07-10 19:15:30 +0000
@@ -57,7 +57,7 @@
     GSList *uuids;
 };
 
-void powerd_exit(void);
+void powerd_exit(int exit_code);
 void powerd_reset_activity_timer(int add);
 void powerd_dbus_init_complete(void);
 int powerd_is_mainloop(void);

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2013-07-01 21:28:26 +0000
+++ src/powerd-object.c	2013-07-10 19:15:30 +0000
@@ -20,6 +20,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <string.h>
+#include <stdio.h>
 #include "powerd-internal.h"
 #include "powerd-dbus.h"
 #include "log.h"
@@ -103,7 +104,7 @@
             error->message);
         g_error_free(error);
         error = NULL;
-        powerd_exit();
+        powerd_exit(-1);
     }
 
     g_signal_connect(G_OBJECT(powerd_source->priv->skel), "handle-request-sys-state",
@@ -138,8 +139,8 @@
                      const gchar     *name,
                      gpointer         user_data)
 {
-    powerd_warn("name lost (%s)", name);
-    //XXX - quit here
+    fprintf(stderr, "dbus name lost or unable to acquire dbus name, is another copy of powerd running?\n");
+    powerd_exit(-2);
 }
 
 void

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-07-02 13:52:40 +0000
+++ src/powerd.cpp	2013-07-10 19:15:30 +0000
@@ -98,6 +98,8 @@
 /* Assume screen starts off when powerd starts */
 int activity_timer_screen_state = SCREEN_STATE_OFF;
 
+static int g_exit_code = 0;
+
 /*
  * Display request for activity timer
  *
@@ -204,10 +206,7 @@
 sigterm_quit(int signal)
 {
     powerd_warn("SIGTERM recieved, cleaning up");
-    // XXX - strangely this call to unown name claims the id is invalid
-    // but I'm sure we're using it properly
-    g_bus_unown_name(name_id);
-    g_main_loop_quit(main_loop);
+    powerd_exit(0);
 }
 
 int update_screen_state_worker(gpointer data)
@@ -420,8 +419,9 @@
     return (g_thread_self() == powerd_mainloop_thread);
 }
 
-void powerd_exit(void)
+void powerd_exit(int exit_code)
 {
+    g_exit_code = exit_code;
     g_main_loop_quit(main_loop);
 }
 
@@ -511,5 +511,5 @@
     powerd_backlight_deinit();
     display_request_deinit();
     power_request_deinit();
-    return 0;
+    return g_exit_code;
 }