소스 검색

* Don't burst non-connect_burstable queues when in connect burst mode

Bryan Drewery 16 년 전
부모
커밋
4b03984342
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      src/mod/server.mod/server.c

+ 1 - 1
src/mod/server.mod/server.c

@@ -287,7 +287,7 @@ void deq_msg()
   for(size_t nq = 0; nq < (sizeof(qdsc) / sizeof(qdsc[0])) - 1; ++nq) {
   for(size_t nq = 0; nq < (sizeof(qdsc) / sizeof(qdsc[0])) - 1; ++nq) {
     while (qdsc[nq].q->head &&
     while (qdsc[nq].q->head &&
         // If burstable queue and can burst, or not a burstable queue and not connect bursting
         // If burstable queue and can burst, or not a burstable queue and not connect bursting
-        ((qdsc[nq].burst && (burst < msgburst)) || (!qdsc[nq].burst && !connect_bursting)) &&
+        ((qdsc[nq].burst && (burst < msgburst && (!connect_bursting || (connect_bursting && qdsc[nq].connect_burst)))) || (!qdsc[nq].burst && !connect_bursting)) &&
         ((last_time.sec - now) < MAXPENALTY)) {
         ((last_time.sec - now) < MAXPENALTY)) {
 #ifdef not_implemented
 #ifdef not_implemented
       if (deq_kick(qdsc[nq].idx)) {
       if (deq_kick(qdsc[nq].idx)) {