Skip to content

Commit

Permalink
Simplify SaiInterface macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@kcudnik
kcudnik committed Aug 21, 2021
1 parent b7ec50a commit 3b02209
Show file tree
Hide file tree
Showing 11 changed files with 129 additions and 1,200 deletions.
113 changes: 4 additions & 109 deletions lib/inc/ClientSai.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,6 @@
#include <vector>
#include <string>

#define SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(ot) \
virtual sai_status_t remove( \
_In_ const sai_ ## ot ## _t* ot) override;

#define SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(ot) \
virtual sai_status_t create( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ uint32_t attr_count, \
_In_ const sai_attribute_t *attr_list) override;

#define SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(ot) \
virtual sai_status_t set( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ const sai_attribute_t *attr) override;

#define SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(ot) \
virtual sai_status_t get( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ uint32_t attr_count, \
_Out_ sai_attribute_t *attr_list) override;

#define SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(ot) \
virtual sai_status_t bulkCreate( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ const uint32_t *attr_count, \
_In_ const sai_attribute_t **attr_list, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

#define SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \
virtual sai_status_t bulkRemove( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

#define SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(ot) \
virtual sai_status_t bulkSet( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ const sai_attribute_t *attr_list, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

namespace sairedis
{
class ClientSai:
Expand Down Expand Up @@ -101,49 +56,10 @@ namespace sairedis
_In_ uint32_t attr_count,
_Inout_ sai_attribute_t *attr_list) override;

public: // create ENTRY

SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(route_entry);
SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(nat_entry);

public: // remove ENTRY

SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(route_entry);
SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(nat_entry);

public: // set ENTRY

SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(route_entry);
SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(nat_entry);

public: // get ENTRY

SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(route_entry);
SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(nat_entry);
public: // QUAD ENTRY and BULK QUAD ENTRY

SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE);
SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE);

public: // bulk QUAD oid

Expand Down Expand Up @@ -172,27 +88,6 @@ namespace sairedis
_In_ sai_bulk_op_error_mode_t mode,
_Out_ sai_status_t *object_statuses) override;

public: // bulk create ENTRY

SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(route_entry);

public: // bulk remove ENTRY

SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry);

public: // bulk set ENTRY

SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(nat_entry);
SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(route_entry);

public: // stats API

virtual sai_status_t getStats(
Expand Down
113 changes: 4 additions & 109 deletions lib/inc/ClientServerSai.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,6 @@
#include <memory>
#include <mutex>

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(ot) \
virtual sai_status_t remove( \
_In_ const sai_ ## ot ## _t* ot) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(ot) \
virtual sai_status_t create( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ uint32_t attr_count, \
_In_ const sai_attribute_t *attr_list) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(ot) \
virtual sai_status_t set( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ const sai_attribute_t *attr) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(ot) \
virtual sai_status_t get( \
_In_ const sai_ ## ot ## _t* ot, \
_In_ uint32_t attr_count, \
_Out_ sai_attribute_t *attr_list) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(ot) \
virtual sai_status_t bulkCreate( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ const uint32_t *attr_count, \
_In_ const sai_attribute_t **attr_list, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \
virtual sai_status_t bulkRemove( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(ot) \
virtual sai_status_t bulkSet( \
_In_ uint32_t object_count, \
_In_ const sai_ ## ot ## _t *ot, \
_In_ const sai_attribute_t *attr_list, \
_In_ sai_bulk_op_error_mode_t mode, \
_Out_ sai_status_t *object_statuses) override;

namespace sairedis
{
class ClientServerSai:
Expand Down Expand Up @@ -93,49 +48,10 @@ namespace sairedis
_In_ uint32_t attr_count,
_Inout_ sai_attribute_t *attr_list) override;

public: // create ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(route_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(nat_entry);

public: // remove ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(route_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(nat_entry);

public: // set ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(route_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(nat_entry);

public: // get ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(ipmc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(l2mc_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(mcast_fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(neighbor_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(route_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(nat_entry);
public: // QUAD ENTRY and BULK QUAD ENTRY

SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE);
SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE);

public: // bulk QUAD oid

Expand Down Expand Up @@ -164,27 +80,6 @@ namespace sairedis
_In_ sai_bulk_op_error_mode_t mode,
_Out_ sai_status_t *object_statuses) override;

public: // bulk create ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(route_entry);

public: // bulk remove ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry);

public: // bulk set ENTRY

SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(fdb_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(inseg_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(nat_entry);
SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(route_entry);

public: // stats API

virtual sai_status_t getStats(
Expand Down
Loading

0 comments on commit 3b02209

Please sign in to comment.