eal: add channel for multi-process communication

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal.c

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 7239243..ba1811a 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2018 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *
@@ -48,6 +48,7 @@
 #include <sys/mman.h>
 #include <sys/queue.h>
 
+#include <rte_compat.h>
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_memory.h>
@@ -114,7 +115,7 @@ int rte_cycles_vmware_tsc_map;
 const char *
 rte_eal_mbuf_default_mempool_ops(void)
 {
-       return internal_config.mbuf_pool_ops_name;
+       return internal_config.user_mbuf_pool_ops_name;
 }
 
 /* Return a pointer to the configuration structure */
@@ -397,7 +398,7 @@ eal_parse_args(int argc, char **argv)
 
                switch (opt) {
                case OPT_MBUF_POOL_OPS_NAME_NUM:
-                       internal_config.mbuf_pool_ops_name = optarg;
+                       internal_config.user_mbuf_pool_ops_name = optarg;
                        break;
                case 'h':
                        eal_usage(prgname);
@@ -603,6 +604,14 @@ rte_eal_init(int argc, char **argv)
 
        rte_config_init();
 
+       if (rte_mp_channel_init() < 0) {
+               rte_eal_init_alert("failed to init mp channel\n");
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       rte_errno = EFAULT;
+                       return -1;
+               }
+       }
+
        if (rte_eal_memory_init() < 0) {
                rte_eal_init_alert("Cannot init memory\n");
                rte_errno = ENOMEM;
@@ -709,6 +718,13 @@ rte_eal_init(int argc, char **argv)
        return fctret;
 }
 
+int __rte_experimental
+rte_eal_cleanup(void)
+{
+       rte_service_finalize();
+       return 0;
+}
+
 /* get core role */
 enum rte_lcore_role_t
 rte_eal_lcore_role(unsigned lcore_id)
@@ -748,6 +764,7 @@ int rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd
 int rte_vfio_enable(const char *modname);
 int rte_vfio_is_enabled(const char *modname);
 int rte_vfio_noiommu_is_enabled(void);
+int rte_vfio_clear_group(int vfio_group_fd);
 
 int rte_vfio_setup_device(__rte_unused const char *sysfs_base,
                      __rte_unused const char *dev_addr,
@@ -779,7 +796,7 @@ int rte_vfio_noiommu_is_enabled(void)
        return 0;
 }
 
-int rte_vfio_clear_group(int vfio_group_fd)
+int rte_vfio_clear_group(__rte_unused int vfio_group_fd)
 {
        return 0;
 }