X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fnetflow.c;h=f1b6fbe2d1a2c4e3d2a186e228deff153aa6136b;hb=e016fb630d66ba29c37fe4246f0acf80f11c1b3f;hp=7b9e0e6c23cc158611c8c43d932ab2fa52af289f;hpb=936604c009caf1587df9c1aec6c4c6e3020052b3;p=cascardo%2Fovs.git

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 7b9e0e6c2..f1b6fbe2d 100644
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 #include "socket-util.h"
 #include "timeval.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netflow);
 
@@ -53,7 +53,7 @@ struct netflow {
 
     struct hmap flows;            /* Contains 'netflow_flows'. */
 
-    atomic_int ref_cnt;
+    struct ovs_refcount ref_cnt;
 };
 
 struct netflow_flow {
@@ -79,7 +79,7 @@ struct netflow_flow {
 };
 
 static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
-static atomic_uint netflow_count = ATOMIC_VAR_INIT(0);
+static atomic_count netflow_count = ATOMIC_COUNT_INIT(0);
 
 static struct netflow_flow *netflow_flow_lookup(const struct netflow *,
                                                 const struct flow *)
@@ -90,7 +90,7 @@ static void netflow_expire__(struct netflow *, struct netflow_flow *)
 static void netflow_run__(struct netflow *) OVS_REQUIRES(mutex);
 
 void
-netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
+netflow_mask_wc(const struct flow *flow, struct flow_wildcards *wc)
 {
     if (flow->dl_type != htons(ETH_TYPE_IP)) {
         return;
@@ -98,8 +98,7 @@ netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
     memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
     memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
     memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
-    memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
-    memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
+    flow_unwildcard_tp_ports(flow, wc);
     wc->masks.nw_tos |= IP_DSCP_MASK;
 }
 
@@ -122,7 +121,6 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
         nf_hdr->sysuptime = htonl(time_msec() - nf->boot_time);
         nf_hdr->unix_secs = htonl(now.tv_sec);
         nf_hdr->unix_nsecs = htonl(now.tv_nsec);
-        nf_hdr->flow_seq = htonl(nf->netflow_cnt++);
         nf_hdr->engine_type = nf->engine_type;
         nf_hdr->engine_id = nf->engine_id;
         nf_hdr->sampling_interval = htons(0);
@@ -130,6 +128,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
 
     nf_hdr = nf->packet.data;
     nf_hdr->count = htons(ntohs(nf_hdr->count) + 1);
+    nf_hdr->flow_seq = htonl(nf->netflow_cnt++);
 
     nf_rec = ofpbuf_put_zeros(&nf->packet, sizeof *nf_rec);
     nf_rec->src_addr = nf_flow->nw_src;
@@ -171,7 +170,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
 }
 
 void
-netflow_flow_update(struct netflow *nf, struct flow *flow,
+netflow_flow_update(struct netflow *nf, const struct flow *flow,
                     ofp_port_t output_iface,
                     const struct dpif_flow_stats *stats)
     OVS_EXCLUDED(mutex)
@@ -271,14 +270,14 @@ netflow_expire__(struct netflow *nf, struct netflow_flow *nf_flow)
     }
 
     /* Update flow tracking data. */
-    nf_flow->created = 0;
     nf_flow->packet_count = 0;
     nf_flow->byte_count = 0;
     nf_flow->tcp_flags = 0;
 }
 
 void
