Changeset a984307 for lib/format_dpdk.c


Ignore:
Timestamp:
07/20/16 16:01:58 (5 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
000726a
Parents:
733c8b4 (diff), 2b0eae9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/develop' into libtrace4

Conflicts:

INSTALL
README
lib/format_dpdk.c
lib/trace.c
tools/tracesplit/tracesplit.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_dpdk.c

    rd8b05b7 ra984307  
    142142#else
    143143#       define DPDK_USE_LOG_LEVEL 0
     144#endif
     145
     146/* 1.8.0-rc2
     147 * rx/tx_conf thresholds can be set to NULL in rte_eth_rx/tx_queue_setup
     148 * this uses the default values, which are better tuned per device
     149 * See issue #26
     150 */
     151#if RTE_VERSION >= RTE_VERSION_NUM(1, 8, 0, 2)
     152#       define DPDK_USE_NULL_QUEUE_CONFIG 1
     153#else
     154#       define DPDK_USE_NULL_QUEUE_CONFIG 0
    144155#endif
    145156
     
    13421353                                     format_data->nb_tx_buf,
    13431354                                     SOCKET_ID_ANY,
    1344                                      &tx_conf);
     1355                                     DPDK_USE_NULL_QUEUE_CONFIG ? NULL : &tx_conf);
    13451356        if (ret < 0) {
    13461357                snprintf(err, errlen, "Intel DPDK - Cannot configure TX queue"
     
    13901401                                             format_data->nb_rx_buf,
    13911402                                             format_data->nic_numa_node,
    1392                                              &rx_conf,
     1403                                             DPDK_USE_NULL_QUEUE_CONFIG ? NULL: &rx_conf,
    13931404                                             stream->mempool);
    13941405                if (ret < 0) {
Note: See TracChangeset for help on using the changeset viewer.