Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions orchagent/routeorch.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ struct RouteBulkContext
{
}

// Disable any copy constructors
// Disable copy but allow move
RouteBulkContext(const RouteBulkContext&) = delete;
RouteBulkContext(RouteBulkContext&&) = delete;
RouteBulkContext& operator=(const RouteBulkContext&) = delete;
RouteBulkContext(RouteBulkContext&&) = default;
RouteBulkContext& operator=(RouteBulkContext&&) = default;

void clear()
{
Expand Down Expand Up @@ -267,6 +269,10 @@ class RouteOrch : public ZmqOrch, public Subject
bool checkNextHopGroupCount();
const RouteTables& getSyncdRoutes() const { return m_syncdRoutes; }

EntityBulker<sai_route_api_t> gRouteBulker;
EntityBulker<sai_mpls_api_t> gLabelRouteBulker;
ObjectBulker<sai_next_hop_group_api_t> gNextHopGroupMemberBulker;

private:
SwitchOrch *m_switchOrch;
NeighOrch *m_neighOrch;
Expand Down Expand Up @@ -298,10 +304,6 @@ class RouteOrch : public ZmqOrch, public Subject

NextHopObserverTable m_nextHopObservers;

EntityBulker<sai_route_api_t> gRouteBulker;
EntityBulker<sai_mpls_api_t> gLabelRouteBulker;
ObjectBulker<sai_next_hop_group_api_t> gNextHopGroupMemberBulker;

void addTempRoute(RouteBulkContext& ctx, const NextHopGroupKey&);

void addTempLabelRoute(LabelRouteBulkContext& ctx, const NextHopGroupKey&);
Expand Down
Loading