Attachment #2647 for bug #2534

View | Details | Raw Unified | Return to bug 2534
Collapse All | Expand All




      if (st.unforcedDrop > st.forcedDrop)
        {
          std::cout << "Drops due to prob mark should be less than the drops due to hard mark" << std::endl;
          exit (1);
        }

      if (st.qLimDrop == 0)
        {
          std::cout << "There should be some drops due to queue full" << std::endl;
          exit (1);
        }
    }
  else if (aredTest == 6 || aredTest == 7 || aredTest == 8 || aredTest == 9 || aredTest == 10 || aredTest == 14 || aredTest ==15)

      if (st.unforcedDrop > st.forcedDrop)
        {
          std::cout << "Drops due to prob mark should be less than the drops due to hard mark" << std::endl;
          exit (1);
        }

      if (st.qLimDrop != 0)
        {
          std::cout << "There should be zero drops due to queue full" << std::endl;
          exit (1);
        }
    }
  else if (aredTest == 12)

      if (st.unforcedDrop < st.forcedDrop)
        {
          std::cout << "Drops due to prob mark should be more than the drops due to hard mark" << std::endl;
          exit (1);
        }

      if (st.qLimDrop != 0)
        {
          std::cout << "There should be zero drops due to queue full" << std::endl;
          exit (1);
        }
    }


(-)a/src/traffic-control/examples/pie-example.cc (-1 / +1 lines)

Lines 309-315	Link Here

309

  if (st.forcedDrop != 0)

309

  if (st.forcedDrop != 0)

310

311

      std::cout << "There should be no drops due to queue full." << std::endl;

311

      std::cout << "There should be no drops due to queue full." << std::endl;

312

      exit (-1);

312

      exit (1);

313

314

315

  if (flowMonitor)

315

  if (flowMonitor)




      if (st.unforcedDrop > st.forcedDrop)
        {
          std::cout << "Drops due to prob mark should be less than the drops due to hard mark" << std::endl;
          exit (1);
        }

      if (st.qLimDrop != 0)
        {
          std::cout << "There should be zero drops due to queue full" << std::endl;
          exit (1);
        }
    }
  else if (queueDiscType == "ARED")

      if (st.unforcedDrop < st.forcedDrop)
        {
          std::cout << "Drops due to prob mark should be more than the drops due to hard mark" << std::endl;
          exit (1);
        }

      if (st.qLimDrop != 0)
        {
          std::cout << "There should be zero drops due to queue full" << std::endl;
          exit (1);
        }
    }


Return to bug 2534