Allow compiling without jemalloc

6 years ago · 7c1fb6acd1
parent dd04dc3da4
commit 7c1fb6acd1
2 changed files with 3 additions and 1 deletions
--- a/lib/ProxySQL_Admin.cpp
+++ b/lib/ProxySQL_Admin.cpp
@ -7629,12 +7629,14 @@ void ProxySQL_Admin::p_stats___memory_metrics() {
 		retained  = 0,
 		sz        = sizeof(size_t);

+#ifndef NOJEM
 	mallctl("stats.resident", &resident, &sz, NULL, 0);
 	mallctl("stats.active", &active, &sz, NULL, 0);
 	mallctl("stats.allocated", &allocated, &sz, NULL, 0);
 	mallctl("stats.mapped", &mapped, &sz, NULL, 0);
 	mallctl("stats.metadata", &metadata, &sz, NULL, 0);
 	mallctl("stats.retained", &retained, &sz, NULL, 0);
+#endif // NOJEM

 	this->metrics.p_gauge_array[p_admin_gauge::jemalloc_resident]->Set(resident);
 	this->metrics.p_gauge_array[p_admin_gauge::jemalloc_active]->Set(active);
--- a/src/Makefile
+++ b/src/Makefile
@ -98,7 +98,7 @@ MYCXXFLAGS=-std=c++11 $(IDIRS) $(OPTZ) $(DEBUG) $(PSQLCH) -DGITVERSION=\"$(GIT_V
 LDFLAGS+=
 NOJEMALLOC := $(shell echo $(NOJEMALLOC))
 ifeq ($(NOJEMALLOC),1)
-MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lmicrohttpd -lhttpserver -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt -lprometheus-cpp-pull -lprometheus-cpp-core $(EXTRALINK)
+MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt -lprometheus-cpp-pull -lprometheus-cpp-core $(EXTRALINK)
 else
 MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt -lprometheus-cpp-pull -lprometheus-cpp-core $(EXTRALINK)
 endif