X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-provider.h;h=91074d507fdb8d8ef497aaf7d305a1507f606d27;hb=f696f12fbe84f49d650f48c45ce1a24b94547ad2;hp=bded290104174a0db6c395a62bfa05a676d33681;hpb=feebdea2e5550a71c7accda936b6a55962f60a04;p=openvswitch diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h index bded2901..91074d50 100644 --- a/lib/dpif-provider.h +++ b/lib/dpif-provider.h @@ -102,23 +102,6 @@ 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 @@ -221,34 +204,35 @@ struct dpif_class { * * If 'stats' is nonnull, then on success it must be updated with the * flow's statistics. */ - int (*flow_get)(const struct dpif *dpif, int flags, + int (*flow_get)(const struct dpif *dpif, const struct nlattr *key, size_t key_len, - struct ofpbuf **actionsp, struct odp_flow_stats *stats); + struct ofpbuf **actionsp, struct dpif_flow_stats *stats); /* 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 ODPPF_CREATE. Otherwise the operation will - * fail with ENOENT. + * added if 'flags' includes DPIF_FP_CREATE. Otherwise the operation + * will fail with ENOENT. * * If the operation succeeds, then 'stats', if nonnull, must be zeroed. * * - If the flow's key does exist in 'dpif', then the flow's actions will - * be updated if 'flags' includes ODPPF_MODIFY. Otherwise the operation - * will fail with EEXIST. If the flow's actions are updated, then its - * statistics will be zeroed if 'flags' includes ODPPF_ZERO_STATS, and - * left as-is otherwise. + * be updated if 'flags' includes DPIF_FP_MODIFY. Otherwise the + * operation will fail with EEXIST. If the flow's actions are updated, + * then its statistics will be zeroed if 'flags' includes + * DPIF_FP_ZERO_STATS, and left as-is otherwise. * * If the operation succeeds, then 'stats', if nonnull, must be set to * the flow's statistics before the update. */ - int (*flow_put)(struct dpif *dpif, int flags, + int (*flow_put)(struct dpif *dpif, enum dpif_flow_put_flags flags, const struct nlattr *key, size_t key_len, const struct nlattr *actions, size_t actions_len, - struct odp_flow_stats *stats); + struct dpif_flow_stats *stats); /* Deletes a flow from 'dpif' and returns 0, or returns ENOENT if 'dpif' * does not contain such a flow. The flow is specified by the Netlink @@ -259,7 +243,7 @@ struct dpif_class { * flow's statistics before its deletion. */ int (*flow_del)(struct dpif *dpif, const struct nlattr *key, size_t key_len, - struct odp_flow_stats *stats); + struct dpif_flow_stats *stats); /* Deletes all flows from 'dpif' and clears all of its queues of received * packets. */ @@ -281,9 +265,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 @@ -292,7 +276,7 @@ struct dpif_class { int (*flow_dump_next)(const struct dpif *dpif, void *state, const struct nlattr **key, size_t *key_len, const struct nlattr **actions, size_t *actions_len, - const struct odp_flow_stats **stats); + const struct dpif_flow_stats **stats); /* Releases resources from 'dpif' for 'state', which was initialized by a * successful call to the 'flow_dump_start' function for 'dpif'. */ @@ -303,14 +287,16 @@ struct dpif_class { int (*execute)(struct dpif *dpif, const struct nlattr *actions, size_t actions_len, const struct ofpbuf *packet); - /* Retrieves 'dpif''s "listen mask" into '*listen_mask'. Each ODPL_* bit - * set in '*listen_mask' indicates the 'dpif' will receive messages of the - * corresponding type when it calls the recv member function. */ + /* 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 + * of the type (from "enum dpif_upcall_type") with value X when its 'recv' + * function is called. */ int (*recv_get_mask)(const struct dpif *dpif, int *listen_mask); - /* Sets 'dpif''s "listen mask" to 'listen_mask'. Each ODPL_* bit set in - * 'listen_mask' indicates the 'dpif' will receive messages of the - * corresponding type when it calls the recv member function. */ + /* Sets 'dpif''s "listen mask" to 'listen_mask'. A 1-bit of value 2**X set + * in '*listen_mask' requests that 'dpif' will receive messages of the type + * (from "enum dpif_upcall_type") with value X when its 'recv' function is + * called. */ int (*recv_set_mask)(struct dpif *dpif, int listen_mask); /* Retrieves 'dpif''s sFlow sampling probability into '*probability'. @@ -333,7 +319,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);