diff options
| author |   Hanoh Haim <hhaim@cisco.com> | 2015-09-09 16:08:01 +0300 |
|---|---|---|
| committer | Hanoh Haim <hhaim@cisco.com> | 2015-09-09 16:08:01 +0300 |
| commit | e3d08af5784e13c223d93efd6447764a21789ccb (patch) | |
| tree | 592b8f2c502d1baaa50098f9e4d0b8ffe349f060 | |
| parent | 6c3eb52907ce7d4a4ec36ce65d5871caed0c763d (diff) | |
| parent | 2e5fdf7cc07549de848ef3396c9301c7a317f966 (diff) | |
Merge branch 'master' of https://github.com/wofanli/trex-core into wen
| -rw-r--r-- | scripts/cap2/per_template_gen2.yaml | 8 | ||||
| -rwxr-xr-x | src/bp_sim.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/cap2/per_template_gen2.yaml b/scripts/cap2/per_template_gen2.yaml index 269e4958..3349087c 100644 --- a/scripts/cap2/per_template_gen2.yaml +++ b/scripts/cap2/per_template_gen2.yaml @@ -13,8 +13,8 @@ generator_clients : - name : "c1" distribution : "seq" - ip_start : "26.0.0.1" - ip_end : "26.0.1.255" + ip_start : "16.0.0.1" + ip_end : "16.0.1.255" - name : "c2" distribution : "seq" ip_start : "36.0.0.1" @@ -22,8 +22,8 @@ generator_servers : - name : "s1" distribution : "seq" - ip_start : "28.0.0.1" - ip_end : "28.0.1.255" + ip_start : "48.0.0.1" + ip_end : "48.0.1.255" track_ports : false - name : "s2" distribution : "seq" diff --git a/src/bp_sim.h b/src/bp_sim.h index 804c936a..29b9a724 100755 --- a/src/bp_sim.h +++ b/src/bp_sim.h @@ -1376,17 +1376,17 @@ public: //private: + CTupleGeneratorSmart *m_tuple_gen; // cache line 1 - 64bytes waste of space ! uint32_t m_nat_external_ipv4; /* client */ uint32_t m_nat_external_ipv4_server; uint16_t m_nat_external_port; - uint16_t m_nat_pad; + uint16_t m_nat_pad[3]; mac_addr_align_t m_src_mac; - CTupleGeneratorSmart *m_tuple_gen; uint32_t m_src_idx; uint32_t m_dest_idx; - uint32_t m_end_of_cache_line[10]; + uint32_t m_end_of_cache_line[6]; public: bool operator <(const CGenNode * rsh ) const { @@ -1592,7 +1592,7 @@ public: #if __x86_64__ /* size of 64 bytes */ - #define DEFER_CLIENTS_NUM (18) + #define DEFER_CLIENTS_NUM (16) #else #define DEFER_CLIENTS_NUM (16) #endif |