X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-provider.h;h=58d2f0b6d9af8f019270e40800d9a4b8bec5b95f;hb=a877206f2f0ca10c625e311614d68a81bdc913ee;hp=98a890a46cd64164b57b557712af0414f03f8f17;hpb=82272eded1ede569bcec3ba4ab212e5e3fb632ff;p=openvswitch diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h index 98a890a4..58d2f0b6 100644 --- a/lib/dpif-provider.h +++ b/lib/dpif-provider.h @@ -69,14 +69,6 @@ struct dpif_class { * the type assumed if no type is specified when opening a dpif. */ const char *type; - /* Performs periodic work needed by dpifs of this class, if any is - * necessary. */ - void (*run)(void); - - /* Arranges for poll_block() to wake up if the "run" member function needs - * to be called. */ - void (*wait)(void); - /* Enumerates the names of all known created datapaths, if possible, into * 'all_dps'. The caller has already initialized 'all_dps' and other dpif * classes might already have added names to it. @@ -86,7 +78,7 @@ struct dpif_class { * * Some kinds of datapaths might not be practically enumerable, in which * case this function may be a null pointer. */ - int (*enumerate)(struct svec *all_dps); + int (*enumerate)(struct sset *all_dps); /* Attempts to open an existing dpif called 'name', if 'create' is false, * or to open an existing dpif or create a new one, if 'create' is true. @@ -102,29 +94,19 @@ struct dpif_class { /* Closes 'dpif' and frees associated memory. */ void (*close)(struct dpif *dpif); - /* Enumerates all names that may be used to open 'dpif' into 'all_names'. - * The Linux datapath, for example, supports opening a datapath both by - * number, e.g. "dp0", and by the name of the datapath's local port. For - * some datapaths, this might be an infinite set (e.g. in a file name, - * slashes may be duplicated any number of times), in which case only the - * names most likely to be used should be enumerated. - * - * The caller has already initialized 'all_names' and might already have - * added some names to it. This function should not disturb any existing - * names in 'all_names'. - * - * If a datapath class does not support multiple names for a datapath, this - * function may be a null pointer. - * - * This is used by the vswitch at startup, */ - int (*get_all_names)(const struct dpif *dpif, struct svec *all_names); - /* Attempts to destroy the dpif underlying 'dpif'. * * If successful, 'dpif' will not be used again except as an argument for * the 'close' member function. */ int (*destroy)(struct dpif *dpif); + /* Performs periodic work needed by 'dpif', if any is necessary. */ + void (*run)(struct dpif *dpif); + + /* Arranges for poll_block() to wake up if the "run" member function needs + * to be called for 'dpif'. */ + void (*wait)(struct dpif *dpif); + /* Retrieves statistics for 'dpif' into 'stats'. */ int (*get_stats)(const struct dpif *dpif, struct odp_stats *stats); @@ -228,7 +210,8 @@ struct dpif_class { /* Adds or modifies a flow in 'dpif'. The flow is specified by the Netlink * attributes with types ODP_KEY_ATTR_* in the 'key_len' bytes starting at * 'key'. The associated actions are specified by the Netlink attributes - * with types ODPAT_* in the 'actions_len' bytes starting at 'actions'. + * with types ODP_ACTION_ATTR_* in the 'actions_len' bytes starting at + * 'actions'. * * - If the flow's key does not exist in 'dpif', then the flow will be * added if 'flags' includes DPIF_FP_CREATE. Otherwise the operation @@ -281,9 +264,9 @@ struct dpif_class { * On success, if 'key' and 'key_len' are nonnull then '*key' and * '*key_len' must be set to Netlink attributes with types ODP_KEY_ATTR_* * representing the dumped flow's key. If 'actions' and 'actions_len' are - * nonnull then they should be set to Netlink attributes with types ODPAT_* - * representing the dumped flow's actions. If 'stats' is nonnull then it - * should be set to the dumped flow's statistics. + * nonnull then they should be set to Netlink attributes with types + * ODP_ACTION_ATTR_* representing the dumped flow's actions. If 'stats' + * is nonnull then it should be set to the dumped flow's statistics. * * All of the returned data is owned by 'dpif', not by the caller, and the * caller must not modify or free it. 'dpif' must guarantee that it @@ -299,9 +282,14 @@ struct dpif_class { int (*flow_dump_done)(const struct dpif *dpif, void *state); /* Performs the 'actions_len' bytes of actions in 'actions' on the Ethernet - * frame specified in 'packet'. */ - int (*execute)(struct dpif *dpif, const struct nlattr *actions, - size_t actions_len, const struct ofpbuf *packet); + * frame specified in 'packet' taken from the flow specified in the + * 'key_len' bytes of 'key'. ('key' is mostly redundant with 'packet', but + * it contains some metadata that cannot be recovered from 'packet', such + * as tun_id and in_port.) */ + int (*execute)(struct dpif *dpif, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *packet); /* Retrieves 'dpif''s "listen mask" into '*listen_mask'. A 1-bit of value * 2**X set in '*listen_mask' indicates that 'dpif' will receive messages @@ -335,7 +323,7 @@ struct dpif_class { int (*set_sflow_probability)(struct dpif *dpif, uint32_t probability); /* Translates OpenFlow queue ID 'queue_id' (in host byte order) into a - * priority value for use in the ODPAT_SET_PRIORITY action in + * priority value for use in the ODP_ACTION_ATTR_SET_PRIORITY action in * '*priority'. */ int (*queue_to_priority)(const struct dpif *dpif, uint32_t queue_id, uint32_t *priority);