Merge lp:~bregma/grail/lp-1475888 into lp:grail

[Stephen M. Webb]

timeout: stored uint64_t instead of converting back and forth to float

Used a uint64_t for transient storage of timeouts instead of floats to eliminate all the back-and-forth conversions.

Fixes lp:1475888 and deb:753646

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/grail-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-i386-ci/2

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

review: Approve (continuous-integration)

=== modified file 'm4/xorg-gtest.m4'
--- m4/xorg-gtest.m4	2012-12-06 15:49:37 +0000
+++ m4/xorg-gtest.m4	2016-01-25 18:38:26 +0000
@@ -1,4 +1,4 @@
-# serial 3
+# serial 9
 
 # Copyright (C) 2012 Canonical, Ltd.
 #
@@ -32,16 +32,17 @@
 # Both default actions are no-ops.
 AC_DEFUN([CHECK_XORG_GTEST],
 [
-  AC_REQUIRE([CHECK_GTEST])
-
   PKG_CHECK_EXISTS([xorg-gtest],
                    [have_xorg_gtest=yes],
                    [have_xorg_gtest=no])
 
   XORG_GTEST_SOURCE=`$PKG_CONFIG --variable=sourcedir --print-errors xorg-gtest`
+  GTEST_SOURCE="$XORG_GTEST_SOURCE/src/gtest"
+  GTEST_CPPFLAGS="-I$XORG_GTEST_SOURCE/src/gtest/include -I$XORG_GTEST_SOURCE/src/gtest"
   XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest`
   XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS"
   XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE"
+  XORG_GTEST_LDFLAGS="-lpthread -lX11 -lXi"
 
   PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])
 
@@ -63,12 +64,12 @@
   AS_IF([test "x$have_xorg_gtest_evemu" = xyes],
         [XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -DHAVE_EVEMU"])
 
-  AS_IF([test "x$have_gtest" != xyes -o "x$have_x11" != xyes],
-        [have_xorg_gtest=no])
-
   AS_IF([test "x$have_xorg_gtest" = xyes],
+        [AC_SUBST(GTEST_SOURCE)]
+        [AC_SUBST(GTEST_CPPFLAGS)]
         [AC_SUBST(XORG_GTEST_SOURCE)]
         [AC_SUBST(XORG_GTEST_CPPFLAGS)]
+        [AC_SUBST(XORG_GTEST_LDFLAGS)]
 
         # Get BASE_CXXFLAGS and STRICT_CXXFLAGS
         [XORG_MACROS_VERSION(1.17)]

=== modified file 'src/subscription.cpp'
--- src/subscription.cpp	2012-06-21 20:30:14 +0000
+++ src/subscription.cpp	2016-01-25 18:38:26 +0000
@@ -104,10 +104,7 @@
     }
 
     case UGSubscriptionPropertyDragTimeout: {
-      uint64_t timeout = *reinterpret_cast<const uint64_t*>(value);
-      if (timeout < 0)
-        return UGStatusErrorInvalidValue;
-      drag_.timeout = timeout;
+      drag_.timeout = *reinterpret_cast<const uint64_t*>(value);
       return UGStatusSuccess;
     }
 
@@ -120,10 +117,7 @@
     }
 
     case UGSubscriptionPropertyPinchTimeout: {
-      uint64_t timeout = *reinterpret_cast<const uint64_t*>(value);
-      if (timeout < 0)
-        return UGStatusErrorInvalidValue;
-      pinch_.timeout = timeout;
+      pinch_.timeout = *reinterpret_cast<const uint64_t*>(value);
       return UGStatusSuccess;
     }
 
@@ -136,10 +130,7 @@
     }
 
     case UGSubscriptionPropertyRotateTimeout: {
-      uint64_t timeout = *reinterpret_cast<const uint64_t*>(value);
-      if (timeout < 0)
-        return UGStatusErrorInvalidValue;
-      rotate_.timeout = timeout;
+      rotate_.timeout = *reinterpret_cast<const uint64_t*>(value);
       return UGStatusSuccess;
     }
 
@@ -152,10 +143,7 @@
     }
 
     case UGSubscriptionPropertyTapTimeout: {
-      uint64_t timeout = *reinterpret_cast<const uint64_t*>(value);
-      if (timeout < 0)
-        return UGStatusErrorInvalidValue;
-      tap_.timeout = timeout;
+      tap_.timeout = *reinterpret_cast<const uint64_t*>(value);
       return UGStatusSuccess;
     }
 

=== modified file 'src/subscription.h'
--- src/subscription.h	2012-11-21 13:20:10 +0000
+++ src/subscription.h	2016-01-25 18:38:26 +0000
@@ -2,7 +2,7 @@
  *
  * grail - Multitouch Gesture Recognition Library
  *
- * Copyright (C) 2011-2012 Canonical Ltd.
+ * Copyright (C) 2011-2012,2016 Canonical Ltd.
  *
  * This library is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU Lesser General Public License version 3
@@ -33,7 +33,7 @@
  public:
 
   struct Limit {
-    float timeout;
+    uint64_t timeout;
     float threshold;
   };
 

=== modified file 'test/gtest/Makefile.am'
--- test/gtest/Makefile.am	2012-07-03 22:20:38 +0000
+++ test/gtest/Makefile.am	2016-01-25 18:38:26 +0000
@@ -3,8 +3,8 @@
 endif
 
 nodist_libgtest_grail_a_SOURCES = \
-	$(GTEST_SOURCE)/src/gtest-all.cc \
-	$(GTEST_SOURCE)/src/gtest_main.cc
+	$(GTEST_SOURCE)/gtest-all.cc \
+	$(GTEST_SOURCE)/gtest_main.cc
 
 libgtest_grail_a_CPPFLAGS = \
 	$(GTEST_CPPFLAGS)

=== modified file 'test/integration/x11/timeout.cpp'
--- test/integration/x11/timeout.cpp	2012-12-04 11:32:11 +0000
+++ test/integration/x11/timeout.cpp	2016-01-25 18:38:26 +0000
@@ -54,7 +54,7 @@
 
 /* Manually specify the drag timeout in case the default changes in the
  * future. */
-const uint64_t DRAG_TIMEOUT = 300;
+const uint64_t DRAG_TIMEOUT = 0;
 
 } // namespace