Commit d8ed7cbc authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot

Reorganize the stats directory

Summary: The source and tests for the stats directory was spread across folly/detail and folly/test, move them into folly/stats directly instead.

Reviewed By: yfeldblum

Differential Revision: D5216810

fbshipit-source-id: 00a8bb95a4f7830d0bc46b3f914f256a37833b78
parent b367f0fa
...@@ -7,7 +7,7 @@ MAYBE_EXCEPTION_TRACER = experimental/exception_tracer ...@@ -7,7 +7,7 @@ MAYBE_EXCEPTION_TRACER = experimental/exception_tracer
endif endif
SUBDIRS = . experimental $(MAYBE_INIT) test io/test experimental/io/test \ SUBDIRS = . experimental $(MAYBE_INIT) test io/test experimental/io/test \
$(MAYBE_EXCEPTION_TRACER) stats/test $(MAYBE_EXCEPTION_TRACER)
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
...@@ -82,7 +82,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -82,7 +82,6 @@ nobase_follyinclude_HEADERS = \
detail/SlowFingerprint.h \ detail/SlowFingerprint.h \
detail/SocketFastOpen.h \ detail/SocketFastOpen.h \
detail/StaticSingletonManager.h \ detail/StaticSingletonManager.h \
detail/Stats.h \
detail/ThreadLocalDetail.h \ detail/ThreadLocalDetail.h \
detail/TryDetail.h \ detail/TryDetail.h \
detail/TurnSequencer.h \ detail/TurnSequencer.h \
...@@ -367,6 +366,7 @@ nobase_follyinclude_HEADERS = \ ...@@ -367,6 +366,7 @@ nobase_follyinclude_HEADERS = \
ssl/OpenSSLVersionFinder.h \ ssl/OpenSSLVersionFinder.h \
ssl/SSLSession.h \ ssl/SSLSession.h \
ssl/detail/SSLSessionImpl.h \ ssl/detail/SSLSessionImpl.h \
stats/detail/Bucket.h \
stats/BucketedTimeSeries-defs.h \ stats/BucketedTimeSeries-defs.h \
stats/BucketedTimeSeries.h \ stats/BucketedTimeSeries.h \
stats/Histogram-defs.h \ stats/Histogram-defs.h \
...@@ -534,7 +534,10 @@ libfolly_la_SOURCES = \ ...@@ -534,7 +534,10 @@ libfolly_la_SOURCES = \
ssl/OpenSSLCertUtils.cpp \ ssl/OpenSSLCertUtils.cpp \
ssl/OpenSSLHash.cpp \ ssl/OpenSSLHash.cpp \
ssl/detail/SSLSessionImpl.cpp \ ssl/detail/SSLSessionImpl.cpp \
stats/Instantiations.cpp \ stats/BucketedTimeSeries.cpp \
stats/Histogram.cpp \
stats/MultiLevelTimeSeries.cpp \
stats/TimeseriesHistogram.cpp \
Subprocess.cpp \ Subprocess.cpp \
ThreadCachedArena.cpp \ ThreadCachedArena.cpp \
ThreadName.cpp \ ThreadName.cpp \
......
/*
* Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <folly/stats/BucketedTimeSeries.h>
#include <folly/stats/BucketedTimeSeries-defs.h>
namespace folly {
template class BucketedTimeSeries<int64_t>;
}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <chrono> #include <chrono>
#include <vector> #include <vector>
#include <folly/detail/Stats.h> #include <folly/stats/detail/Bucket.h>
namespace folly { namespace folly {
......
...@@ -21,25 +21,13 @@ ...@@ -21,25 +21,13 @@
* header files. * header files.
*/ */
#include <folly/stats/BucketedTimeSeries.h>
#include <folly/stats/BucketedTimeSeries-defs.h>
#include <folly/stats/Histogram.h> #include <folly/stats/Histogram.h>
#include <folly/stats/Histogram-defs.h> #include <folly/stats/Histogram-defs.h>
#include <folly/stats/MultiLevelTimeSeries.h>
#include <folly/stats/MultiLevelTimeSeries-defs.h>
#include <folly/stats/TimeseriesHistogram.h>
#include <folly/stats/TimeseriesHistogram-defs.h>
namespace folly { namespace folly {
template class BucketedTimeSeries<int64_t>;
template class Histogram<int64_t>; template class Histogram<int64_t>;
template class detail::HistogramBuckets<int64_t, Histogram<int64_t>::Bucket>; template class detail::HistogramBuckets<int64_t, Histogram<int64_t>::Bucket>;
template class MultiLevelTimeSeries<int64_t>;
template class TimeseriesHistogram<int64_t>;
// Histogram::getPercentileBucketIdx(), Histogram::getPercentileEstimate() // Histogram::getPercentileBucketIdx(), Histogram::getPercentileEstimate()
// and Histogram::computeTotalCount() // and Histogram::computeTotalCount()
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <vector> #include <vector>
#include <folly/CPortability.h> #include <folly/CPortability.h>
#include <folly/detail/Stats.h> #include <folly/stats/detail/Bucket.h>
namespace folly { namespace folly {
......
/*
* Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <folly/stats/MultiLevelTimeSeries.h>
#include <folly/stats/MultiLevelTimeSeries-defs.h>
namespace folly {
template class MultiLevelTimeSeries<int64_t>;
}
/*
* Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <folly/stats/TimeseriesHistogram.h>
#include <folly/stats/TimeseriesHistogram-defs.h>
namespace folly {
template class TimeseriesHistogram<int64_t>;
}
ACLOCAL_AMFLAGS = -I m4
CPPFLAGS = -I$(top_srcdir)/test/gtest/googletest/include
ldadd = $(top_builddir)/test/libfollytestmain.la
check_PROGRAMS = \
histogram_test
TESTS = $(check_PROGRAMS)
histogram_test_SOURCES = HistogramTest.cpp
histogram_test_LDADD = $(ldadd)
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/detail/Stats.h>
#include <folly/stats/BucketedTimeSeries-defs.h> #include <folly/stats/BucketedTimeSeries-defs.h>
#include <folly/stats/BucketedTimeSeries.h> #include <folly/stats/BucketedTimeSeries.h>
#include <folly/stats/MultiLevelTimeSeries-defs.h> #include <folly/stats/MultiLevelTimeSeries-defs.h>
#include <folly/stats/MultiLevelTimeSeries.h> #include <folly/stats/MultiLevelTimeSeries.h>
#include <folly/stats/detail/Bucket.h>
#include <array> #include <array>
......
...@@ -176,10 +176,6 @@ conv_benchmark_SOURCES = ConvBenchmark.cpp ...@@ -176,10 +176,6 @@ conv_benchmark_SOURCES = ConvBenchmark.cpp
conv_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la conv_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
check_PROGRAMS += conv_benchmark check_PROGRAMS += conv_benchmark
histogram_test_SOURCES = HistogramTest.cpp
histogram_test_LDADD = libfollytestmain.la
TESTS += histogram_test
group_varint_test_SOURCES = GroupVarintTest.cpp group_varint_test_SOURCES = GroupVarintTest.cpp
group_varint_test_LDADD = libfollytestmain.la group_varint_test_LDADD = libfollytestmain.la
TESTS += group_varint_test TESTS += group_varint_test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment