change back to use gcovpreload.c

xumia · Jan 21, 2024 · 854c424 · 854c424
1 parent 91090c1
commit 854c424
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 29 deletions.
diff --git a/cfgmgr/Makefile.am b/cfgmgr/Makefile.am
@@ -102,20 +102,20 @@ macsecmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(
 macsecmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
 if GCOV_ENABLED
-vlanmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-teammgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-portmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-fabricmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-intfmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-buffermgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-vrfmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-nbrmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-vxlanmgrd_SOURCES +=  ../gcovpreload/gcovpreload.cpp
-sflowmgrd_SOURCES +=  ../gcovpreload/gcovpreload.cpp
-natmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-coppmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-tunnelmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
-macsecmgrd_SOURCES += ../gcovpreload/gcovpreload.cpp
+vlanmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+teammgrd_SOURCES += ../gcovpreload/gcovpreload.c
+portmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+fabricmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+intfmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+buffermgrd_SOURCES += ../gcovpreload/gcovpreload.c
+vrfmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+nbrmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+vxlanmgrd_SOURCES +=  ../gcovpreload/gcovpreload.c
+sflowmgrd_SOURCES +=  ../gcovpreload/gcovpreload.c
+natmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+coppmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+tunnelmgrd_SOURCES += ../gcovpreload/gcovpreload.c
+macsecmgrd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/fdbsyncd/Makefile.am b/fdbsyncd/Makefile.am
@@ -15,7 +15,7 @@ fdbsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(COV_CFLAGS) $(CF
 fdbsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon $(COV_LDFLAGS)
 
 if GCOV_ENABLED
-fdbsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+fdbsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/fpmsyncd/Makefile.am b/fpmsyncd/Makefile.am
@@ -15,7 +15,7 @@ fpmsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 fpmsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon
 
 if GCOV_ENABLED
-fpmsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+fpmsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/gcovpreload/Makefile b/gcovpreload/Makefile
@@ -6,7 +6,7 @@ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || ec
 
 DYLIBSUFFIX=so
 DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-DYLIB_MAKE_CMD=$(CC) -shared -fpic gcovpreload.cpp -o ${DYLIBNAME}
+DYLIB_MAKE_CMD=$(CC) -shared -fpic gcovpreload.c -o ${DYLIBNAME}
 
 all:
 	$(DYLIB_MAKE_CMD)

diff --git a/gcovpreload/gcovpreload.cpp → gcovpreload/gcovpreload.c b/gcovpreload/gcovpreload.cpp → gcovpreload/gcovpreload.c
@@ -3,13 +3,16 @@
 #include <signal.h>
 #include <signal.h>
 
-extern "C" void __gcov_dump();
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void sighandler(int signo)
 {
 #ifdef SIMPLE_WAY
     exit(signo);
 #else
+    extern void __gcov_dump();
     __gcov_dump();
     raise(signo); /* raise the signal again to crash process */
 #endif
@@ -41,3 +44,7 @@ void ctor()
         }
     }
 }
+
+#ifdef __cplusplus
+}   
+#endif
diff --git a/mclagsyncd/Makefile.am b/mclagsyncd/Makefile.am
@@ -15,7 +15,7 @@ mclagsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 mclagsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon
 
 if GCOV_ENABLED
-mclagsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+mclagsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/natsyncd/Makefile.am b/natsyncd/Makefile.am
@@ -15,7 +15,7 @@ natsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 natsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lnl-nf-3 -lswsscommon
 
 if GCOV_ENABLED
-natsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+natsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/neighsyncd/Makefile.am b/neighsyncd/Makefile.am
@@ -15,7 +15,7 @@ neighsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 neighsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon
 
 if GCOV_ENABLED
-neighsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+neighsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
@@ -148,9 +148,9 @@ orchagent_restart_check_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $
 orchagent_restart_check_LDADD = $(LDFLAGS_ASAN) -lhiredis -lswsscommon -lpthread
 
 if GCOV_ENABLED
-orchagent_SOURCES += ../gcovpreload/gcovpreload.cpp
-routeresync_SOURCES += ../gcovpreload/gcovpreload.cpp
-orchagent_restart_check_SOURCES += ../gcovpreload/gcovpreload.cpp
+orchagent_SOURCES += ../gcovpreload/gcovpreload.c
+routeresync_SOURCES += ../gcovpreload/gcovpreload.c
+orchagent_restart_check_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/portsyncd/Makefile.am b/portsyncd/Makefile.am
@@ -15,7 +15,7 @@ portsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 portsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lswsscommon
 
 if GCOV_ENABLED
-portsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+portsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/swssconfig/Makefile.am b/swssconfig/Makefile.am
@@ -21,8 +21,8 @@ swssplayer_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 swssplayer_LDADD = $(LDFLAGS_ASAN) -lswsscommon
 
 if GCOV_ENABLED
-swssconfig_SOURCES += ../gcovpreload/gcovpreload.cpp
-swssplayer_SOURCES += ../gcovpreload/gcovpreload.cpp
+swssconfig_SOURCES += ../gcovpreload/gcovpreload.c
+swssplayer_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/teamsyncd/Makefile.am b/teamsyncd/Makefile.am
@@ -15,7 +15,7 @@ teamsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
 teamsyncd_LDADD = $(LDFLAGS_ASAN) -lnl-3 -lnl-route-3 -lhiredis -lswsscommon -lteam
 
 if GCOV_ENABLED
-teamsyncd_SOURCES += ../gcovpreload/gcovpreload.cpp
+teamsyncd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED

diff --git a/tlm_teamd/Makefile.am b/tlm_teamd/Makefile.am
@@ -15,7 +15,7 @@ tlm_teamd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(JANSSON_CFLAGS)
 tlm_teamd_LDADD = $(LDFLAGS_ASAN) -lhiredis -lswsscommon -lteamdctl $(JANSSON_LIBS)
 
 if GCOV_ENABLED
-tlm_teamd_SOURCES += ../gcovpreload/gcovpreload.cpp
+tlm_teamd_SOURCES += ../gcovpreload/gcovpreload.c
 endif
 
 if ASAN_ENABLED