commit a94ee49440718e45147b6b6c26b44dd81d11e1c9
author Matthew Xie <mattx@google.com> Tue Jan 28 20:27:06 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 28 20:27:06 2014 +0000
tree 8e7dd4feca31179d5b36ede32fcc581c3c66f9ee
parent 32d2c03471edb78df635a05bb5bbdc27e9f0e4e1
parent bcfbc24314a79e40e1036cdea62f42b612981b1c

Merge "Fix calls to pthread_setschedparam."

gki/ulinux/gki_ulinux.c

diff --git a/gki/ulinux/gki_ulinux.c b/gki/ulinux/gki_ulinux.c
index 57ff7bb..e414864 100755
--- a/gki/ulinux/gki_ulinux.c
+++ b/gki/ulinux/gki_ulinux.c
@@ -311,8 +311,10 @@
          {
              /* check if define in gki_int.h is correct for this compile environment! */
              policy = GKI_LINUX_BASE_POLICY;
-#if (GKI_LINUX_BASE_POLICY!=GKI_SCHED_NORMAL)
+#if (GKI_LINUX_BASE_POLICY != GKI_SCHED_NORMAL)
              param.sched_priority = GKI_LINUX_BASE_PRIORITY - task_id - 2;
+#else
+             param.sched_priority = 0;
 #endif
          }
          pthread_setschedparam(gki_cb.os.thread_id[task_id], policy, &param);

hci/src/bt_hci_bdroid.c

diff --git a/hci/src/bt_hci_bdroid.c b/hci/src/bt_hci_bdroid.c
index 8e4f8ff..25ad194 100644
--- a/hci/src/bt_hci_bdroid.c
+++ b/hci/src/bt_hci_bdroid.c
@@ -237,8 +237,10 @@
     if(pthread_getschedparam(hc_cb.worker_thread, &policy, &param)==0)
     {
         policy = BTHC_LINUX_BASE_POLICY;
-#if (BTHC_LINUX_BASE_POLICY!=SCHED_NORMAL)
+#if (BTHC_LINUX_BASE_POLICY != SCHED_NORMAL)
         param.sched_priority = BTHC_MAIN_THREAD_PRIORITY;
+#else
+        param.sched_priority = 0;
 #endif
         result = pthread_setschedparam(hc_cb.worker_thread, policy, &param);
         if (result != 0)

hci/src/userial.c

diff --git a/hci/src/userial.c b/hci/src/userial.c
index 8e5bf6c..426810f 100644
--- a/hci/src/userial.c
+++ b/hci/src/userial.c
@@ -401,8 +401,10 @@
     if(pthread_getschedparam(userial_cb.read_thread, &policy, &param)==0)
     {
         policy = BTHC_LINUX_BASE_POLICY;
-#if (BTHC_LINUX_BASE_POLICY!=SCHED_NORMAL)
+#if (BTHC_LINUX_BASE_POLICY != SCHED_NORMAL)
         param.sched_priority = BTHC_USERIAL_READ_THREAD_PRIORITY;
+#else
+        param.sched_priority = 0;
 #endif
         result = pthread_setschedparam(userial_cb.read_thread, policy, &param);
         if (result != 0)

hci/src/userial_mct.c

diff --git a/hci/src/userial_mct.c b/hci/src/userial_mct.c
index 3c59384..d7554cc 100644
--- a/hci/src/userial_mct.c
+++ b/hci/src/userial_mct.c
@@ -321,10 +321,12 @@
     if(pthread_getschedparam(userial_cb.read_thread, &policy, &param)==0)
     {
         policy = BTHC_LINUX_BASE_POLICY;
-#if (BTHC_LINUX_BASE_POLICY!=SCHED_NORMAL)
+#if (BTHC_LINUX_BASE_POLICY != SCHED_NORMAL)
         param.sched_priority = BTHC_USERIAL_READ_THREAD_PRIORITY;
+#else
+        param.sched_priority = 0;
 #endif
-        result=pthread_setschedparam(userial_cb.read_thread,policy,&param);
+        result = pthread_setschedparam(userial_cb.read_thread, policy, &param);
         if (result != 0)
         {
             ALOGW("userial_open: pthread_setschedparam failed (%s)", \