Add more files to the openvswitch library on MSVC

[cascardo/ovs.git] / lib / cfm.c

diff --git a/lib/cfm.c b/lib/cfm.c
index 1b32625..d83a68c 100644 (file)
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -328,6 +328,14 @@ cfm_init(void)
                              1, 2, cfm_unixctl_set_fault, NULL);
 }
 
+/* Records the status change and changes the global connectivity seq. */
+static void
+cfm_status_changed(struct cfm *cfm) OVS_REQUIRES(mutex)
+{
+    seq_change(connectivity_seq_get());
+    cfm->status_changed = true;
+}
+
 /* Allocates a 'cfm' object called 'name'.  'cfm' should be initialized by
  * cfm_configure() before use. */
 struct cfm *
@@ -349,6 +357,7 @@ cfm_create(const struct netdev *netdev) OVS_EXCLUDED(mutex)
     ovs_refcount_init(&cfm->ref_cnt);
 
     ovs_mutex_lock(&mutex);
+    cfm_status_changed(cfm);
     cfm_generate_maid(cfm);
     hmap_insert(all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0));
     ovs_mutex_unlock(&mutex);
@@ -365,11 +374,12 @@ cfm_unref(struct cfm *cfm) OVS_EXCLUDED(mutex)
         return;
     }
 
-    if (ovs_refcount_unref(&cfm->ref_cnt) != 1) {
+    if (ovs_refcount_unref_relaxed(&cfm->ref_cnt) != 1) {
         return;
     }
 
     ovs_mutex_lock(&mutex);
+    cfm_status_changed(cfm);
     hmap_remove(all_cfms, &cfm->hmap_node);
     ovs_mutex_unlock(&mutex);
 
@@ -395,14 +405,6 @@ cfm_ref(const struct cfm *cfm_)
     return cfm;
 }
 
-/* Records the status change and changes the global connectivity seq. */
-static void
-cfm_status_changed(struct cfm *cfm) OVS_REQUIRES(mutex)
-{
-    seq_change(connectivity_seq_get());
-    cfm->status_changed = true;
-}
-
 /* Should be run periodically to update fault statistics messages. */
 void
 cfm_run(struct cfm *cfm) OVS_EXCLUDED(mutex)
@@ -611,7 +613,7 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
     if (cfm->last_tx) {
         long long int delay = time_msec() - cfm->last_tx;
         if (delay > (cfm->ccm_interval_ms * 3 / 2)) {
-            VLOG_WARN("%s: long delay of %lldms (expected %dms) sending CCM"
+            VLOG_INFO("%s: long delay of %lldms (expected %dms) sending CCM"
                       " seq %"PRIu32, cfm->name, delay, cfm->ccm_interval_ms,
                       cfm->seq);
         }
@@ -923,26 +925,42 @@ cfm_get_health(const struct cfm *cfm) OVS_EXCLUDED(mutex)
     return health;
 }
 
+static int
+cfm_get_opup__(const struct cfm *cfm_) OVS_REQUIRES(mutex)
+{
+    struct cfm *cfm = CONST_CAST(struct cfm *, cfm_);
+    bool extended;
+
+    atomic_read(&cfm->extended, &extended);
+
+    return extended ? cfm->remote_opup : -1;
+}
+
 /* Gets the operational state of 'cfm'.  'cfm' is considered operationally down
  * if it has received a CCM with the operationally down bit set from any of its
  * remote maintenance points. Returns 1 if 'cfm' is operationally up, 0 if
  * 'cfm' is operationally down, or -1 if 'cfm' has no operational state
  * (because it isn't in extended mode). */
 int
-cfm_get_opup(const struct cfm *cfm_) OVS_EXCLUDED(mutex)
+cfm_get_opup(const struct cfm *cfm) OVS_EXCLUDED(mutex)
 {
-    struct cfm *cfm = CONST_CAST(struct cfm *, cfm_);
-    bool extended;
     int opup;
 
     ovs_mutex_lock(&mutex);
-    atomic_read(&cfm->extended, &extended);
-    opup = extended ? cfm->remote_opup : -1;
+    opup = cfm_get_opup__(cfm);
     ovs_mutex_unlock(&mutex);
 
     return opup;
 }
 
+static void
+cfm_get_remote_mpids__(const struct cfm *cfm, uint64_t **rmps, size_t *n_rmps)
+    OVS_REQUIRES(mutex)
+{
+    *rmps = xmemdup(cfm->rmps_array, cfm->rmps_array_len * sizeof **rmps);
+    *n_rmps = cfm->rmps_array_len;
+}
+
 /* Populates 'rmps' with an array of remote maintenance points reachable by
  * 'cfm'. The number of remote maintenance points is written to 'n_rmps'.
  * 'cfm' retains ownership of the array written to 'rmps' */
@@ -951,8 +969,20 @@ cfm_get_remote_mpids(const struct cfm *cfm, uint64_t **rmps, size_t *n_rmps)
     OVS_EXCLUDED(mutex)
 {
     ovs_mutex_lock(&mutex);
-    *rmps = xmemdup(cfm->rmps_array, cfm->rmps_array_len * sizeof **rmps);
-    *n_rmps = cfm->rmps_array_len;
+    cfm_get_remote_mpids__(cfm, rmps, n_rmps);
+    ovs_mutex_unlock(&mutex);
+}
+
+/* Extracts the status of 'cfm' and fills in the 's'. */
+void
+cfm_get_status(const struct cfm *cfm, struct cfm_status *s) OVS_EXCLUDED(mutex)
+{
+    ovs_mutex_lock(&mutex);
+    s->faults = cfm_get_fault__(cfm);
+    s->remote_opstate = cfm_get_opup__(cfm);
+    s->flap_count = cfm->flap_count;
+    s->health = cfm->health;
+    cfm_get_remote_mpids__(cfm, &s->rmps, &s->n_rmps);
     ovs_mutex_unlock(&mutex);
 }