dev

helper/refill/policy/chctl.php

@@ -138,36 +138,33 @@ class chctl
             $lproity = $l->priority();
             $rproity = $r->priority();
 
-            if($lproity > $rproity) return 1;
-            elseif($lproity < $rproity) return -1;
-            else return 0;
+//            if($lproity > $rproity) return 1;
+//            elseif($lproity < $rproity) return -1;
+//            else return 0;
+
 
+            $lover = $l->speed_overload() ? 1 : 0;
+            $rover = $r->speed_overload() ? 1 : 0;
 
-//            $lover = $l->speed_overload() ? 1 : 0;
-//            $rover = $r->speed_overload() ? 1 : 0;
-//
-//            if($lover == $rover)
-//            {
+            if($lover == $rover)
+            {
+                return $lproity > $rproity ? -1 : 1; //如果都过载保优先级高的
 //                if($lover) {
-//                    return $lproity > $rproity ? -1 : 1; //如果都过载保优先级高的
+//                    return $lproity < $rproity ? -1 : 1; //如果都过载保优先级高的
 //                }
 //                else {
 //                    return $lproity < $rproity ? -1 : 1;
 //                }
-//            }
-//            else {
-//                return $lover < $rover ? -1 : 1;
-//            }
+            }
+            else {
+                return $lover < $rover ? -1 : 1;
+            }
         };
 
         Log::record("match usort 1",Log::DEBUG);
         usort($usable_items, $ascending);
         Log::record("match usort 2",Log::DEBUG);
 
-        if(is_null($usable_items)) {
-            Log::record("match usable_items is null.",Log::DEBUG);
-        }
-
         $result = [];
         foreach ($usable_items as $item) {
             if(is_null($item)) {