commit e6076e6104fc13ac559b5fd914ba2b82e4ca27a7
author Peng Xu <pengxu@google.com> Mon Apr 10 14:43:40 2017 -0700
committer Iliyan Malchev <malchev@google.com> Wed Apr 12 19:42:40 2017 -0700
tree c6bc7ee4940520e128661864427a181a40aa94cd
parent 6c1c0e4b7a826a003e748eb18c0bf5917c3609a9

Use scheduleservice to request SCHED_FIFO priority

Due to restriction of treble, hal binary cannot switch to SCHED_FIFO
priority by itself. It has to be done via scheduleservice.

Add a property flag to disable sched_fifo for evaluation.

Test: test with systrace, thread prio is as desired

04-12 19:33:44.939   730   730 I nanohub : Try activate sched-fifo priority for HubConnection thread
04-12 19:33:52.379   730   901 I nanohub : Enabled sched fifo thread mode (prio 3

b/30105910 Unexplained 2-4ms MTP VR latency on Sailfish and Marlin

Change-Id: Idc7c6758b4d344f9522e16c9c58cac1961372132

sensorhal/Android.mk

diff --git a/sensorhal/Android.mk b/sensorhal/Android.mk
index 586ae1c..e410ed1 100644
--- a/sensorhal/Android.mk
+++ b/sensorhal/Android.mk
@@ -156,12 +156,15 @@
     libhubutilcommon
 
 LOCAL_SHARED_LIBRARIES := \
+    android.frameworks.schedulerservice@1.0 \
     libcutils \
     libhardware \
+    libhardware_legacy \
+    libhidlbase \
+    libhidltransport \
     liblog \
     libstagefright_foundation \
-    libhardware_legacy \
-    libutils
+    libutils \
 
 include $(BUILD_SHARED_LIBRARY)
 

sensorhal/hubconnection.cpp

diff --git a/sensorhal/hubconnection.cpp b/sensorhal/hubconnection.cpp
index 67c1433..0db52c0 100644
--- a/sensorhal/hubconnection.cpp
+++ b/sensorhal/hubconnection.cpp
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "nanohub"
+
 #include "hubconnection.h"
 
-#define LOG_TAG "nanohub"
-#include <utils/Log.h>
-#include <utils/SystemClock.h>
+// TODO: remove the includes that introduce LIKELY and UNLIKELY (firmware/os/inc/toolchain.h)
+#undef LIKELY
+#undef UNLIKELY
 
 #include "file.h"
 #include "JSONObject.h"
@@ -33,10 +35,13 @@
 #include <linux/input.h>
 #include <linux/uinput.h>
 
+#include <android/frameworks/schedulerservice/1.0/ISchedulingPolicyService.h>
 #include <cutils/ashmem.h>
 #include <cutils/properties.h>
 #include <hardware_legacy/power.h>
 #include <media/stagefright/foundation/ADebug.h>
+#include <utils/Log.h>
+#include <utils/SystemClock.h>
 
 #include <algorithm>
 #include <cmath>
@@ -66,8 +71,6 @@
 
 #define OS_LOG_EVENT            0x474F4C41  // ascii: ALOG
 
-#define HUBCONNECTION_SCHED_FIFO_PRIORITY 10
-
 #ifdef LID_STATE_REPORTING_ENABLED
 const char LID_STATE_PROPERTY[] = "sensors.contexthub.lid_state";
 const char LID_STATE_UNKNOWN[]  = "unknown";
@@ -82,6 +85,10 @@
 // flip this system property on to use newly defined data structure for sending sensor configuration
 const char USE_NEW_CFG_PROPERTY[] = "sensor.hubconnection.new_cfg";
 
+// TODO(b/35219747): retain sched_fifo before eval is done to avoid
+// performance regression.
+const char SCHED_FIFO_PRIOIRTY[] = "sensor.hubconnection.sched_fifo";
+
 namespace android {
 
 // static
@@ -263,15 +270,35 @@
 void HubConnection::onFirstRef()
 {
     run("HubConnection", PRIORITY_URGENT_DISPLAY);
-    enableSchedFifoMode();
+    if (property_get_bool(SCHED_FIFO_PRIOIRTY, true)) {
+        ALOGI("Try activate sched-fifo priority for HubConnection thread");
+        mEnableSchedFifoThread = std::thread(enableSchedFifoMode, this);
+    }
 }
 
 // Set main thread to SCHED_FIFO to lower sensor event latency when system is under load
-void HubConnection::enableSchedFifoMode() {
-    struct sched_param param = {0};
-    param.sched_priority = HUBCONNECTION_SCHED_FIFO_PRIORITY;
-    if (sched_setscheduler(getTid(), SCHED_FIFO | SCHED_RESET_ON_FORK, &param) != 0) {
-        ALOGE("Couldn't set SCHED_FIFO for HubConnection thread");
+void HubConnection::enableSchedFifoMode(sp<HubConnection> hub) {
+    using ::android::frameworks::schedulerservice::V1_0::ISchedulingPolicyService;
+    using ::android::hardware::Return;
+
+    // SchedulingPolicyService will not start until system server start.
+    // Thus, cannot block on this.
+    sp<ISchedulingPolicyService> scheduler = ISchedulingPolicyService::getService();
+
+    if (scheduler == nullptr) {
+        ALOGE("Couldn't get scheduler scheduler to set SCHED_FIFO.");
+    } else {
+        Return<int32_t> max = scheduler->getMaxAllowedPriority();
+        if (!max.isOk()) {
+            ALOGE("Failed to retrieve maximum allowed priority for HubConnection.");
+            return;
+        }
+        Return<bool> ret = scheduler->requestPriority(::getpid(), hub->getTid(), max);
+        if (!ret.isOk() || !ret) {
+            ALOGE("Failed to set SCHED_FIFO for HubConnection.");
+        } else {
+            ALOGI("Enabled sched fifo thread mode (prio %d)", static_cast<int32_t>(max));
+        }
     }
 }
 

sensorhal/hubconnection.h

diff --git a/sensorhal/hubconnection.h b/sensorhal/hubconnection.h
index bc49782..8e6bda6 100644
--- a/sensorhal/hubconnection.h
+++ b/sensorhal/hubconnection.h
@@ -34,6 +34,7 @@
 #include "hubdefs.h"
 #include "ring.h"
 
+#include <thread>
 #include <unordered_map>
 
 #define WAKELOCK_NAME "sensorHal"
@@ -266,7 +267,8 @@
     void sendCalibrationOffsets();
 
     // Enable SCHED_FIFO priority for main thread
-    void enableSchedFifoMode();
+    std::thread mEnableSchedFifoThread;
+    static void enableSchedFifoMode(sp<HubConnection> hub);
 
 #ifdef LID_STATE_REPORTING_ENABLED
     int mUinputFd;