-netflow_expire(struct netflow *nf, struct flow *flow) OVS_EXCLUDED(mutex)
+netflow_flow_clear(struct netflow *nf, const struct flow *flow)
+    OVS_EXCLUDED(mutex)
 {
     struct netflow_flow *nf_flow;
 
@@ -286,20 +285,6 @@ netflow_expire(struct netflow *nf, struct flow *flow) OVS_EXCLUDED(mutex)
     nf_flow = netflow_flow_lookup(nf, flow);
     if (nf_flow) {
         netflow_expire__(nf, nf_flow);
-    }
-    ovs_mutex_unlock(&mutex);
-}
-
-void
-netflow_flow_clear(struct netflow *nf, struct flow *flow) OVS_EXCLUDED(mutex)
-{
-    struct netflow_flow *nf_flow;
-
-    ovs_mutex_lock(&mutex);
-    nf_flow = netflow_flow_lookup(nf, flow);
-    if (nf_flow) {
-        ovs_assert(!nf_flow->packet_count);
-        ovs_assert(!nf_flow->byte_count);
         hmap_remove(&nf->flows, &nf_flow->hmap_node);
         free(nf_flow);
     }
@@ -397,7 +382,6 @@ struct netflow *
 netflow_create(void)
 {
     struct netflow *nf = xzalloc(sizeof *nf);
-    int junk;
 
     nf->engine_type = 0;
     nf->engine_id = 0;
@@ -406,9 +390,9 @@ netflow_create(void)
     nf->add_id_to_iface = false;
     nf->netflow_cnt = 0;
     hmap_init(&nf->flows);
-    atomic_init(&nf->ref_cnt, 1);
+    ovs_refcount_init(&nf->ref_cnt);
     ofpbuf_init(&nf->packet, 1500);
-    atomic_add(&netflow_count, 1, &junk);
+    atomic_count_inc(&netflow_count);
     return nf;
 }
 
@@ -417,9 +401,7 @@ netflow_ref(const struct netflow *nf_)
 {
     struct netflow *nf = CONST_CAST(struct netflow *, nf_);
     if (nf) {
-        int orig;
-        atomic_add(&nf->ref_cnt, 1, &orig);
-        ovs_assert(orig > 0);
+        ovs_refcount_ref(&nf->ref_cnt);
     }
     return nf;
 }
@@ -427,30 +409,22 @@ netflow_ref(const struct netflow *nf_)
 void
 netflow_unref(struct netflow *nf)
 {
-    int orig;
-
-    if (!nf) {
-        return;
-    }
-
-    atomic_sub(&nf->ref_cnt, 1, &orig);
-    ovs_assert(orig > 0);
-    if (orig == 1) {
-        atomic_sub(&netflow_count, 1, &orig);
+    if (nf && ovs_refcount_unref_relaxed(&nf->ref_cnt) == 1) {
+        atomic_count_dec(&netflow_count);
         collectors_destroy(nf->collectors);
         ofpbuf_uninit(&nf->packet);
         free(nf);
     }
 }
 
-/* Returns true if there exist any netflow objects, false otherwise. */
+/* Returns true if there exist any netflow objects, false otherwise.
+ * Callers must cope with transient false positives, i.e., there is no tight
+ * synchronization with the count and the actual existence of netflow objects.
+ */
 bool
 netflow_exists(void)
 {
-    int n;
-
-    atomic_read(&netflow_count, &n);
-    return n > 0;
+    return atomic_count_get(&netflow_count) > 0;
 }
 
 /* Helpers. */
@@ -482,13 +456,13 @@ netflow_flow_hash(const struct flow *flow)
 {
     uint32_t hash = 0;
 
-    hash = mhash_add(hash, (OVS_FORCE uint32_t) flow->in_port.ofp_port);
-    hash = mhash_add(hash, ntohl(flow->nw_src));
-    hash = mhash_add(hash, ntohl(flow->nw_dst));
-    hash = mhash_add(hash, flow->nw_tos);
-    hash = mhash_add(hash, flow->nw_proto);
-    hash = mhash_add(hash, ntohs(flow->tp_src));
-    hash = mhash_add(hash, ntohs(flow->tp_dst));
+    hash = hash_add(hash, (OVS_FORCE uint32_t) flow->in_port.ofp_port);
+    hash = hash_add(hash, ntohl(flow->nw_src));
+    hash = hash_add(hash, ntohl(flow->nw_dst));
+    hash = hash_add(hash, flow->nw_tos);
+    hash = hash_add(hash, flow->nw_proto);
+    hash = hash_add(hash, ntohs(flow->tp_src));
+    hash = hash_add(hash, ntohs(flow->tp_dst));
 
-    return mhash_finish(hash, 28);
+    return hash_finish(hash, 28);
 }