log: introduce logtype register macro

[dpdk.git] / drivers / event / sw / sw_evdev.c

diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index a6bb913..98dae71 100644 (file)
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -38,12 +38,12 @@ sw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
 
                /* check for qid map overflow */
                if (q->cq_num_mapped_cqs >= RTE_DIM(q->cq_map)) {
-                       rte_errno = -EDQUOT;
+                       rte_errno = EDQUOT;
                        break;
                }
 
                if (p->is_directed && p->num_qids_mapped > 0) {
-                       rte_errno = -EDQUOT;
+                       rte_errno = EDQUOT;
                        break;
                }
 
@@ -59,12 +59,12 @@ sw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
                if (q->type == SW_SCHED_TYPE_DIRECT) {
                        /* check directed qids only map to one port */
                        if (p->num_qids_mapped > 0) {
-                               rte_errno = -EDQUOT;
+                               rte_errno = EDQUOT;
                                break;
                        }
                        /* check port only takes a directed flow */
                        if (num > 1) {
-                               rte_errno = -EDQUOT;
+                               rte_errno = EDQUOT;
                                break;
                        }
 
@@ -113,9 +113,21 @@ sw_port_unlink(struct rte_eventdev *dev, void *port, uint8_t queues[],
                        }
                }
        }
+
+       p->unlinks_in_progress += unlinked;
+       rte_smp_mb();
+
        return unlinked;
 }
 
+static int
+sw_port_unlinks_in_progress(struct rte_eventdev *dev, void *port)
+{
+       RTE_SET_USED(dev);
+       struct sw_port *p = port;
+       return p->unlinks_in_progress;
+}
+
 static int
 sw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
                const struct rte_event_port_conf *conf)
@@ -925,6 +937,7 @@ sw_probe(struct rte_vdev_device *vdev)
                        .port_release = sw_port_release,
                        .port_link = sw_port_link,
                        .port_unlink = sw_port_unlink,
+                       .port_unlinks_in_progress = sw_port_unlinks_in_progress,
 
                        .eth_rx_adapter_caps_get = sw_eth_rx_adapter_caps_get,
 
@@ -1070,13 +1083,4 @@ static struct rte_vdev_driver evdev_sw_pmd_drv = {
 RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_SW_PMD, evdev_sw_pmd_drv);
 RTE_PMD_REGISTER_PARAM_STRING(event_sw, NUMA_NODE_ARG "=<int> "
                SCHED_QUANTA_ARG "=<int>" CREDIT_QUANTA_ARG "=<int>");
-
-/* declared extern in header, for access from other .c files */
-int eventdev_sw_log_level;
-
-RTE_INIT(evdev_sw_init_log)
-{
-       eventdev_sw_log_level = rte_log_register("pmd.event.sw");
-       if (eventdev_sw_log_level >= 0)
-               rte_log_set_level(eventdev_sw_log_level, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(eventdev_sw_log_level, pmd.event.sw, NOTICE);