X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-monitor.c;h=7c84e4b3a42c8d594b8a838d8bdd277f55bcb661;hb=8ba0a5227f6e6b50838c157bd303c2d5bf6f4e59;hp=f67f0363a2b9a50da22c12b2df4776eac17b96b0;hpb=60d02c72941d5a4aeea85090f120a0cc03e945f2;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c index f67f0363a..7c84e4b3a 100644 --- a/ofproto/ofproto-dpif-monitor.c +++ b/ofproto/ofproto-dpif-monitor.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ struct mport { }; /* hmap that contains "struct mport"s. */ -static struct hmap monitor_hmap; +static struct hmap monitor_hmap = HMAP_INITIALIZER(&monitor_hmap); /* heap for ordering mport based on bfd/cfm wakeup time. */ static struct heap monitor_heap; @@ -64,26 +64,25 @@ static pthread_t monitor_tid; static bool monitor_running; static struct latch monitor_exit_latch; -static struct ovs_rwlock monitor_rwlock = OVS_RWLOCK_INITIALIZER; +static struct ovs_mutex monitor_mutex = OVS_MUTEX_INITIALIZER; -static void monitor_init(void); static void *monitor_main(void *); static void monitor_run(void); static void mport_register(const struct ofport_dpif *, struct bfd *, struct cfm *, uint8_t[ETH_ADDR_LEN]) - OVS_REQ_WRLOCK(monitor_rwlock); + OVS_REQUIRES(monitor_mutex); static void mport_unregister(const struct ofport_dpif *) - OVS_REQ_WRLOCK(monitor_rwlock); + OVS_REQUIRES(monitor_mutex); static void mport_update(struct mport *, struct bfd *, struct cfm *, - uint8_t[ETH_ADDR_LEN]) OVS_REQ_WRLOCK(monitor_rwlock); + uint8_t[ETH_ADDR_LEN]) OVS_REQUIRES(monitor_mutex); static struct mport *mport_find(const struct ofport_dpif *) - OVS_REQ_WRLOCK(monitor_rwlock); + OVS_REQUIRES(monitor_mutex); /* Tries finding and returning the 'mport' from the monitor_hmap. * If there is no such 'mport', returns NULL. */ static struct mport * -mport_find(const struct ofport_dpif *ofport) OVS_REQ_WRLOCK(monitor_rwlock) +mport_find(const struct ofport_dpif *ofport) OVS_REQUIRES(monitor_mutex) { struct mport *node; @@ -101,7 +100,7 @@ mport_find(const struct ofport_dpif *ofport) OVS_REQ_WRLOCK(monitor_rwlock) static void mport_register(const struct ofport_dpif *ofport, struct bfd *bfd, struct cfm *cfm, uint8_t *hw_addr) - OVS_REQ_WRLOCK(monitor_rwlock) + OVS_REQUIRES(monitor_mutex) { struct mport *mport = mport_find(ofport); @@ -117,7 +116,7 @@ mport_register(const struct ofport_dpif *ofport, struct bfd *bfd, /* Removes mport from monitor_hmap and monitor_heap and frees it. */ static void mport_unregister(const struct ofport_dpif *ofport) - OVS_REQ_WRLOCK(monitor_rwlock) + OVS_REQUIRES(monitor_mutex) { struct mport *mport = mport_find(ofport); @@ -132,7 +131,7 @@ mport_unregister(const struct ofport_dpif *ofport) /* Updates the fields of an existing mport struct. */ static void mport_update(struct mport *mport, struct bfd *bfd, struct cfm *cfm, - uint8_t hw_addr[ETH_ADDR_LEN]) OVS_REQ_WRLOCK(monitor_rwlock) + uint8_t hw_addr[ETH_ADDR_LEN]) OVS_REQUIRES(monitor_mutex) { ovs_assert(mport); @@ -155,23 +154,10 @@ mport_update(struct mport *mport, struct bfd *bfd, struct cfm *cfm, } -/* Initializes the global variables. This will only run once. */ -static void -monitor_init(void) -{ - static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; - - if (ovsthread_once_start(&once)) { - hmap_init(&monitor_hmap); - ovsthread_once_done(&once); - } -} - /* The 'main' function for the monitor thread. */ static void * monitor_main(void * args OVS_UNUSED) { - set_subprogram_name("monitor"); VLOG_INFO("monitor thread created"); while (!latch_is_set(&monitor_exit_latch)) { monitor_run(); @@ -197,7 +183,7 @@ monitor_run(void) struct ofpbuf packet; ofpbuf_use_stub(&packet, stub, sizeof stub); - ovs_rwlock_wrlock(&monitor_rwlock); + ovs_mutex_lock(&monitor_mutex); prio_now = MSEC_TO_PRIO(time_msec()); /* Peeks the top of heap and checks if we should run this mport. */ while (!heap_is_empty(&monitor_heap) @@ -239,7 +225,7 @@ monitor_run(void) next_mport_wakeup = PRIO_TO_MSEC(heap_max(&monitor_heap)->priority); poll_timer_wait_until(MIN(next_timeout, next_mport_wakeup)); } - ovs_rwlock_unlock(&monitor_rwlock); + ovs_mutex_unlock(&monitor_mutex); ofpbuf_uninit(&packet); } @@ -253,21 +239,20 @@ ofproto_dpif_monitor_port_update(const struct ofport_dpif *ofport, struct bfd *bfd, struct cfm *cfm, uint8_t hw_addr[ETH_ADDR_LEN]) { - monitor_init(); - ovs_rwlock_wrlock(&monitor_rwlock); + ovs_mutex_lock(&monitor_mutex); if (!cfm && !bfd) { mport_unregister(ofport); } else { mport_register(ofport, bfd, cfm, hw_addr); } - ovs_rwlock_unlock(&monitor_rwlock); + ovs_mutex_unlock(&monitor_mutex); /* If the monitor thread is not running and the hmap * is not empty, starts it. If it is and the hmap is empty, * terminates it. */ if (!monitor_running && !hmap_is_empty(&monitor_hmap)) { latch_init(&monitor_exit_latch); - xpthread_create(&monitor_tid, NULL, monitor_main, NULL); + monitor_tid = ovs_thread_create("monitor", monitor_main, NULL); monitor_running = true; } else if (monitor_running && hmap_is_empty(&monitor_hmap)) { latch_set(&monitor_exit_latch); @@ -283,18 +268,17 @@ ofproto_dpif_monitor_port_update(const struct ofport_dpif *ofport, void ofproto_dpif_monitor_port_send_soon_safe(const struct ofport_dpif *ofport) { - ovs_rwlock_wrlock(&monitor_rwlock); + ovs_mutex_lock(&monitor_mutex); ofproto_dpif_monitor_port_send_soon(ofport); - ovs_rwlock_unlock(&monitor_rwlock); + ovs_mutex_unlock(&monitor_mutex); } void ofproto_dpif_monitor_port_send_soon(const struct ofport_dpif *ofport) - OVS_REQ_WRLOCK(monitor_rwlock) + OVS_REQUIRES(monitor_mutex) { struct mport *mport; - monitor_init(); mport = mport_find(ofport); if (mport) { heap_change(&monitor_heap, &mport->heap_node, LLONG_MAX);