From f08197527e0d7fab22307d6fed0735256308eace Mon Sep 17 00:00:00 2001 From: Kamil Cudnik Date: Mon, 24 Oct 2016 18:27:40 -0700 Subject: [PATCH] Convert meta to saimetadata library (#100) --- Makefile.am | 2 +- configure.ac | 48 ++++++++- debian/control | 11 +++ debian/libsaimetadata-dev.dirs | 2 + debian/libsaimetadata-dev.install | 1 + debian/libsaimetadata-dev.links | 2 + debian/libsaimetadata.dirs | 1 + debian/libsaimetadata.install | 1 + debian/libsaivs-dev.links | 2 +- debian/libsaivs.install | 2 +- debian/syncd.install | 2 +- lib/inc/sai_redis.h | 4 +- lib/src/Makefile.am | 73 +------------- lib/src/sai_redis_notifications.cpp | 12 --- meta/Makefile | 117 ---------------------- meta/Makefile.am | 81 +++++++++++++++ player/Makefile | 61 ------------ player/Makefile.am | 13 +++ player/player.cpp | 1 + syncd/Makefile.am | 31 +++--- syncd/syncd.cpp | 4 +- syncd/syncd.h | 2 - syncd/syncd_counters.cpp | 2 +- syncd/syncd_hard_reinit.cpp | 12 +-- syncd/syncd_notifications.cpp | 3 +- vslib/inc/sai_vs.h | 2 +- vslib/inc/sai_vs_state.h | 3 +- vslib/src/Makefile.am | 148 +++++++--------------------- 28 files changed, 229 insertions(+), 414 deletions(-) create mode 100644 debian/libsaimetadata-dev.dirs create mode 100644 debian/libsaimetadata-dev.install create mode 100755 debian/libsaimetadata-dev.links create mode 100644 debian/libsaimetadata.dirs create mode 100644 debian/libsaimetadata.install delete mode 100644 meta/Makefile create mode 100644 meta/Makefile.am delete mode 100644 player/Makefile create mode 100644 player/Makefile.am diff --git a/Makefile.am b/Makefile.am index 67afc2f35b6d..8e20c81f8f5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = lib vslib syncd +SUBDIRS = meta lib vslib syncd player diff --git a/configure.ac b/configure.ac index 0b2f3207eb00..410dc7c76627 100644 --- a/configure.ac +++ b/configure.ac @@ -44,12 +44,56 @@ AM_COND_IF([SAITHRIFT], [ AC_CHECK_LIB([thrift], [main], [], [AC_MSG_ERROR(libthrift is required for rpcserver)]) ]) -CFLAGS_COMMON="-std=c++11 -Wall -fPIC -Wno-write-strings" +CFLAGS_COMMON="" +CFLAGS_COMMON+=" -ansi" +CFLAGS_COMMON+=" -fPIC" +CFLAGS_COMMON+=" -std=c++11" +CFLAGS_COMMON+=" -Wall" +CFLAGS_COMMON+=" -Wcast-align" +CFLAGS_COMMON+=" -Wcast-qual" +CFLAGS_COMMON+=" -Wconversion" +CFLAGS_COMMON+=" -Wdisabled-optimization" +CFLAGS_COMMON+=" -Werror" +CFLAGS_COMMON+=" -Wextra" +CFLAGS_COMMON+=" -Wextra" +CFLAGS_COMMON+=" -Wfloat-equal" +CFLAGS_COMMON+=" -Wformat=2" +CFLAGS_COMMON+=" -Wformat-nonliteral" +CFLAGS_COMMON+=" -Wformat-security" +CFLAGS_COMMON+=" -Wformat-y2k" +CFLAGS_COMMON+=" -Wimport" +CFLAGS_COMMON+=" -Winit-self" +CFLAGS_COMMON+=" -Winline" +CFLAGS_COMMON+=" -Winvalid-pch" +CFLAGS_COMMON+=" -Wlong-long" +CFLAGS_COMMON+=" -Wmissing-field-initializers" +CFLAGS_COMMON+=" -Wmissing-format-attribute" +CFLAGS_COMMON+=" -Wmissing-include-dirs" +CFLAGS_COMMON+=" -Wmissing-noreturn" +CFLAGS_COMMON+=" -Wno-aggregate-return" +CFLAGS_COMMON+=" -Wno-padded" +CFLAGS_COMMON+=" -Wno-switch-enum" +CFLAGS_COMMON+=" -Wno-unused-parameter" +CFLAGS_COMMON+=" -Wpacked" +CFLAGS_COMMON+=" -Wpointer-arith" +CFLAGS_COMMON+=" -Wredundant-decls" +CFLAGS_COMMON+=" -Wshadow" +CFLAGS_COMMON+=" -Wstack-protector" +CFLAGS_COMMON+=" -Wstrict-aliasing=3" +CFLAGS_COMMON+=" -Wswitch" +CFLAGS_COMMON+=" -Wswitch-default" +CFLAGS_COMMON+=" -Wunreachable-code" +CFLAGS_COMMON+=" -Wunused" +CFLAGS_COMMON+=" -Wvariadic-macros" +CFLAGS_COMMON+=" -Wno-write-strings" + AC_SUBST(CFLAGS_COMMON) AC_OUTPUT(Makefile + meta/Makefile lib/Makefile lib/src/Makefile vslib/Makefile vslib/src/Makefile - syncd/Makefile) + syncd/Makefile + player/Makefile) diff --git a/debian/control b/debian/control index 58a343e0b885..51c35622ef6e 100644 --- a/debian/control +++ b/debian/control @@ -31,3 +31,14 @@ Architecture: any Depends: libsaivs (= ${binary:Version}) Section: libdevel Description: This package contains development files for SAI-VirtualSwitch. + +Package: libsaimetadata +Architecture: any +Section: libs +Description: This package contains SAI-Metadata implementation for SONiC project. + +Package: libsaimetadata-dev +Architecture: any +Depends: libsaimetadata (= ${binary:Version}) +Section: libdevel +Description: This package contains development files for SAI-Metadata. diff --git a/debian/libsaimetadata-dev.dirs b/debian/libsaimetadata-dev.dirs new file mode 100644 index 000000000000..44188162ec7a --- /dev/null +++ b/debian/libsaimetadata-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include diff --git a/debian/libsaimetadata-dev.install b/debian/libsaimetadata-dev.install new file mode 100644 index 000000000000..b49240629a19 --- /dev/null +++ b/debian/libsaimetadata-dev.install @@ -0,0 +1 @@ +meta/*.h usr/include/sai diff --git a/debian/libsaimetadata-dev.links b/debian/libsaimetadata-dev.links new file mode 100755 index 000000000000..0ee1e82b0bcf --- /dev/null +++ b/debian/libsaimetadata-dev.links @@ -0,0 +1,2 @@ +#! /usr/bin/dh-exec +/usr/lib/${DEB_HOST_MULTIARCH}/libsaimetadata.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsaimetadata.so diff --git a/debian/libsaimetadata.dirs b/debian/libsaimetadata.dirs new file mode 100644 index 000000000000..68457717bd8e --- /dev/null +++ b/debian/libsaimetadata.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/debian/libsaimetadata.install b/debian/libsaimetadata.install new file mode 100644 index 000000000000..f9697db99837 --- /dev/null +++ b/debian/libsaimetadata.install @@ -0,0 +1 @@ +usr/lib/*/libsaimetadata.so.* diff --git a/debian/libsaivs-dev.links b/debian/libsaivs-dev.links index 741e6f1110da..755dc283de57 100755 --- a/debian/libsaivs-dev.links +++ b/debian/libsaivs-dev.links @@ -1,2 +1,2 @@ #! /usr/bin/dh-exec -/usr/lib/${DEB_HOST_MULTIARCH}/libsai.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsai.so +/usr/lib/${DEB_HOST_MULTIARCH}/libsaivs.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsaivs.so diff --git a/debian/libsaivs.install b/debian/libsaivs.install index bc673b79f978..740a14b2c12e 100644 --- a/debian/libsaivs.install +++ b/debian/libsaivs.install @@ -1 +1 @@ -usr/lib/*/libsai.so.* +usr/lib/*/libsaivs.so.* diff --git a/debian/syncd.install b/debian/syncd.install index 3caf08218f0b..6c64b7267cb5 100644 --- a/debian/syncd.install +++ b/debian/syncd.install @@ -1,2 +1,2 @@ -usr/bin/* +usr/bin/syncd* etc/* diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h index 5b2cc1e09118..7568401a33c5 100644 --- a/lib/inc/sai_redis.h +++ b/lib/inc/sai_redis.h @@ -13,7 +13,7 @@ extern "C" { } #include "meta/saiserialize.h" #include "meta/saiattributelist.h" -#include "redisclient.h" +#include "common/redisclient.h" #include "swss/dbconnector.h" #include "swss/producertable.h" @@ -23,7 +23,7 @@ extern "C" { #include "swss/table.h" #include "swss/select.h" #include "swss/logger.h" -#include "sai_meta.h" +#include "meta/sai_meta.h" extern volatile bool g_record; extern void setRecording(bool record); diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index c9a40a9a95d1..27ea60a89ac3 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -1,42 +1,4 @@ -AM_CPPFLAGS = -AM_CPPFLAGS += -I/usr/include/sai -I/usr/include/swss -I$(top_srcdir)/common -AM_CPPFLAGS += -I../inc -I../../meta -AM_CPPFLAGS += \ - -Wcast-align \ - -Wcast-qual \ - -Wconversion \ - -Wdisabled-optimization \ - -Werror \ - -Wextra \ - -Wfloat-equal \ - -Wformat=2 \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-y2k \ - -Wimport \ - -Winit-self \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wmissing-field-initializers \ - -Wmissing-format-attribute \ - -Wmissing-include-dirs \ - -Wmissing-noreturn \ - -Wno-aggregate-return \ - -Wno-padded \ - -Wno-switch-enum \ - -Wno-unused-parameter \ - -Wpacked \ - -Wpointer-arith \ - -Wredundant-decls \ - -Wstack-protector \ - -Wstrict-aliasing=3 \ - -Wswitch \ - -Wswitch-default \ - -Wunreachable-code \ - -Wunused \ - -Wvariadic-macros \ - -Wwrite-strings +AM_CPPFLAGS = -I/usr/include/sai -I$(top_srcdir) -I$(top_srcdir)/lib/inc if DEBUG DBGFLAGS = -ggdb -D_DEBUG_ @@ -80,38 +42,7 @@ libsairedis_la_SOURCES = \ sai_redis_generic_get.cpp \ sai_redis_notifications.cpp \ sai_redis_record.cpp \ - ../../common/redisclient.cpp \ - ../../meta/saiserialize.cpp \ - ../../meta/saiattributelist.cpp \ - ../../meta/sai_meta.cpp \ - ../../meta/sai_meta_sanity.cpp \ - ../../meta/sai_meta_acl.cpp \ - ../../meta/sai_meta_buffer.cpp \ - ../../meta/sai_meta_fdb.cpp \ - ../../meta/sai_meta_hash.cpp \ - ../../meta/sai_meta_hostintf.cpp \ - ../../meta/sai_meta_lag.cpp \ - ../../meta/sai_meta_mirror.cpp \ - ../../meta/sai_meta_neighbor.cpp \ - ../../meta/sai_meta_nexthop.cpp \ - ../../meta/sai_meta_nexthopgroup.cpp \ - ../../meta/sai_meta_policer.cpp \ - ../../meta/sai_meta_port.cpp \ - ../../meta/sai_meta_qosmaps.cpp \ - ../../meta/sai_meta_queue.cpp \ - ../../meta/sai_meta_route.cpp \ - ../../meta/sai_meta_router.cpp \ - ../../meta/sai_meta_routerintf.cpp \ - ../../meta/sai_meta_samplepacket.cpp \ - ../../meta/sai_meta_scheduler.cpp \ - ../../meta/sai_meta_schedulergroup.cpp \ - ../../meta/sai_meta_stp.cpp \ - ../../meta/sai_meta_switch.cpp \ - ../../meta/sai_meta_tunnel.cpp \ - ../../meta/sai_meta_udf.cpp \ - ../../meta/sai_meta_vlan.cpp \ - ../../meta/sai_meta_wred.cpp + ../../common/redisclient.cpp libsairedis_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) - libsairedis_la_LIBADD = -lhiredis -lswsscommon diff --git a/lib/src/sai_redis_notifications.cpp b/lib/src/sai_redis_notifications.cpp index 59e91d6c90bd..3d396629c3f5 100644 --- a/lib/src/sai_redis_notifications.cpp +++ b/lib/src/sai_redis_notifications.cpp @@ -16,8 +16,6 @@ void handle_switch_state_change( if (on_switch_state_change != NULL) { - SWSS_LOG_ENTER(); - on_switch_state_change(switch_oper_status); } } @@ -56,8 +54,6 @@ void handle_fdb_event( if (on_fdb_event != NULL) { - SWSS_LOG_ENTER(); - on_fdb_event(count, fdbdata.data()); } @@ -102,8 +98,6 @@ void handle_port_state_change( if (on_port_state_change != NULL) { - SWSS_LOG_ENTER(); - on_port_state_change(count, portdata.data()); } } @@ -136,8 +130,6 @@ void handle_port_event( if (on_port_event != NULL) { - SWSS_LOG_ENTER(); - on_port_event(count, portdata.data()); } } @@ -153,8 +145,6 @@ void handle_switch_shutdown_request( if (on_switch_shutdown_request != NULL) { - SWSS_LOG_ENTER(); - on_switch_shutdown_request(); } } @@ -185,8 +175,6 @@ void handle_packet_event( if (on_packet_event != NULL) { - SWSS_LOG_ENTER(); - on_packet_event(buffer.data(), buffer_size, list.get_attr_count(), list.get_attr_list()); } } diff --git a/meta/Makefile b/meta/Makefile deleted file mode 100644 index 3bf7a6ae33b1..000000000000 --- a/meta/Makefile +++ /dev/null @@ -1,117 +0,0 @@ -warnings = \ - -Wall \ - -Wcast-align \ - -Wcast-qual \ - -Wconversion \ - -Wdisabled-optimization \ - -Werror \ - -Wextra \ - -Wextra \ - -Wfloat-equal \ - -Wformat=2 \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-y2k \ - -Wimport \ - -Winit-self \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wmissing-field-initializers \ - -Wmissing-format-attribute \ - -Wmissing-include-dirs \ - -Wmissing-noreturn \ - -Wno-aggregate-return \ - -Wno-padded \ - -Wno-switch-enum \ - -Wno-unused-parameter \ - -Wpacked \ - -Wpointer-arith \ - -Wredundant-decls \ - -Wshadow \ - -Wstack-protector \ - -Wstrict-aliasing=2 \ - -Wswitch \ - -Wswitch-default \ - -Wunreachable-code \ - -Wunused \ - -Wvariadic-macros \ - -Wwrite-strings -# -pedantic \ -# -pedantic-errors \ - -OBJ = \ - sai_extra_acl.o \ - sai_extra_buffer.o \ - sai_extra_fdb.o \ - sai_extra_hash.o \ - sai_extra_hostintf.o \ - sai_extra_lag.o \ - sai_extra_mirror.o \ - sai_extra_neighbor.o \ - sai_extra_nexthopgroup.o \ - sai_extra_nexthop.o \ - sai_extra_policer.o \ - sai_extra_port.o \ - sai_extra_qosmaps.o \ - sai_extra_queue.o \ - sai_extra_route.o \ - sai_extra_routerintf.o \ - sai_extra_router.o \ - sai_extra_samplepacket.o \ - sai_extra_schedulergroup.o \ - sai_extra_scheduler.o \ - sai_extra_stp.o \ - sai_extra_switch.o \ - sai_extra_tunnel.o \ - sai_extra_udf.o \ - sai_extra_vlan.o \ - sai_extra_wred.o \ - saiserialize.o \ - sai_meta.o \ - sai_meta_sanity.o \ - sai_meta_acl.o \ - sai_meta_buffer.o \ - sai_meta_fdb.o \ - sai_meta_hash.o \ - sai_meta_hostintf.o \ - sai_meta_lag.o \ - sai_meta_mirror.o \ - sai_meta_neighbor.o \ - sai_meta_nexthopgroup.o \ - sai_meta_nexthop.o \ - sai_meta_policer.o \ - sai_meta_port.o \ - sai_meta_qosmaps.o \ - sai_meta_queue.o \ - sai_meta_route.o \ - sai_meta_routerintf.o \ - sai_meta_router.o \ - sai_meta_samplepacket.o \ - sai_meta_schedulergroup.o \ - sai_meta_scheduler.o \ - sai_meta_stp.o \ - sai_meta_switch.o \ - sai_meta_tunnel.o \ - sai_meta_udf.o \ - sai_meta_vlan.o \ - sai_meta_wred.o - -DEPS = sai_meta.h sai_extra.h - -CFLAGS=-std=c++11 -I/usr/include/swss -I/usr/include/sai -I/usr/include -I. -I.. $(warnings) -LDFLAGS=-L/usr/lib -lswsscommon - -all: tests - -%.o: %.cpp $(DEPS) - g++ -c -o $@ $< $(CFLAGS) - -tests: tests.o $(OBJ) - g++ -o $@ $^ $(LDFLAGS) - -.PHONY: clean - -clean: - rm -f *~ .*~ tests *.o *.lo - diff --git a/meta/Makefile.am b/meta/Makefile.am new file mode 100644 index 000000000000..d80b2ecc5a4c --- /dev/null +++ b/meta/Makefile.am @@ -0,0 +1,81 @@ +AM_CPPFLAGS = -I/usr/include/sai + +if DEBUG +DBGFLAGS = -ggdb -D_DEBUG_ +else +DBGFLAGS = -g +endif + +lib_LTLIBRARIES = libsaimetadata.la + +libsaimetadata_la_SOURCES = \ + sai_extra_acl.cpp \ + sai_extra_buffer.cpp \ + sai_extra_fdb.cpp \ + sai_extra_hash.cpp \ + sai_extra_hostintf.cpp \ + sai_extra_lag.cpp \ + sai_extra_mirror.cpp \ + sai_extra_neighbor.cpp \ + sai_extra_nexthopgroup.cpp \ + sai_extra_nexthop.cpp \ + sai_extra_policer.cpp \ + sai_extra_port.cpp \ + sai_extra_qosmaps.cpp \ + sai_extra_queue.cpp \ + sai_extra_route.cpp \ + sai_extra_routerintf.cpp \ + sai_extra_router.cpp \ + sai_extra_samplepacket.cpp \ + sai_extra_schedulergroup.cpp \ + sai_extra_scheduler.cpp \ + sai_extra_stp.cpp \ + sai_extra_switch.cpp \ + sai_extra_tunnel.cpp \ + sai_extra_udf.cpp \ + sai_extra_vlan.cpp \ + sai_extra_wred.cpp \ + sai_meta_acl.cpp \ + sai_meta_buffer.cpp \ + sai_meta_fdb.cpp \ + sai_meta_hash.cpp \ + sai_meta_hostintf.cpp \ + sai_meta_lag.cpp \ + sai_meta_mirror.cpp \ + sai_meta_neighbor.cpp \ + sai_meta_nexthopgroup.cpp \ + sai_meta_nexthop.cpp \ + sai_meta.cpp \ + sai_meta_policer.cpp \ + sai_meta_port.cpp \ + sai_meta_qosmaps.cpp \ + sai_meta_queue.cpp \ + sai_meta_route.cpp \ + sai_meta_routerintf.cpp \ + sai_meta_router.cpp \ + sai_meta_samplepacket.cpp \ + sai_meta_sanity.cpp \ + sai_meta_schedulergroup.cpp \ + sai_meta_scheduler.cpp \ + sai_meta_stp.cpp \ + sai_meta_switch.cpp \ + sai_meta_tunnel.cpp \ + sai_meta_udf.cpp \ + sai_meta_vlan.cpp \ + sai_meta_wred.cpp \ + saiattributelist.cpp \ + saiserialize.cpp + +libsaimetadata_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +libsaimetadata_la_LIBADD = -lhiredis -lswsscommon + +bin_PROGRAMS = tests + +tests_SOURCES = tests.cpp +tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +tests_LDADD = -lhiredis -lswsscommon -lsai -lpthread -L$(top_dir)/meta/.libs -lsaimetadata + +#.PHONY: runtests +# +#runtests: +# ./tests diff --git a/player/Makefile b/player/Makefile deleted file mode 100644 index c3f9584b21df..000000000000 --- a/player/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -warnings = \ - -Wall \ - -Wcast-align \ - -Wcast-qual \ - -Wconversion \ - -Wdisabled-optimization \ - -Werror \ - -Wextra \ - -Wextra \ - -Wfloat-equal \ - -Wformat=2 \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-y2k \ - -Wimport \ - -Winit-self \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wmissing-field-initializers \ - -Wmissing-format-attribute \ - -Wmissing-include-dirs \ - -Wno-aggregate-return \ - -Wno-padded \ - -Wno-switch-enum \ - -Wno-unused-parameter \ - -Wno-unused-variable \ - -Wpacked \ - -Wpointer-arith \ - -Wredundant-decls \ - -Wshadow \ - -Wstack-protector \ - -Wstrict-aliasing=2 \ - -Wswitch \ - -Wswitch-default \ - -Wunreachable-code \ - -Wunused \ - -Wvariadic-macros \ - -Wno-write-strings - -OBJ = \ - player.o - -DEPS = - -CFLAGS=-std=c++11 -I/usr/include/swss -I/usr/include/sai -I/usr/include -I.. $(warnings) -LDFLAGS=-lpthread -lsairedis -lswsscommon - -all: player - -%.o: %.cpp $(DEPS) - g++ -c -o $@ $< $(CFLAGS) - -player: player.o $(OBJ) - g++ -o $@ $^ $(LDFLAGS) - -.PHONY: clean - -clean: - rm -f *~ .*~ player *.o *.lo - diff --git a/player/Makefile.am b/player/Makefile.am new file mode 100644 index 000000000000..cad2bc138436 --- /dev/null +++ b/player/Makefile.am @@ -0,0 +1,13 @@ +AM_CPPFLAGS = -I/usr/include/sai -I$(top_srcdir)/common + +bin_PROGRAMS = player + +if DEBUG +DBGFLAGS = -ggdb -DDEBUG +else +DBGFLAGS = -g +endif + +player_SOURCES = player.cpp +player_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +player_LDADD = -lhiredis -lswsscommon -lsairedis -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata diff --git a/player/player.cpp b/player/player.cpp index b9898eff206c..3b5116a70d78 100644 --- a/player/player.cpp +++ b/player/player.cpp @@ -265,6 +265,7 @@ void on_port_event( SWSS_LOG_ENTER(); } +void on_switch_shutdown_request() __attribute__ ((noreturn)); void on_switch_shutdown_request() { SWSS_LOG_ENTER(); diff --git a/syncd/Makefile.am b/syncd/Makefile.am index 067aba590516..87b4089a98ee 100644 --- a/syncd/Makefile.am +++ b/syncd/Makefile.am @@ -1,5 +1,4 @@ -AM_CPPFLAGS = -AM_CPPFLAGS += -I$(top_srcdir)/common +AM_CPPFLAGS = -I/usr/include/sai -I$(top_srcdir)/vslib/inc bin_PROGRAMS = syncd syncd_request_shutdown @@ -21,20 +20,17 @@ if SAICAVM SAIFLAGS = -DCAVMSAI endif -syncd_SOURCES = syncd.cpp \ - syncd_init.cpp \ - syncd_reinit.cpp \ - syncd_hard_reinit.cpp \ - syncd_notifications.cpp \ - syncd_counters.cpp \ - ../common/redisclient.cpp \ - ../meta/saiserialize.cpp \ - ../meta/saiattributelist.cpp - -syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) \ - -I$(top_srcdir)/lib/inc \ - -I/usr/include/sai $(SAIFLAGS) -syncd_LDADD = -lhiredis -lswsscommon -lsai -lpthread +syncd_SOURCES = \ + syncd.cpp \ + syncd_init.cpp \ + syncd_reinit.cpp \ + syncd_hard_reinit.cpp \ + syncd_notifications.cpp \ + syncd_counters.cpp \ + ../common/redisclient.cpp + +syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +syncd_LDADD = -lhiredis -lswsscommon -lsai -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata if SAITHRIFT SAI_RPC_INCLUDE_DIR = ../libsaiserver/include @@ -44,8 +40,5 @@ syncd_LDADD += -L$(SAI_RPC_LIB_DIR) -lrpcserver -lthrift endif syncd_request_shutdown_SOURCES = syncd_request_shutdown.cpp - syncd_request_shutdown_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) - syncd_request_shutdown_LDADD = -lhiredis -lswsscommon -lpthread - diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp index 3c936fd980b8..99394c91c107 100644 --- a/syncd/syncd.cpp +++ b/syncd/syncd.cpp @@ -458,7 +458,7 @@ int profile_get_next_value( return 0; } -const service_method_table_t test_services = { +service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -1031,7 +1031,7 @@ cmdOptions handleCmdLine(int argc, char **argv) { SWSS_LOG_ENTER(); - cmdOptions options = {}; + cmdOptions options; const int defaultCountersThreadIntervalInSeconds = 1; diff --git a/syncd/syncd.h b/syncd/syncd.h index 6906d015080f..5d800f3f8cef 100644 --- a/syncd/syncd.h +++ b/syncd/syncd.h @@ -165,8 +165,6 @@ extern sai_wred_api_t *sai_wred_api; extern sai_switch_notification_t switch_notifications; -extern swss::DBConnector *db; - void initialize_common_api_pointers(); void populate_sai_apis(); diff --git a/syncd/syncd_counters.cpp b/syncd/syncd_counters.cpp index 3e93a1817326..467ac287baca 100644 --- a/syncd/syncd_counters.cpp +++ b/syncd/syncd_counters.cpp @@ -14,7 +14,7 @@ void collectCounters(swss::Table &countersTable, SWSS_LOG_TIMER("get counters"); - uint32_t countersSize = supportedCounters.size(); + uint32_t countersSize = (uint32_t)supportedCounters.size(); std::vector counters; diff --git a/syncd/syncd_hard_reinit.cpp b/syncd/syncd_hard_reinit.cpp index cd72bac6f84f..145555e65a44 100644 --- a/syncd/syncd_hard_reinit.cpp +++ b/syncd/syncd_hard_reinit.cpp @@ -62,10 +62,10 @@ std::shared_ptr redisGetAttributesFromAsicKey(const std::strin for (auto &kv: hash) { - const std::string &key = kv.first; - const std::string &value = kv.second; + const std::string &skey = kv.first; + const std::string &svalue = kv.second; - swss::FieldValueTuple fvt(key, value); + swss::FieldValueTuple fvt(skey, svalue); values.push_back(fvt); } @@ -179,7 +179,7 @@ void saiRemoveDefaultVlanMembers() attr.id = SAI_VLAN_ATTR_MEMBER_LIST; - attr.value.objlist.count = vlanMemberList.size(); + attr.value.objlist.count = (uint32_t)vlanMemberList.size(); attr.value.objlist.list = vlanMemberList.data(); sai_status_t status = sai_vlan_api->get_vlan_attribute(DEFAULT_VLAN_NUMBER, 1, &attr); @@ -513,9 +513,9 @@ void processAttributesForOids(sai_object_type_t objectType, std::shared_ptr #include -#include "sai_meta.h" - +#include "meta/sai_meta.h" #include "meta/saiserialize.h" #include "meta/saiattributelist.h" diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am index a8c21cf1f488..7bb0b4277611 100644 --- a/vslib/src/Makefile.am +++ b/vslib/src/Makefile.am @@ -1,47 +1,4 @@ -WARNINGS = \ - -ansi \ - -Wall \ - -Wcast-align \ - -Wcast-qual \ - -Wconversion \ - -Wdisabled-optimization \ - -Werror \ - -Wextra \ - -Wextra \ - -Wfloat-equal \ - -Wformat=2 \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-y2k \ - -Wimport \ - -Winit-self \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wmissing-field-initializers \ - -Wmissing-format-attribute \ - -Wmissing-include-dirs \ - -Wmissing-noreturn \ - -Wno-aggregate-return \ - -Wno-padded \ - -Wno-switch-enum \ - -Wno-unused-parameter \ - -Wpacked \ - -Wpointer-arith \ - -Wredundant-decls \ - -Wshadow \ - -Wstack-protector \ - -Wstrict-aliasing=3 \ - -Wswitch \ - -Wswitch-default \ - -Wunreachable-code \ - -Wunused \ - -Wvariadic-macros \ - -Wwrite-strings - -AM_CPPFLAGS = -AM_CPPFLAGS += -I/usr/include/sai -I/usr/include/swss -I$(top_srcdir)/common -AM_CPPFLAGS += -I../inc -I../../meta $(WARNINGS) +AM_CPPFLAGS = -I/usr/include/sai -I$(top_srcdir)/vslib/inc if DEBUG DBGFLAGS = -ggdb -D_DEBUG_ @@ -49,72 +6,41 @@ else DBGFLAGS = -g endif -lib_LTLIBRARIES = libsai.la - -libsai_la_SOURCES = \ - ../../meta/saiattributelist.cpp \ - ../../meta/saiserialize.cpp \ - ../../meta/sai_meta_acl.cpp \ - ../../meta/sai_meta_buffer.cpp \ - ../../meta/sai_meta.cpp \ - ../../meta/sai_meta_fdb.cpp \ - ../../meta/sai_meta_hash.cpp \ - ../../meta/sai_meta_hostintf.cpp \ - ../../meta/sai_meta_lag.cpp \ - ../../meta/sai_meta_mirror.cpp \ - ../../meta/sai_meta_neighbor.cpp \ - ../../meta/sai_meta_nexthop.cpp \ - ../../meta/sai_meta_nexthopgroup.cpp \ - ../../meta/sai_meta_policer.cpp \ - ../../meta/sai_meta_port.cpp \ - ../../meta/sai_meta_qosmaps.cpp \ - ../../meta/sai_meta_queue.cpp \ - ../../meta/sai_meta_route.cpp \ - ../../meta/sai_meta_router.cpp \ - ../../meta/sai_meta_routerintf.cpp \ - ../../meta/sai_meta_samplepacket.cpp \ - ../../meta/sai_meta_sanity.cpp \ - ../../meta/sai_meta_scheduler.cpp \ - ../../meta/sai_meta_schedulergroup.cpp \ - ../../meta/sai_meta_stp.cpp \ - ../../meta/sai_meta_switch.cpp \ - ../../meta/sai_meta_tunnel.cpp \ - ../../meta/sai_meta_udf.cpp \ - ../../meta/sai_meta_vlan.cpp \ - ../../meta/sai_meta_wred.cpp \ - sai_vs_acl.cpp \ - sai_vs_buffer.cpp \ - sai_vs_fdb.cpp \ - sai_vs_generic_create.cpp \ - sai_vs_generic_get.cpp \ - sai_vs_generic_remove.cpp \ - sai_vs_generic_set.cpp \ - sai_vs_hash.cpp \ - sai_vs_hostintf.cpp \ - sai_vs_init.cpp \ - sai_vs_interfacequery.cpp \ - sai_vs_lag.cpp \ - sai_vs_mirror.cpp \ - sai_vs_neighbor.cpp \ - sai_vs_nexthop.cpp \ - sai_vs_nexthopgroup.cpp \ - sai_vs_policer.cpp \ - sai_vs_port.cpp \ - sai_vs_qosmaps.cpp \ - sai_vs_queue.cpp \ - sai_vs_route.cpp \ - sai_vs_router.cpp \ - sai_vs_routerintf.cpp \ - sai_vs_samplepacket.cpp \ - sai_vs_scheduler.cpp \ - sai_vs_schedulergroup.cpp \ - sai_vs_stp.cpp \ - sai_vs_switch.cpp \ - sai_vs_tunnel.cpp \ - sai_vs_udf.cpp \ - sai_vs_vlan.cpp \ - sai_vs_wred.cpp +lib_LTLIBRARIES = libsaivs.la -libsai_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +libsaivs_la_SOURCES = \ + sai_vs_acl.cpp \ + sai_vs_buffer.cpp \ + sai_vs_fdb.cpp \ + sai_vs_generic_create.cpp \ + sai_vs_generic_get.cpp \ + sai_vs_generic_remove.cpp \ + sai_vs_generic_set.cpp \ + sai_vs_hash.cpp \ + sai_vs_hostintf.cpp \ + sai_vs_init.cpp \ + sai_vs_interfacequery.cpp \ + sai_vs_lag.cpp \ + sai_vs_mirror.cpp \ + sai_vs_neighbor.cpp \ + sai_vs_nexthop.cpp \ + sai_vs_nexthopgroup.cpp \ + sai_vs_policer.cpp \ + sai_vs_port.cpp \ + sai_vs_qosmaps.cpp \ + sai_vs_queue.cpp \ + sai_vs_route.cpp \ + sai_vs_router.cpp \ + sai_vs_routerintf.cpp \ + sai_vs_samplepacket.cpp \ + sai_vs_scheduler.cpp \ + sai_vs_schedulergroup.cpp \ + sai_vs_stp.cpp \ + sai_vs_switch.cpp \ + sai_vs_tunnel.cpp \ + sai_vs_udf.cpp \ + sai_vs_vlan.cpp \ + sai_vs_wred.cpp -libsai_la_LIBADD = -lhiredis -lswsscommon +libsaivs_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) +libsaivs_la_LIBADD = -lhiredis -lswsscommon