Merge lp:~ricmm/usensord/vibrate-no-sleep into lp:usensord

[Ricardo Mendoza]

Take a powerd state while theres an active vibration request, also give a grace period after vibration ended before suspending, so as to not peg the hardware actuator if the cpu goes offline before the end timer has expired.

[lp:~ricmm/usensord/vibrate-no-sleep]

25. By Ricardo Mendoza on 2015-04-17

Fix indentation

26. By Ricardo Mendoza on 2015-04-17

Reduce timeout to 1.5s

27. By Ricardo Mendoza on 2015-04-17

Make sure cookie is not null before attempting to clear

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/usensord-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/1

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

review: Approve (continuous-integration)

[lp:~ricmm/usensord/vibrate-no-sleep]

28. By Ricardo Mendoza on 2015-04-17

Dont stack locks

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/usensord-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/2

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

review: Approve (continuous-integration)

[lp:~ricmm/usensord/vibrate-no-sleep]

29. By Ricardo Mendoza on 2015-04-17

Only remove the old lock after the new one has been taken, to prevent a few ticks of lock-less processing where we could suspend

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/usensord-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/3

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Comments inline

review: Needs Information

[lp:~ricmm/usensord/vibrate-no-sleep]

30. By Ricardo Mendoza on 2015-04-22

Use global timer instead and keep a mutex-protected single cookie instance

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/usensord-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/4

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Some minor comments made to ricmm in irc, but otherwise this LGTM.

review: Approve

[lp:~ricmm/usensord/vibrate-no-sleep]

31. By Ricardo Mendoza on 2015-04-22

Move into individual vibration block

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/usensord-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/5

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

review: Approve (continuous-integration)

[lp:~ricmm/usensord/vibrate-no-sleep]

32. By Ricardo Mendoza on 2015-04-22

Reduce mutex scope and make sure lock also takes into consideration the sleep time

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/usensord-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/usensord-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/usensord-vivid-i386-ci/6

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looking good, working as expected.

review: Approve

=== modified file 'haptic/haptic.go'
--- haptic/haptic.go	2014-06-27 19:31:59 +0000
+++ haptic/haptic.go	2015-04-22 23:10:57 +0000
@@ -33,8 +33,13 @@
 
 var (
 	conn   *dbus.Connection
+	sysbus *dbus.Connection
 	logger *log.Logger
 	wg     sync.WaitGroup
+	powerd *dbus.ObjectProxy
+	mutex  *sync.Mutex
+	cookie string
+	timer  *time.Timer
 )
 
 const (
@@ -118,6 +123,29 @@
 			x := true
 			for _, t := range duration {
 				if x {
+					mutex.Lock();
+					if (cookie == "") {
+						reply, err := powerd.Call("com.canonical.powerd", "requestSysState", "usensord", int32(1))
+						if err != nil {
+							logger.Println("Cannot request Powerd system power state: ", err)
+						} else {
+							if err := reply.Args(&cookie); err == nil {
+								logger.Println("Suspend blocker cookie: ", cookie)
+								timer = time.NewTimer(time.Duration(t + 1500) * time.Millisecond)
+								go func() {
+									<-timer.C
+									logger.Println("Clearing suspend blocker")
+									if cookie != "" {
+										powerd.Call("com.canonical.powerd", "clearSysState", string(cookie))
+										cookie = ""
+									}
+								}()
+							}
+						}
+					} else {
+						timer.Reset(time.Duration(t + 1500) * time.Millisecond)
+					}
+					mutex.Unlock()
 					if _, err := fi.WriteString(fmt.Sprintf("%d", t)); err != nil {
 						logger.Println(err)
 					}
@@ -129,6 +157,7 @@
 			}
 		}
 	}()
+
 	return nil
 }
 
@@ -141,9 +170,17 @@
 		return err
 	}
 
+	if sysbus, err = dbus.Connect(dbus.SystemBus); err != nil {
+		logger.Fatal("Connection error:", err)
+		return err
+	}
+
 	name := conn.RequestName("com.canonical.usensord", dbus.NameFlagDoNotQueue)
 	logger.Printf("Successfully registered %s on the bus", name.Name)
 
+	powerd = sysbus.Object("com.canonical.powerd", "/com/canonical/powerd")
+	mutex = &sync.Mutex{}
+
 	ch := make(chan *dbus.Message)
 	go watchDBusMethodCalls(ch)
 	conn.RegisterObjectPath("/com/canonical/usensord/haptic", ch)