git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples: do not probe pci twice
[dpdk.git]
/
examples
/
multi_process
/
symmetric_mp
/
main.c
diff --git
a/examples/multi_process/symmetric_mp/main.c
b/examples/multi_process/symmetric_mp/main.c
index
12fa28d
..
504a27a
100644
(file)
--- a/
examples/multi_process/symmetric_mp/main.c
+++ b/
examples/multi_process/symmetric_mp/main.c
@@
-1,13
+1,13
@@
/*-
* BSD LICENSE
/*-
* BSD LICENSE
- *
+ *
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
@@
-17,7
+17,7
@@
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@
-251,7
+251,7
@@
smp_port_init(uint8_t port, struct rte_mempool *mbuf_pool, uint16_t num_queues)
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf = ETH_RSS_IP
V4 | ETH_RSS_IPV6
,
+ .rss_hf = ETH_RSS_IP,
},
},
.txmode = {
},
},
.txmode = {
@@
-347,10
+347,10
@@
lcore_main(void *arg __rte_unused)
/* build up message in msgbuf before printing to decrease likelihood
* of multi-core message interleaving.
*/
/* build up message in msgbuf before printing to decrease likelihood
* of multi-core message interleaving.
*/
- msgbufpos +=
rte_
snprintf(msgbuf, sizeof(msgbuf) - msgbufpos,
+ msgbufpos += snprintf(msgbuf, sizeof(msgbuf) - msgbufpos,
"Lcore %u using ports ", id);
for (p = start_port; p < end_port; p++){
"Lcore %u using ports ", id);
for (p = start_port; p < end_port; p++){
- msgbufpos +=
rte_
snprintf(msgbuf + msgbufpos, sizeof(msgbuf) - msgbufpos,
+ msgbufpos += snprintf(msgbuf + msgbufpos, sizeof(msgbuf) - msgbufpos,
"%u ", (unsigned)ports[p]);
}
printf("%s\n", msgbuf);
"%u ", (unsigned)ports[p]);
}
printf("%s\n", msgbuf);
@@
-461,18
+461,14
@@
main(int argc, char **argv)
argc -= ret;
argv += ret;
argc -= ret;
argv += ret;
- /* probe to determine the NIC devices available */
- proc_type = rte_eal_process_type();
- if (rte_pmd_init_all() < 0)
- rte_exit(EXIT_FAILURE, "Cannot init pmd\n");
- if (rte_eal_pci_probe() < 0)
- rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
+ /* determine the NIC devices available */
if (rte_eth_dev_count() == 0)
rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
/* parse application arguments (those after the EAL ones) */
smp_parse_args(argc, argv);
if (rte_eth_dev_count() == 0)
rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
/* parse application arguments (those after the EAL ones) */
smp_parse_args(argc, argv);
+ proc_type = rte_eal_process_type();
mp = (proc_type == RTE_PROC_SECONDARY) ?
rte_mempool_lookup(_SMP_MBUF_POOL) :
rte_mempool_create(_SMP_MBUF_POOL, NB_MBUFS, MBUF_SIZE,
mp = (proc_type == RTE_PROC_SECONDARY) ?
rte_mempool_lookup(_SMP_MBUF_POOL) :
rte_mempool_create(_SMP_MBUF_POOL, NB_MBUFS, MBUF_SIZE,