| commit | 8e5818dc65b8e3c6362d0bfc1c01bff0c06c694a | [log] [tgz] |
|---|---|---|
| author | Carmelo Cascone <carmelo@opennetworking.org> | Fri Oct 26 11:45:23 2018 -0700 |
| committer | Carmelo Cascone <carmelo@opennetworking.org> | Fri Oct 26 19:42:11 2018 +0000 |
| tree | 76d2070d0304278beb31a3614a0f45c18f092dbe | |
| parent | b7a595855caf40415f8c6f4065da2990e35c3a62 [diff] |
In fabric.p4 do not parse int_data if sink is not enabled Change-Id: Ie4d5b9ccdf31ea1142945365fca7db7b8d4ae3f9
diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4 index 46fa022..df29408 100644 --- a/pipelines/fabric/src/main/resources/include/header.p4 +++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -209,7 +209,9 @@ int_egress_tstamp_t int_egress_tstamp; int_q_congestion_t int_q_congestion; int_egress_port_tx_util_t int_egress_tx_util; +#ifdef WITH_INT_SINK int_data_t int_data; +#endif // WITH_INT_SINK intl4_tail_t intl4_tail; #endif //WITH_INT }
diff --git a/pipelines/fabric/src/main/resources/include/int/int_header.p4 b/pipelines/fabric/src/main/resources/include/int/int_header.p4 index 4e352ee..9b1f0e4 100644 --- a/pipelines/fabric/src/main/resources/include/int/int_header.p4 +++ b/pipelines/fabric/src/main/resources/include/int/int_header.p4
@@ -62,11 +62,13 @@ bit<6> dscp; } +#ifdef WITH_INT_SINK header int_data_t { // Maximum int metadata stack size in bits: // (0xFF -4) * 32 (excluding INT shim header, tail header and INT header) varbit<8032> data; } +#endif // WITH_INT_SINK #ifdef WITH_INT_TRANSIT // INT meta-value headers - 4 bytes each
diff --git a/pipelines/fabric/src/main/resources/include/parser.p4 b/pipelines/fabric/src/main/resources/include/parser.p4 index 3f77df9..6aef63b 100644 --- a/pipelines/fabric/src/main/resources/include/parser.p4 +++ b/pipelines/fabric/src/main/resources/include/parser.p4
@@ -263,7 +263,9 @@ packet.emit(hdr.int_q_congestion); packet.emit(hdr.int_egress_tx_util); #endif // WITH_INT_TRANSIT +#ifdef WITH_INT_SINK packet.emit(hdr.int_data); +#endif // WITH_INT_SINK packet.emit(hdr.intl4_tail); #endif // WITH_INT }