X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.h;h=2cb43f798b6915ceca827cbe73f17151e5237103;hb=HEAD;hp=837bc538ec075a09f1bf3016a2e2c70c6305d9cd;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=sliver-openvswitch.git diff --git a/lib/rconn.h b/lib/rconn.h index 837bc538e..2cb43f798 100644 --- a/lib/rconn.h +++ b/lib/rconn.h @@ -1,26 +1,27 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef RCONN_H #define RCONN_H 1 -#include "queue.h" #include #include #include +#include "openvswitch/types.h" +#include "ovs-thread.h" /* A wrapper around vconn that provides queuing and optionally reliability. * @@ -32,24 +33,31 @@ * An rconn optionally provides reliable communication, in this sense: the * rconn will re-connect, with exponential backoff, when the underlying vconn * disconnects. + * + * + * Thread-safety + * ============= + * + * Fully thread-safe. */ struct vconn; struct rconn_packet_counter; -struct rconn *rconn_new(const char *name, - int inactivity_probe_interval, int max_backoff); -struct rconn *rconn_new_from_vconn(const char *name, struct vconn *); -struct rconn *rconn_create(int inactivity_probe_interval, int max_backoff); - +struct rconn *rconn_create(int inactivity_probe_interval, + int max_backoff, uint8_t dscp, + uint32_t allowed_versions); +void rconn_set_dscp(struct rconn *rc, uint8_t dscp); +uint32_t rconn_get_allowed_versions(const struct rconn *); +uint8_t rconn_get_dscp(const struct rconn *rc); void rconn_set_max_backoff(struct rconn *, int max_backoff); int rconn_get_max_backoff(const struct rconn *); void rconn_set_probe_interval(struct rconn *, int inactivity_probe_interval); int rconn_get_probe_interval(const struct rconn *); -int rconn_connect(struct rconn *, const char *name); +void rconn_connect(struct rconn *, const char *target, const char *name); void rconn_connect_unreliably(struct rconn *, - const char *name, struct vconn *vconn); + struct vconn *, const char *name); void rconn_reconnect(struct rconn *); void rconn_disconnect(struct rconn *); void rconn_destroy(struct rconn *); @@ -67,38 +75,38 @@ unsigned int rconn_packets_received(const struct rconn *); void rconn_add_monitor(struct rconn *, struct vconn *); const char *rconn_get_name(const struct rconn *); +void rconn_set_name(struct rconn *, const char *new_name); +const char *rconn_get_target(const struct rconn *); + bool rconn_is_alive(const struct rconn *); bool rconn_is_connected(const struct rconn *); +bool rconn_is_admitted(const struct rconn *); int rconn_failure_duration(const struct rconn *); -bool rconn_is_connectivity_questionable(struct rconn *); -uint32_t rconn_get_ip(const struct rconn *); +int rconn_get_version(const struct rconn *); const char *rconn_get_state(const struct rconn *); -unsigned int rconn_get_attempted_connections(const struct rconn *); -unsigned int rconn_get_successful_connections(const struct rconn *); time_t rconn_get_last_connection(const struct rconn *); -time_t rconn_get_creation_time(const struct rconn *); -unsigned long int rconn_get_total_time_connected(const struct rconn *); -int rconn_get_backoff(const struct rconn *); -unsigned int rconn_get_state_elapsed(const struct rconn *); +time_t rconn_get_last_disconnect(const struct rconn *); unsigned int rconn_get_connection_seqno(const struct rconn *); +int rconn_get_last_error(const struct rconn *); +unsigned int rconn_count_txqlen(const struct rconn *); -/* Counts the number of packets queued into an rconn by a given source. */ +/* Counts packets and bytes queued into an rconn by a given source. */ struct rconn_packet_counter { - int n; /* Number of packets queued. */ - int ref_cnt; /* Number of owners. */ + struct ovs_mutex mutex; + unsigned int n_packets OVS_GUARDED; /* Number of packets queued. */ + unsigned int n_bytes OVS_GUARDED; /* Number of bytes queued. */ + int ref_cnt OVS_GUARDED; /* Number of owners. */ }; struct rconn_packet_counter *rconn_packet_counter_create(void); void rconn_packet_counter_destroy(struct rconn_packet_counter *); -void rconn_packet_counter_inc(struct rconn_packet_counter *); -void rconn_packet_counter_dec(struct rconn_packet_counter *); - -static inline int -rconn_packet_counter_read(const struct rconn_packet_counter *counter) -{ - return counter->n; -} +void rconn_packet_counter_inc(struct rconn_packet_counter *, unsigned n_bytes); +void rconn_packet_counter_dec(struct rconn_packet_counter *, unsigned n_bytes); + +unsigned int rconn_packet_counter_n_packets( + const struct rconn_packet_counter *); +unsigned int rconn_packet_counter_n_bytes(const struct rconn_packet_counter *); #endif /* rconn.h */