eal/linux: fix build with glibc < 2.12

[dpdk.git] / examples / vhost / main.c

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 22d6a4b..9bfda6d 100644 (file)
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -61,27 +61,27 @@
 /*
  * Calculate the number of buffers needed per port
  */
-#define NUM_MBUFS_PER_PORT ((MAX_QUEUES*RTE_TEST_RX_DESC_DEFAULT) +            \
+#define NUM_MBUFS_PER_PORT ((MAX_QUEUES*RTE_TEST_RX_DESC_DEFAULT) +            \
                                                        (num_switching_cores*MAX_PKT_BURST) +                   \
                                                        (num_switching_cores*RTE_TEST_TX_DESC_DEFAULT) +\
                                                        (num_switching_cores*MBUF_CACHE_SIZE))
 
-#define MBUF_CACHE_SIZE 128
-#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
+#define MBUF_CACHE_SIZE        128
+#define MBUF_DATA_SIZE RTE_MBUF_DEFAULT_BUF_SIZE
 
 /*
  * No frame data buffer allocated from host are required for zero copy
  * implementation, guest will allocate the frame data buffer, and vhost
  * directly use it.
  */
-#define VIRTIO_DESCRIPTOR_LEN_ZCP 1518
-#define MBUF_DATA_SIZE_ZCP (VIRTIO_DESCRIPTOR_LEN_ZCP + RTE_PKTMBUF_HEADROOM)
+#define VIRTIO_DESCRIPTOR_LEN_ZCP      RTE_MBUF_DEFAULT_DATAROOM
+#define MBUF_DATA_SIZE_ZCP             RTE_MBUF_DEFAULT_BUF_SIZE
 #define MBUF_CACHE_SIZE_ZCP 0
 
-#define MAX_PKT_BURST 32               /* Max burst size for RX/TX */
-#define BURST_TX_DRAIN_US 100  /* TX drain every ~100us */
+#define MAX_PKT_BURST 32               /* Max burst size for RX/TX */
+#define BURST_TX_DRAIN_US 100  /* TX drain every ~100us */
 
-#define BURST_RX_WAIT_US 15    /* Defines how long we wait between retries on RX */
+#define BURST_RX_WAIT_US 15    /* Defines how long we wait between retries on RX */
 #define BURST_RX_RETRIES 4             /* Number of retries on RX. */
 
 #define JUMBO_FRAME_MAX_SIZE    0x2600
@@ -138,7 +138,7 @@
 /* Number of descriptors per cacheline. */
 #define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))
 
-#define MBUF_EXT_MEM(mb)   (RTE_MBUF_FROM_BADDR((mb)->buf_addr) != (mb))
+#define MBUF_EXT_MEM(mb)   (rte_mbuf_from_indirect(mb) != (mb))
 
 /* mask of enabled ports */
 static uint32_t enabled_port_mask = 0;
@@ -1105,7 +1105,7 @@ find_local_dest(struct virtio_net *dev, struct rte_mbuf *m,
                        "(%"PRIu64") TX: pkt to local VM device id:"
                        "(%"PRIu64") vlan tag: %d.\n",
                        dev->device_fh, dev_ll->vdev->dev->device_fh,
-                       vlan_tag);
+                       (int)*vlan_tag);
 
                        break;
                }
@@ -1433,7 +1433,7 @@ put_desc_to_used_list_zcp(struct vhost_virtqueue *vq, uint16_t desc_idx)
 
        /* Kick the guest if necessary. */
        if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-               eventfd_write((int)vq->callfd, 1);
+               eventfd_write(vq->callfd, (eventfd_t)1);
 }
 
 /*
@@ -1549,7 +1549,7 @@ attach_rxmbuf_zcp(struct virtio_net *dev)
 static inline void pktmbuf_detach_zcp(struct rte_mbuf *m)
 {
        const struct rte_mempool *mp = m->pool;
-       void *buf = RTE_MBUF_TO_BADDR(m);
+       void *buf = rte_mbuf_to_baddr(m);
        uint32_t buf_ofs;
        uint32_t buf_len = mp->elt_size - sizeof(*m);
        m->buf_physaddr = rte_mempool_virt2phy(mp, m) + sizeof(*m);
@@ -1626,7 +1626,7 @@ txmbuf_clean_zcp(struct virtio_net *dev, struct vpool *vpool)
 
        /* Kick guest if required. */
        if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-               eventfd_write((int)vq->callfd, 1);
+               eventfd_write(vq->callfd, (eventfd_t)1);
 
        return 0;
 }
@@ -1774,7 +1774,7 @@ virtio_dev_rx_zcp(struct virtio_net *dev, struct rte_mbuf **pkts,
 
        /* Kick the guest if necessary. */
        if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-               eventfd_write((int)vq->callfd, 1);
+               eventfd_write(vq->callfd, (eventfd_t)1);
 
        return count;
 }
@@ -2871,6 +2871,16 @@ setup_mempool_tbl(int socket, uint32_t index, char *pool_name,
        }
 }
 
+/* When we receive a INT signal, unregister vhost driver */
+static void
+sigint_handler(__rte_unused int signum)
+{
+       /* Unregister vhost driver. */
+       int ret = rte_vhost_driver_unregister((char *)&dev_basename);
+       if (ret != 0)
+               rte_exit(EXIT_FAILURE, "vhost driver unregister failure.\n");
+       exit(0);
+}
 
 /*
  * Main function, does initialisation and calls the per-lcore functions. The CUSE
@@ -2886,6 +2896,9 @@ main(int argc, char *argv[])
        uint8_t portid;
        uint16_t queue_id;
        static pthread_t tid;
+       char thread_name[RTE_MAX_THREAD_NAME_LEN];
+
+       signal(SIGINT, sigint_handler);
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -3006,8 +3019,19 @@ main(int argc, char *argv[])
        memset(&dev_statistics, 0, sizeof(dev_statistics));
 
        /* Enable stats if the user option is set. */
-       if (enable_stats)
-               pthread_create(&tid, NULL, (void*)print_stats, NULL );
+       if (enable_stats) {
+               ret = pthread_create(&tid, NULL, (void *)print_stats, NULL);
+               if (ret != 0)
+                       rte_exit(EXIT_FAILURE,
+                               "Cannot create print-stats thread\n");
+
+               /* Set thread_name for aid in debugging.  */
+               snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "print-stats");
+               ret = rte_thread_setname(tid, thread_name);
+               if (ret != 0)
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "Cannot set print-stats name\n");
+       }
 
        /* Launch all data cores. */
        if (zero_copy == 0) {
@@ -3051,10 +3075,10 @@ main(int argc, char *argv[])
        if (mergeable == 0)
                rte_vhost_feature_disable(1ULL << VIRTIO_NET_F_MRG_RXBUF);
 
-       /* Register CUSE device to handle IOCTLs. */
+       /* Register vhost(cuse or user) driver to handle vhost messages. */
        ret = rte_vhost_driver_register((char *)&dev_basename);
        if (ret != 0)
-               rte_exit(EXIT_FAILURE,"CUSE device setup failure.\n");
+               rte_exit(EXIT_FAILURE, "vhost driver register failure.\n");
 
        rte_vhost_driver_callback_register(&virtio_net_device_ops);
 
@@ -3063,4 +3087,3 @@ main(int argc, char *argv[])
        return 0;
 
 }
-