You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/12/20 19:34:50 UTC
svn commit: r1424626 - in /incubator/mesos/trunk: src/ third_party/
third_party/libprocess/ third_party/libprocess/third_party/
Author: benh
Date: Thu Dec 20 18:34:50 2012
New Revision: 1424626
URL: http://svn.apache.org/viewvc?rev=1424626&view=rev
Log:
Added Google perftools in libprocess.
From: Ben Mahler <be...@gmail.com>
Review: https://reviews.apache.org/r/8452
Added:
incubator/mesos/trunk/third_party/libprocess/third_party/gperftools-2.0.tar.gz
Modified:
incubator/mesos/trunk/src/Makefile.am
incubator/mesos/trunk/third_party/Makefile.am
incubator/mesos/trunk/third_party/libprocess/Makefile.am
incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
incubator/mesos/trunk/third_party/libprocess/third_party/versions.am
incubator/mesos/trunk/third_party/versions.am
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Thu Dec 20 18:34:50 2012
@@ -28,6 +28,7 @@ DISTRIBUTE = third_party/distribute-$(DI
PROTOBUF = third_party/protobuf-$(PROTOBUF_VERSION)
GLOG = third_party/glog-$(GLOG_VERSION)
GMOCK = third_party/gmock-$(GMOCK_VERSION)
+GPERFTOOLS = third_party/gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
LEVELDB = third_party/leveldb
ZOOKEEPER = third_party/zookeeper-$(ZOOKEEPER_VERSION)/src/c
@@ -305,6 +306,7 @@ libmesos_la_LIBADD = libmesos_no_third_p
# possible.)
libmesos_la_LIBADD += ../$(PROTOBUF)/src/libprotobuf.la
libmesos_la_LIBADD += ../$(GLOG)/libglog.la
+libmesos_la_LIBADD += ../$(GPERFTOOLS)/libprofiler.la
# We need to directly include the leveldb library in order to avoid
# the installed libmesos.la file to include leveldb in
Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Thu Dec 20 18:34:50 2012
@@ -37,6 +37,7 @@ BOTO = boto-$(BOTO_VERSION)
DISTRIBUTE = distribute-$(DISTRIBUTE_VERSION)
GLOG = glog-$(GLOG_VERSION)
GMOCK = gmock-$(GMOCK_VERSION)
+GPERFTOOLS = gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
LEVELDB = leveldb
PROTOBUF = protobuf-$(PROTOBUF_VERSION)
@@ -44,11 +45,11 @@ ZOOKEEPER = zookeeper-$(ZOOKEEPER_VERSIO
EXTRA_DIST = $(BOOST).tar.gz $(BOTO).zip $(DISTRIBUTE).tar.gz \
- $(GLOG).tar.gz $(GMOCK).tar.gz $(LEVELDB).tar.gz \
- $(PROTOBUF).tar.gz $(ZOOKEEPER).tar.gz
+ $(GLOG).tar.gz $(GMOCK).tar.gz $(GPERFTOOLS).tar.gz \
+ $(LEVELDB).tar.gz $(PROTOBUF).tar.gz $(ZOOKEEPER).tar.gz
CLEAN_EXTRACTED = $(BOOST) $(BOTO) $(DISTRIBUTE) $(GLOG) $(GMOCK) \
- $(LEVELDB) $(PROTOBUF) $(ZOOKEEPER)
+ $(GPERFTOOLS) $(LEVELDB) $(PROTOBUF) $(ZOOKEEPER)
# Convenience library for gmock/gtest.
@@ -85,6 +86,11 @@ $(GLOG)/libglog.la: $(GLOG)-stamp
$(MAKE) $(AM_MAKEFLAGS)
$(GMOCK)/src/gmock-all.cc: $(GMOCK)-stamp
+
+$(GPERFTOOLS)/libprofiler.la: $(GPERFTOOLS)-stamp
+ cd $(GPERFTOOLS) && ./configure $(CONFIGURE_ARGS) && \
+ $(MAKE) $(AM_MAKEFLAGS)
+
$(GTEST)/src/gtest-all.cc: $(GMOCK)-stamp
# TODO(charles): Figure out PIC options in our configure.ac or create
@@ -105,6 +111,7 @@ $(ZOOKEEPER)/src/c/libzookeeper_mt.la: $
$(MAKE) $(AM_MAKEFLAGS)
THIRD_PARTY_LIBS = $(BOOST)-stamp $(GLOG)/libglog.la \
+ $(GPERFTOOLS)/libprofiler.la \
$(LEVELDB)/libleveldb.a $(PROTOBUF)/src/libprotobuf.la \
$(PROTOBUF)/src/protoc
Modified: incubator/mesos/trunk/third_party/libprocess/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/Makefile.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/Makefile.am Thu Dec 20 18:34:50 2012
@@ -12,6 +12,7 @@ include third_party/versions.am
BOOST = third_party/boost-$(BOOST_VERSION)
GLOG = third_party/glog-$(GLOG_VERSION)
GMOCK = third_party/gmock-$(GMOCK_VERSION)
+GPERFTOOLS = third_party/gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
RY_HTTP_PARSER = third_party/ry-http-parser-$(RY_HTTP_PARSER_VERSION)
LIBEV = third_party/libev-$(LIBEV_VERSION)
@@ -31,7 +32,7 @@ libprocess_la_SOURCES = src/process.cpp
libprocess_la_CPPFLAGS = -I$(srcdir)/include -I$(BOOST) -I$(GLOG)/src \
-I$(RY_HTTP_PARSER) -I$(LIBEV) $(AM_CPPFLAGS)
-libprocess_la_LIBADD = $(GLOG)/libglog.la \
+libprocess_la_LIBADD = $(GLOG)/libglog.la $(GPERFTOOLS)/libprofiler.la \
third_party/libry_http_parser.la $(LIBEV)/libev.la
Modified: incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am Thu Dec 20 18:34:50 2012
@@ -17,15 +17,18 @@ include versions.am
BOOST = boost-$(BOOST_VERSION)
GLOG = glog-$(GLOG_VERSION)
GMOCK = gmock-$(GMOCK_VERSION)
+GPERFTOOLS = gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
RY_HTTP_PARSER = ry-http-parser-$(RY_HTTP_PARSER_VERSION)
LIBEV = libev-$(LIBEV_VERSION)
EXTRA_DIST = $(BOOST).tar.gz $(GLOG).tar.gz $(GMOCK).tar.gz \
- $(RY_HTTP_PARSER).tar.gz $(LIBEV).tar.gz libev-3.8.patch
+ $(GPERFTOOLS).tar.gz $(RY_HTTP_PARSER).tar.gz $(LIBEV).tar.gz \
+ libev-3.8.patch
-CLEAN_EXTRACTED = $(BOOST) $(GLOG) $(GMOCK) $(RY_HTTP_PARSER) $(LIBEV)
+CLEAN_EXTRACTED = $(BOOST) $(GLOG) $(GMOCK) $(GPERFTOOLS) \
+ $(RY_HTTP_PARSER) $(LIBEV)
# Convenience library for Ryan Dahl's HTTP parser.
@@ -66,6 +69,11 @@ $(GLOG)/libglog.la: $(GLOG)-stamp
$(MAKE) $(AM_MAKEFLAGS)
$(GMOCK)/src/gmock-all.cc: $(GMOCK)-stamp
+
+$(GPERFTOOLS)/libprofiler.la: $(GPERFTOOLS)-stamp
+ cd $(GPERFTOOLS) && ./configure $(CONFIGURE_ARGS) && \
+ $(MAKE) $(AM_MAKEFLAGS)
+
$(GTEST)/src/gtest-all.cc: $(GMOCK)-stamp
$(RY_HTTP_PARSER)/http_parser.c: $(RY_HTTP_PARSER)-stamp
@@ -74,7 +82,8 @@ $(LIBEV)/libev.la: $(LIBEV)-stamp
cd $(LIBEV) && ./configure $(CONFIGURE_ARGS) && \
$(MAKE) $(AM_MAKEFLAGS)
-THIRD_PARTY_LIBS = $(BOOST)-stamp $(GLOG)/libglog.la $(LIBEV)/libev.la
+THIRD_PARTY_LIBS = $(BOOST)-stamp $(GLOG)/libglog.la \
+ $(GPERFTOOLS)/libprofiler.la $(LIBEV)/libev.la
all-local: $(THIRD_PARTY_LIBS)
Added: incubator/mesos/trunk/third_party/libprocess/third_party/gperftools-2.0.tar.gz
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/gperftools-2.0.tar.gz?rev=1424626&view=auto
==============================================================================
Files incubator/mesos/trunk/third_party/libprocess/third_party/gperftools-2.0.tar.gz (added) and incubator/mesos/trunk/third_party/libprocess/third_party/gperftools-2.0.tar.gz Thu Dec 20 18:34:50 2012 differ
Modified: incubator/mesos/trunk/third_party/libprocess/third_party/versions.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/versions.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/versions.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/versions.am Thu Dec 20 18:34:50 2012
@@ -5,5 +5,6 @@
BOOST_VERSION = 1.51.0
GLOG_VERSION = 0.3.1
GMOCK_VERSION = 1.6.0
+GPERFTOOLS_VERSION = 2.0
RY_HTTP_PARSER_VERSION = 1c3624a
LIBEV_VERSION = 3.8
Modified: incubator/mesos/trunk/third_party/versions.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/versions.am?rev=1424626&r1=1424625&r2=1424626&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/versions.am (original)
+++ incubator/mesos/trunk/third_party/versions.am Thu Dec 20 18:34:50 2012
@@ -24,5 +24,6 @@ BOTO_VERSION = 2.0b2
DISTRIBUTE_VERSION = 0.6.26
GLOG_VERSION = 0.3.1
GMOCK_VERSION = 1.6.0
+GPERFTOOLS_VERSION = 2.0
PROTOBUF_VERSION = 2.4.1
ZOOKEEPER_VERSION = 3.3.4