From c9ae2ba88f6831d7a78c0fe05581303dcbb8a231 Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Tue, 5 Jul 2016 18:07:17 +0300
Subject: few more places to add wait_before_traffic argument

---
 src/main_dpdk.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'src/main_dpdk.cpp')

diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index eeacdbff..905899d4 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -4863,6 +4863,18 @@ int main_test(int argc , char * argv[]){
     return (0);
 }
 
+void wait_x_sec(int sec) {
+    int i;
+    printf(" wait %d sec ", sec);
+    fflush(stdout);
+    for (i=0; i<sec; i++) {
+        delay(1000);
+        printf(".");
+        fflush(stdout);
+    }
+    printf("\n");
+    fflush(stdout);
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////
@@ -4888,19 +4900,6 @@ CFlowStatParser *CTRexExtendedDriverBase::get_flow_stat_parser() {
     return parser;
 }
 
-void wait_x_sec(int sec) {
-    int i;
-    printf(" wait %d sec ", sec);
-    fflush(stdout);
-    for (i=0; i<sec; i++) {
-        delay(1000);
-        printf(".");
-        fflush(stdout);
-    }
-    printf("\n");
-    fflush(stdout);
-}
-
 // in 1G we need to wait if links became ready to soon
 void CTRexExtendedDriverBase1G::wait_after_link_up(){
     wait_x_sec(6 + CGlobalInfo::m_options.m_wait_before_traffic);
@@ -5289,7 +5288,7 @@ void CTRexExtendedDriverBase10G::get_extended_stats(CPhyEthIF * _if,CPhyEthIFSta
 }
 
 int CTRexExtendedDriverBase10G::wait_for_stable_link(){
-    delay(2000);
+    wait_x_sec(1 + CGlobalInfo::m_options.m_wait_before_traffic);
     return (0);
 }
 
@@ -5562,7 +5561,7 @@ void CTRexExtendedDriverBase40G::get_extended_stats(CPhyEthIF * _if,CPhyEthIFSta
 }
 
 int CTRexExtendedDriverBase40G::wait_for_stable_link(){
-    delay(2000);
+    wait_x_sec(1 + CGlobalInfo::m_options.m_wait_before_traffic);
     return (0);
 }
 
@@ -5636,7 +5635,7 @@ void CTRexExtendedDriverBase1GVm::get_extended_stats(CPhyEthIF * _if,CPhyEthIFSt
 }
 
 int CTRexExtendedDriverBase1GVm::wait_for_stable_link(){
-    delay(10);
+    wait_x_sec(9 + CGlobalInfo::m_options.m_wait_before_traffic);
     return (0);
 }
 
-- 
cgit 1.2.3-korg