X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-provider.h;h=fddc8ea3271c5557feeb64ea2b8e966ee705321b;hb=7103dec49eb569c3196239da6c178a29c3003e2b;hp=c33faf12ea324ba33f98ee67f2c5eb1015e39b47;hpb=b4a7a3f3dea8fdf2a9da184c1676eeccd76f4700;p=openvswitch diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h index c33faf12..fddc8ea3 100644 --- a/lib/dpif-provider.h +++ b/lib/dpif-provider.h @@ -23,22 +23,29 @@ #include #include "dpif.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Open vSwitch datapath interface. * * This structure should be treated as opaque by dpif implementations. */ struct dpif { - const struct dpif_class *class; - char *name; + const struct dpif_class *dpif_class; + char *base_name; + char *full_name; uint8_t netflow_engine_type; uint8_t netflow_engine_id; }; void dpif_init(struct dpif *, const struct dpif_class *, const char *name, uint8_t netflow_engine_type, uint8_t netflow_engine_id); +void dpif_uninit(struct dpif *dpif, bool close); + static inline void dpif_assert_class(const struct dpif *dpif, - const struct dpif_class *class) + const struct dpif_class *dpif_class) { - assert(dpif->class == class); + assert(dpif->dpif_class == dpif_class); } /* Datapath interface class structure, to be defined by each implementation of @@ -52,15 +59,11 @@ static inline void dpif_assert_class(const struct dpif *dpif, * EWOULDBLOCK or EINPROGRESS. We may relax this requirement in the future if * and when we encounter performance problems. */ struct dpif_class { - /* Prefix for names of dpifs in this class, e.g. "netdev:". + /* Type of dpif in this class, e.g. "system", "netdev", etc. * - * One dpif class may have the empty string "" as its prefix, in which case - * that dpif class is associated with dpif names that don't match any other - * class name. */ - const char *prefix; - - /* Class name, for use in error messages. */ - const char *name; + * One of the providers should supply a "system" type, since this is + * 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. */ @@ -81,16 +84,14 @@ struct dpif_class { * case this function may be a null pointer. */ int (*enumerate)(struct svec *all_dps); - /* Attempts to open an existing dpif, if 'create' is false, or to open an - * existing dpif or create a new one, if 'create' is true. 'name' is the - * full dpif name provided by the user, e.g. "udatapath:/var/run/mypath". - * This name is useful for error messages but must not be modified. - * - * 'suffix' is a copy of 'name' following the dpif's 'prefix'. + /* 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. + * 'type' corresponds to the 'type' field used in the dpif_class + * structure. * * If successful, stores a pointer to the new dpif in '*dpifp'. On failure * there are no requirements on what is stored in '*dpifp'. */ - int (*open)(const char *name, char *suffix, bool create, + int (*open)(const char *name, const char *type, bool create, struct dpif **dpifp); /* Closes 'dpif' and frees associated memory. */ @@ -117,7 +118,7 @@ struct dpif_class { * * If successful, 'dpif' will not be used again except as an argument for * the 'close' member function. */ - int (*delete)(struct dpif *dpif); + int (*destroy)(struct dpif *dpif); /* Retrieves statistics for 'dpif' into 'stats'. */ int (*get_stats)(const struct dpif *dpif, struct odp_stats *stats); @@ -314,4 +315,8 @@ struct dpif_class { extern const struct dpif_class dpif_linux_class; extern const struct dpif_class dpif_netdev_class; +#ifdef __cplusplus +} +#endif + #endif /* dpif-provider.h */