1 files changed, 43 insertions, 33 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 989757cdcc5c..250808e934a6 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -45,8 +45,9 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
 
 
         /* check for NULL tasks */
-        if (!first || !second)
+        if (!first || !second) {
                 return first && !second;
+        }
 
 #ifdef CONFIG_LITMUS_LOCKING
         /* Check for EFFECTIVE priorities. Change task
@@ -73,59 +74,68 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second)
                 /* first_task is boosted, how about second_task? */
                 if (!is_priority_boosted(second_task) ||
                     lt_before(get_boost_start(first_task),
-                              get_boost_start(second_task)))
+                                          get_boost_start(second_task))) {
                         return 1;
-                else
+                }
+                else {
                         return 0;
-        } else if (unlikely(is_priority_boosted(second_task)))
+                }
+        }
+        else if (unlikely(is_priority_boosted(second_task))) {
                 /* second_task is boosted, first is not*/
                 return 0;
+        }
 
 #endif
 
 //      // rate-monotonic for testing
-//      return !is_realtime(second_task)  ||
-//
-//      /* is the deadline of the first task earlier?
-//       * Then it has higher priority.
-//       */
-//      shorter_period(first_task, second_task) ||
-//
-//      /* Do we have a deadline tie?
-//       * Then break by PID.
-//       */
-//      (get_period(first_task) == get_period(second_task) &&
-//       (first_task->pid < second_task->pid ||
-//
-//        /* If the PIDs are the same then the task with the EFFECTIVE
-//         * priority wins.
-//         */
-//        (first_task->pid == second_task->pid &&
-//         !second->rt_param.inh_task)));
-
-        if (!is_realtime(second_task))
+//      if (!is_realtime(second_task)) {
+//              return true;
+//      }
+//      
+//      if (shorter_period(first_task, second_task)) {
+//              return true;
+//      }
+//      
+//      if (get_period(first_task) == get_period(second_task)) {
+//              if (first_task->pid < second_task->pid) {   
+//                      return true;
+//              }
+//              else if (first_task->pid == second_task->pid) {
+//                      return !second->rt_param.inh_task;
+//              }
+//      }
+
+        if (!is_realtime(second_task)) {
                 return true;
+        }
 
-        if (earlier_deadline(first_task, second_task))
+        if (earlier_deadline(first_task, second_task)) {
                 return true;
-
+        }
         if (get_deadline(first_task) == get_deadline(second_task)) {
+                
                 if (shorter_period(first_task, second_task)) {
                         return true;
                 }
                 if (get_rt_period(first_task) == get_rt_period(second_task)) {
-#ifdef CONFIG_LITMUS_SOFTIRQD
-                        if (first_task->rt_param.is_proxy_thread <
-                                                        second_task->rt_param.is_proxy_thread) {
-                                return true;
-                        }
-#endif      
                         if (first_task->pid < second_task->pid) {   
                                 return true;
                         }
                         if (first_task->pid == second_task->pid) {
+#ifdef CONFIG_LITMUS_SOFTIRQD
+                                if (first_task->rt_param.is_proxy_thread <
+                                        second_task->rt_param.is_proxy_thread) {
+                                        return true;
+                                }
+                                if(first_task->rt_param.is_proxy_thread == second_task->rt_param.is_proxy_thread) {
+                                        return !second->rt_param.inh_task;
+                                }
+#else 
                                 return !second->rt_param.inh_task;
-                        }
+#endif
+                        }                       
+    
                 }
         }