Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D9D55200CEC for ; Mon, 21 Aug 2017 23:03:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D8275165A90; Mon, 21 Aug 2017 21:03:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 93232165A82 for ; Mon, 21 Aug 2017 23:03:50 +0200 (CEST) Received: (qmail 13343 invoked by uid 500); 21 Aug 2017 21:03:49 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 13228 invoked by uid 99); 21 Aug 2017 21:03:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2017 21:03:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ECEC7E7DF8; Mon, 21 Aug 2017 21:03:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexey@apache.org To: commits@kudu.apache.org Date: Mon, 21 Aug 2017 21:03:49 -0000 Message-Id: <3c395b0e4b7b48d38e7b147c05f684e6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/14] kudu git commit: [iwyu] first pass archived-at: Mon, 21 Aug 2017 21:03:53 -0000 http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/knapsack_solver-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/knapsack_solver-test.cc b/src/kudu/util/knapsack_solver-test.cc index 00b04cd..9f717c4 100644 --- a/src/kudu/util/knapsack_solver-test.cc +++ b/src/kudu/util/knapsack_solver-test.cc @@ -15,13 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include -#include +#include +#include #include #include +#include + #include "kudu/util/knapsack_solver.h" -#include "kudu/util/stopwatch.h" +#include "kudu/util/stopwatch.h" // IWYU pragma: keep #include "kudu/util/test_util.h" using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/locks.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/locks.cc b/src/kudu/util/locks.cc index 2fe9661..380bee4 100644 --- a/src/kudu/util/locks.cc +++ b/src/kudu/util/locks.cc @@ -17,6 +17,7 @@ #include "kudu/util/locks.h" +#include "kudu/gutil/atomicops.h" #include "kudu/util/malloc.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/locks.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/locks.h b/src/kudu/util/locks.h index f4ab4a7..51467b9 100644 --- a/src/kudu/util/locks.h +++ b/src/kudu/util/locks.h @@ -17,11 +17,14 @@ #ifndef KUDU_UTIL_LOCKS_H #define KUDU_UTIL_LOCKS_H -#include -#include +#include + +#include // IWYU pragma: keep +#include #include -#include "kudu/gutil/atomicops.h" +#include + #include "kudu/gutil/dynamic_annotations.h" #include "kudu/gutil/macros.h" #include "kudu/gutil/port.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/logging-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/logging-test.cc b/src/kudu/util/logging-test.cc index e3a0771..d9ba2ca 100644 --- a/src/kudu/util/logging-test.cc +++ b/src/kudu/util/logging-test.cc @@ -16,20 +16,24 @@ // under the License. #include -#include -#include +#include +#include #include #include #include +#include +#include +#include + +#include "kudu/gutil/integral_types.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/async_logger.h" #include "kudu/util/barrier.h" -#include "kudu/util/locks.h" #include "kudu/util/logging.h" #include "kudu/util/logging_test_util.h" #include "kudu/util/monotime.h" -#include "kudu/util/stopwatch.h" +#include "kudu/util/test_macros.h" // IWYU pragma: keep #include "kudu/util/test_util.h" using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/logging.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/logging.cc b/src/kudu/util/logging.cc index c62bfe7..64ada87 100644 --- a/src/kudu/util/logging.cc +++ b/src/kudu/util/logging.cc @@ -16,34 +16,36 @@ // under the License. #include "kudu/util/logging.h" -#include +#include #include +#include +#include #include -#include #include -#include -#include -#include +#include // IWYU pragma: keep -#include -#include +#include #include +#include #include -#include "kudu/gutil/callback.h" +#include "kudu/gutil/callback.h" // IWYU pragma: keep +#include "kudu/gutil/port.h" #include "kudu/gutil/spinlock.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/async_logger.h" #include "kudu/util/debug-util.h" #include "kudu/util/debug/leakcheck_disabler.h" -#include "kudu/util/env.h" #include "kudu/util/env_util.h" #include "kudu/util/flag_tags.h" +#include "kudu/util/logging_callback.h" #include "kudu/util/minidump.h" #include "kudu/util/signal.h" #include "kudu/util/status.h" +struct tm; + DEFINE_string(log_filename, "", "Prefix of log filename - " "full path is /.[INFO|WARN|ERROR|FATAL]"); http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/logging.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/logging.h b/src/kudu/util/logging.h index 682431e..bbef2d8 100644 --- a/src/kudu/util/logging.h +++ b/src/kudu/util/logging.h @@ -17,15 +17,16 @@ #ifndef KUDU_UTIL_LOGGING_H #define KUDU_UTIL_LOGGING_H +#include +#include #include -#include + #include #include "kudu/gutil/atomicops.h" #include "kudu/gutil/dynamic_annotations.h" #include "kudu/gutil/macros.h" #include "kudu/gutil/walltime.h" -#include "kudu/util/flags.h" #include "kudu/util/logging_callback.h" #include "kudu/util/status.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/maintenance_manager-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/maintenance_manager-test.cc b/src/kudu/util/maintenance_manager-test.cc index 9e9654e..7cc6398 100644 --- a/src/kudu/util/maintenance_manager-test.cc +++ b/src/kudu/util/maintenance_manager-test.cc @@ -16,17 +16,27 @@ // under the License. #include +#include #include #include +#include +#include #include -#include +#include // IWYU pragma: keep +#include +#include #include +#include "kudu/gutil/port.h" +#include "kudu/gutil/ref_counted.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/maintenance_manager.h" -#include "kudu/util/mem_tracker.h" +#include "kudu/util/maintenance_manager.pb.h" #include "kudu/util/metrics.h" +#include "kudu/util/monotime.h" +#include "kudu/util/mutex.h" +#include "kudu/util/status.h" #include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" #include "kudu/util/thread.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/maintenance_manager.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/maintenance_manager.cc b/src/kudu/util/maintenance_manager.cc index dbe865f..3f27806 100644 --- a/src/kudu/util/maintenance_manager.cc +++ b/src/kudu/util/maintenance_manager.cc @@ -17,13 +17,18 @@ #include "kudu/util/maintenance_manager.h" -#include +#include +#include #include -#include +#include +#include #include -#include #include +#include +#include + +#include "kudu/gutil/dynamic_annotations.h" #include "kudu/gutil/map-util.h" #include "kudu/gutil/stringprintf.h" #include "kudu/gutil/strings/substitute.h" @@ -31,12 +36,15 @@ #include "kudu/util/debug/trace_logging.h" #include "kudu/util/flag_tags.h" #include "kudu/util/logging.h" +#include "kudu/util/maintenance_manager.pb.h" +#include "kudu/util/make_shared.h" #include "kudu/util/metrics.h" #include "kudu/util/process_memory.h" #include "kudu/util/random_util.h" #include "kudu/util/scoped_cleanup.h" #include "kudu/util/stopwatch.h" #include "kudu/util/thread.h" +#include "kudu/util/threadpool.h" #include "kudu/util/trace.h" using std::pair; @@ -114,6 +122,18 @@ void MaintenanceOp::Unregister() { manager_->UnregisterOp(this); } +MaintenanceManagerStatusPB_OpInstancePB OpInstance::DumpToPB() const { + MaintenanceManagerStatusPB_OpInstancePB pb; + pb.set_thread_id(thread_id); + pb.set_name(name); + if (duration.Initialized()) { + pb.set_duration_millis(duration.ToMilliseconds()); + } + MonoDelta delta(MonoTime::Now() - start_mono_time); + pb.set_millis_since_start(delta.ToMilliseconds()); + return pb; +} + const MaintenanceManager::Options MaintenanceManager::kDefaultOptions = { .num_threads = 0, .polling_interval_ms = 0, http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/maintenance_manager.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/maintenance_manager.h b/src/kudu/util/maintenance_manager.h index e939583..cfbc287 100644 --- a/src/kudu/util/maintenance_manager.h +++ b/src/kudu/util/maintenance_manager.h @@ -17,26 +17,29 @@ #pragma once -#include +#include +#include #include #include #include -#include +#include #include -#include +#include #include +#include +#include + +#include "kudu/gutil/gscoped_ptr.h" #include "kudu/gutil/macros.h" +#include "kudu/gutil/ref_counted.h" #include "kudu/util/atomic.h" #include "kudu/util/condition_variable.h" -#include "kudu/util/countdown_latch.h" -#include "kudu/util/maintenance_manager.pb.h" #include "kudu/util/monotime.h" #include "kudu/util/mutex.h" #include "kudu/util/random.h" -#include "kudu/util/thread.h" -#include "kudu/util/threadpool.h" +#include "kudu/util/status.h" namespace kudu { @@ -44,6 +47,10 @@ template class AtomicGauge; class Histogram; class MaintenanceManager; +class MaintenanceManagerStatusPB; +class MaintenanceManagerStatusPB_OpInstancePB; +class Thread; +class ThreadPool; class MaintenanceOpStats { public: @@ -156,17 +163,7 @@ struct OpInstance { MonoDelta duration; MonoTime start_mono_time; - MaintenanceManagerStatusPB_OpInstancePB DumpToPB() const { - MaintenanceManagerStatusPB_OpInstancePB pb; - pb.set_thread_id(thread_id); - pb.set_name(name); - if (duration.Initialized()) { - pb.set_duration_millis(duration.ToMilliseconds()); - } - MonoDelta delta(MonoTime::Now() - start_mono_time); - pb.set_millis_since_start(delta.ToMilliseconds()); - return pb; - } + MaintenanceManagerStatusPB_OpInstancePB DumpToPB() const; }; // MaintenanceOp objects represent background operations that the http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/make_shared.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/make_shared.h b/src/kudu/util/make_shared.h index af254df..c534ebf 100644 --- a/src/kudu/util/make_shared.h +++ b/src/kudu/util/make_shared.h @@ -18,6 +18,10 @@ #ifndef KUDU_UTIL_MAKE_SHARED_H_ #define KUDU_UTIL_MAKE_SHARED_H_ +#ifdef __GLIBCXX__ +#include // IWYU pragma: export +#endif + #include // It isn't possible to use std::make_shared() with a class that has private http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/map-util-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/map-util-test.cc b/src/kudu/util/map-util-test.cc index eb456d3..afbee94 100644 --- a/src/kudu/util/map-util-test.cc +++ b/src/kudu/util/map-util-test.cc @@ -19,9 +19,12 @@ // part of util. #include "kudu/gutil/map-util.h" -#include #include #include +#include +#include + +#include using std::map; using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mem_tracker-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mem_tracker-test.cc b/src/kudu/util/mem_tracker-test.cc index 075931a..dbadd09 100644 --- a/src/kudu/util/mem_tracker-test.cc +++ b/src/kudu/util/mem_tracker-test.cc @@ -18,13 +18,20 @@ #include "kudu/util/mem_tracker.h" #include +#include +#include #include +#include #include #include #include #include +#include +#include + #include "kudu/gutil/strings/substitute.h" +#include "kudu/util/monotime.h" #include "kudu/util/test_util.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mem_tracker.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mem_tracker.cc b/src/kudu/util/mem_tracker.cc index 88e1d23..a074354 100644 --- a/src/kudu/util/mem_tracker.cc +++ b/src/kudu/util/mem_tracker.cc @@ -18,18 +18,20 @@ #include "kudu/util/mem_tracker.h" #include +#include #include #include #include #include -#include +#include + +#include // IWYU pragma: keep -#include "kudu/gutil/map-util.h" #include "kudu/gutil/once.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/mutex.h" #include "kudu/util/process_memory.h" -#include "kudu/util/status.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mem_tracker.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/mem_tracker.h b/src/kudu/util/mem_tracker.h index a43e9a2..0a5af4f 100644 --- a/src/kudu/util/mem_tracker.h +++ b/src/kudu/util/mem_tracker.h @@ -17,22 +17,20 @@ #ifndef KUDU_UTIL_MEM_TRACKER_H #define KUDU_UTIL_MEM_TRACKER_H +#include +#include #include #include -#include #include #include -#include "kudu/gutil/ref_counted.h" +#include + #include "kudu/util/high_water_mark.h" -#include "kudu/util/locks.h" #include "kudu/util/mutex.h" namespace kudu { -class Status; -class MemTracker; - // A MemTracker tracks memory consumption; it contains an optional limit and is // arranged into a tree structure such that the consumption tracked by a // MemTracker is also tracked by its ancestors. http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memcmpable_varint-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/memcmpable_varint-test.cc b/src/kudu/util/memcmpable_varint-test.cc index 8342937..fcbe25d 100644 --- a/src/kudu/util/memcmpable_varint-test.cc +++ b/src/kudu/util/memcmpable_varint-test.cc @@ -15,13 +15,20 @@ // specific language governing permissions and limitations // under the License. -#include +#include +#include +#include +#include +#include + #include +#include "kudu/util/faststring.h" #include "kudu/util/hexdump.h" #include "kudu/util/memcmpable_varint.h" #include "kudu/util/random.h" -#include "kudu/util/stopwatch.h" +#include "kudu/util/slice.h" +#include "kudu/util/stopwatch.h" // IWYU pragma: keep #include "kudu/util/test_util.h" // Add operator<< to print pairs, used in a test below. http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memcmpable_varint.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/memcmpable_varint.cc b/src/kudu/util/memcmpable_varint.cc index 35314f8..b30eff6 100644 --- a/src/kudu/util/memcmpable_varint.cc +++ b/src/kudu/util/memcmpable_varint.cc @@ -94,11 +94,11 @@ // 7 2**48-1 14.4 // 8 2**56-1 16.8 // 9 2**64-1 19.2 -// + +#include #include -#include "kudu/gutil/endian.h" #include "kudu/util/faststring.h" #include "kudu/util/memcmpable_varint.h" #include "kudu/util/slice.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memcmpable_varint.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/memcmpable_varint.h b/src/kudu/util/memcmpable_varint.h index c1ce071..955f89d 100644 --- a/src/kudu/util/memcmpable_varint.h +++ b/src/kudu/util/memcmpable_varint.h @@ -27,11 +27,13 @@ #ifndef KUDU_UTIL_MEMCMPABLE_VARINT_H #define KUDU_UTIL_MEMCMPABLE_VARINT_H -#include "kudu/util/faststring.h" -#include "kudu/util/slice.h" +#include namespace kudu { +class Slice; +class faststring; + void PutMemcmpableVarint64(faststring *dst, uint64_t value); // Standard Get... routines parse a value from the beginning of a Slice http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/arena-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/arena-test.cc b/src/kudu/util/memory/arena-test.cc index e476560..f4691c4 100644 --- a/src/kudu/util/memory/arena-test.cc +++ b/src/kudu/util/memory/arena-test.cc @@ -15,13 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include -#include -#include +#include +#include #include +#include #include #include +#include +#include +#include + #include "kudu/gutil/stringprintf.h" #include "kudu/util/memory/arena.h" #include "kudu/util/memory/memory.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/arena.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/arena.cc b/src/kudu/util/memory/arena.cc index 427072f..6f65df4 100644 --- a/src/kudu/util/memory/arena.cc +++ b/src/kudu/util/memory/arena.cc @@ -20,17 +20,10 @@ #include "kudu/util/memory/arena.h" #include +#include #include -#include "kudu/util/debug-util.h" -#include "kudu/util/flag_tags.h" - -using std::copy; -using std::max; using std::min; -using std::reverse; -using std::sort; -using std::swap; using std::unique_ptr; namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/arena.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/arena.h b/src/kudu/util/memory/arena.h index 1db5585..750e9d9 100644 --- a/src/kudu/util/memory/arena.h +++ b/src/kudu/util/memory/arena.h @@ -23,19 +23,24 @@ #ifndef KUDU_UTIL_MEMORY_ARENA_H_ #define KUDU_UTIL_MEMORY_ARENA_H_ -#include -#include +#include +#include +#include +#include #include -#include #include -#include -#include +#include #include +#include +#include + +#include "kudu/gutil/atomicops.h" #include "kudu/gutil/dynamic_annotations.h" #include "kudu/gutil/gscoped_ptr.h" -#include "kudu/gutil/logging-inl.h" #include "kudu/gutil/macros.h" +#include "kudu/gutil/port.h" +#include "kudu/gutil/strings/stringpiece.h" #include "kudu/util/alignment.h" #include "kudu/util/locks.h" #include "kudu/util/memory/memory.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/memory.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/memory.cc b/src/kudu/util/memory/memory.cc index e393540..b3964df 100644 --- a/src/kudu/util/memory/memory.cc +++ b/src/kudu/util/memory/memory.cc @@ -20,10 +20,11 @@ #include "kudu/util/memory/memory.h" -#include +#include #include #include +#include #include http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/memory.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/memory.h b/src/kudu/util/memory/memory.h index ffe0a7c..972589e 100644 --- a/src/kudu/util/memory/memory.h +++ b/src/kudu/util/memory/memory.h @@ -33,18 +33,22 @@ #define KUDU_UTIL_MEMORY_MEMORY_H_ #include -#include +#include +#include #include #include -#include +#include #include +#include + #include "kudu/util/boost_mutex_utils.h" #include "kudu/util/memory/overwrite.h" #include "kudu/util/mutex.h" #include "kudu/gutil/gscoped_ptr.h" -#include "kudu/gutil/logging-inl.h" +#include "kudu/gutil/integral_types.h" #include "kudu/gutil/macros.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/singleton.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/memory/overwrite.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/memory/overwrite.h b/src/kudu/util/memory/overwrite.h index 04286ed..37c6512 100644 --- a/src/kudu/util/memory/overwrite.h +++ b/src/kudu/util/memory/overwrite.h @@ -17,6 +17,8 @@ #ifndef KUDU_MEMORY_OVERWRITE_H #define KUDU_MEMORY_OVERWRITE_H +#include + #include "kudu/gutil/strings/stringpiece.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/metrics-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/metrics-test.cc b/src/kudu/util/metrics-test.cc index 7493056..698fd7d 100644 --- a/src/kudu/util/metrics-test.cc +++ b/src/kudu/util/metrics-test.cc @@ -15,18 +15,28 @@ // specific language governing permissions and limitations // under the License. -#include -#include +#include +#include #include #include #include +#include +#include +#include +#include + #include "kudu/gutil/bind.h" +#include "kudu/gutil/bind_helpers.h" +#include "kudu/gutil/gscoped_ptr.h" #include "kudu/gutil/map-util.h" +#include "kudu/gutil/ref_counted.h" #include "kudu/util/hdr_histogram.h" #include "kudu/util/jsonreader.h" #include "kudu/util/jsonwriter.h" #include "kudu/util/metrics.h" +#include "kudu/util/monotime.h" +#include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/metrics.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/metrics.cc b/src/kudu/util/metrics.cc index df226d4..a0d39ba 100644 --- a/src/kudu/util/metrics.cc +++ b/src/kudu/util/metrics.cc @@ -16,24 +16,21 @@ // under the License. #include "kudu/util/metrics.h" +#include +#include #include -#include #include -#include +#include #include +#include -#include "kudu/gutil/atomicops.h" -#include "kudu/gutil/casts.h" #include "kudu/gutil/map-util.h" #include "kudu/gutil/singleton.h" -#include "kudu/gutil/stl_util.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/flag_tags.h" #include "kudu/util/hdr_histogram.h" #include "kudu/util/histogram.pb.h" -#include "kudu/util/jsonwriter.h" -#include "kudu/util/locks.h" #include "kudu/util/status.h" DEFINE_int32(metrics_retirement_age_ms, 120 * 1000, http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/metrics.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/metrics.h b/src/kudu/util/metrics.h index b9b8509..f59a32c 100644 --- a/src/kudu/util/metrics.h +++ b/src/kudu/util/metrics.h @@ -223,7 +223,8 @@ // ///////////////////////////////////////////////////// -#include +#include +#include #include #include #include @@ -234,11 +235,14 @@ #include "kudu/gutil/bind.h" #include "kudu/gutil/callback.h" #include "kudu/gutil/casts.h" +#include "kudu/gutil/gscoped_ptr.h" +#include "kudu/gutil/macros.h" #include "kudu/gutil/map-util.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/ref_counted.h" -#include "kudu/gutil/singleton.h" #include "kudu/util/atomic.h" -#include "kudu/util/jsonwriter.h" +#include "kudu/util/hdr_histogram.h" +#include "kudu/util/jsonwriter.h" // IWYU pragma: keep #include "kudu/util/locks.h" #include "kudu/util/monotime.h" #include "kudu/util/status.h" @@ -317,6 +321,8 @@ #define METRIC_DECLARE_gauge_size METRIC_DECLARE_gauge_uint64 #endif +template class Singleton; + namespace kudu { class Counter; @@ -324,9 +330,10 @@ class CounterPrototype; template class AtomicGauge; +template +class Callback; template class FunctionGauge; -class Gauge; template class GaugePrototype; @@ -335,7 +342,6 @@ class MetricEntityPrototype; class MetricPrototype; class MetricRegistry; -class HdrHistogram; class Histogram; class HistogramPrototype; class HistogramSnapshotPB; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/minidump-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/minidump-test.cc b/src/kudu/util/minidump-test.cc index f4c44e2..5c756b6 100644 --- a/src/kudu/util/minidump-test.cc +++ b/src/kudu/util/minidump-test.cc @@ -15,19 +15,24 @@ // specific language governing permissions and limitations // under the License. -#include -#include #include +#include +#include +#include +#include #include #include -#include +#include +#include +#include -#include "kudu/gutil/strings/substitute.h" #include "kudu/util/minidump.h" #include "kudu/util/path_util.h" #include "kudu/util/test_macros.h" +#include "kudu/util/env.h" +#include "kudu/util/status.h" #include "kudu/util/test_util.h" using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/minidump.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/minidump.cc b/src/kudu/util/minidump.cc index c088ae7..d02dc5d 100644 --- a/src/kudu/util/minidump.cc +++ b/src/kudu/util/minidump.cc @@ -17,12 +17,14 @@ #include "kudu/util/minidump.h" -#include -#include #include #include +#include +#include +#include #include +#include #include #if defined(__linux__) @@ -31,17 +33,19 @@ #endif // defined(__linux__) #include +#include #include +#include "kudu/gutil/macros.h" #include "kudu/gutil/linux_syscall_support.h" #include "kudu/gutil/strings/human_readable.h" #include "kudu/util/errno.h" #include "kudu/util/env.h" #include "kudu/util/env_util.h" #include "kudu/util/flag_tags.h" -#include "kudu/util/logging.h" #include "kudu/util/path_util.h" #include "kudu/util/status.h" +#include "kudu/util/thread.h" using kudu::env_util::CreateDirIfMissing; using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/minidump.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/minidump.h b/src/kudu/util/minidump.h index 459639b..893440a 100644 --- a/src/kudu/util/minidump.h +++ b/src/kudu/util/minidump.h @@ -22,8 +22,6 @@ #include #include "kudu/gutil/ref_counted.h" -#include "kudu/util/locks.h" -#include "kudu/util/thread.h" namespace google_breakpad { class ExceptionHandler; @@ -33,6 +31,7 @@ namespace kudu { class Env; class Status; +class Thread; // While an instance of this class is in scope, a Breakpad minidump handler // will generate a minidump for the current program if it crashes or if it http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/monotime-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/monotime-test.cc b/src/kudu/util/monotime-test.cc index f193ecd..755dac5 100644 --- a/src/kudu/util/monotime-test.cc +++ b/src/kudu/util/monotime-test.cc @@ -20,6 +20,11 @@ #include #include +#include +#include +#include +#include + #include #include http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/monotime.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/monotime.cc b/src/kudu/util/monotime.cc index b67be42..abe3664 100644 --- a/src/kudu/util/monotime.cc +++ b/src/kudu/util/monotime.cc @@ -17,17 +17,21 @@ #include "kudu/util/monotime.h" -#include -#include -#include -#include #include -#include +#include +#include + +#include + +#include "kudu/gutil/integral_types.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/stringprintf.h" #include "kudu/gutil/sysinfo.h" -#include "kudu/gutil/walltime.h" #include "kudu/util/thread_restrictions.h" +#if defined(__APPLE__) +#include "kudu/gutil/walltime.h" +#endif namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/monotime.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/monotime.h b/src/kudu/util/monotime.h index f261a99..59d92f0 100644 --- a/src/kudu/util/monotime.h +++ b/src/kudu/util/monotime.h @@ -17,7 +17,10 @@ #ifndef KUDU_UTIL_MONOTIME_H #define KUDU_UTIL_MONOTIME_H +// NOTE: using stdint.h instead of cstdint because this file is supposed +// to be processed by a compiler lacking C++11 support. #include + #include #ifdef KUDU_HEADERS_NO_STUBS @@ -32,11 +35,9 @@ #include "kudu/util/kudu_export.h" -struct timeval; -struct timespec; +struct timeval; // IWYU pragma: keep namespace kudu { -class MonoTime; /// @brief A representation of a time interval. /// http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mt-hdr_histogram-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mt-hdr_histogram-test.cc b/src/kudu/util/mt-hdr_histogram-test.cc index 879c5e3..7221644 100644 --- a/src/kudu/util/mt-hdr_histogram-test.cc +++ b/src/kudu/util/mt-hdr_histogram-test.cc @@ -14,14 +14,19 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -#include -#include + +#include #include +#include +#include +#include + #include "kudu/gutil/ref_counted.h" #include "kudu/gutil/stl_util.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/hdr_histogram.h" +#include "kudu/util/monotime.h" #include "kudu/util/status.h" #include "kudu/util/test_util.h" #include "kudu/util/thread.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mt-metrics-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mt-metrics-test.cc b/src/kudu/util/mt-metrics-test.cc index c333215..2480d57 100644 --- a/src/kudu/util/mt-metrics-test.cc +++ b/src/kudu/util/mt-metrics-test.cc @@ -15,20 +15,26 @@ // specific language governing permissions and limitations // under the License. +#include +#include +#include +#include #include -#include -#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep #include +#include #include -#include "kudu/gutil/atomicops.h" #include "kudu/gutil/ref_counted.h" +#include "kudu/gutil/stringprintf.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/debug/leakcheck_disabler.h" -#include "kudu/util/jsonwriter.h" +#include "kudu/util/env.h" #include "kudu/util/metrics.h" -#include "kudu/util/monotime.h" +#include "kudu/util/status.h" +#include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" #include "kudu/util/thread.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mt-threadlocal-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mt-threadlocal-test.cc b/src/kudu/util/mt-threadlocal-test.cc index 2390b82..c0609d2 100644 --- a/src/kudu/util/mt-threadlocal-test.cc +++ b/src/kudu/util/mt-threadlocal-test.cc @@ -15,11 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include +#include #include +#include #include +#include #include +#include +#include + #include "kudu/gutil/macros.h" #include "kudu/gutil/map-util.h" #include "kudu/gutil/ref_counted.h" @@ -28,6 +33,10 @@ #include "kudu/util/countdown_latch.h" #include "kudu/util/env.h" #include "kudu/util/locks.h" +#include "kudu/util/make_shared.h" +#include "kudu/util/monotime.h" +#include "kudu/util/mutex.h" +#include "kudu/util/status.h" #include "kudu/util/test_util.h" #include "kudu/util/thread.h" #include "kudu/util/threadlocal.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/mutex.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/mutex.cc b/src/kudu/util/mutex.cc index bd9539b..d55ccaf 100644 --- a/src/kudu/util/mutex.cc +++ b/src/kudu/util/mutex.cc @@ -19,9 +19,16 @@ #include "kudu/util/mutex.h" +#include +#include +#include +#include +#include + #include #include +#include "kudu/gutil/port.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/gutil/walltime.h" #include "kudu/util/debug-util.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/dns_resolver-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/dns_resolver-test.cc b/src/kudu/util/net/dns_resolver-test.cc index 55be284..f08b089 100644 --- a/src/kudu/util/net/dns_resolver-test.cc +++ b/src/kudu/util/net/dns_resolver-test.cc @@ -17,14 +17,18 @@ #include "kudu/util/net/dns_resolver.h" -#include -#include +#include +#include #include +#include +#include + #include "kudu/gutil/strings/util.h" -#include "kudu/util/countdown_latch.h" +#include "kudu/util/async_util.h" #include "kudu/util/net/net_util.h" #include "kudu/util/net/sockaddr.h" +#include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" using std::vector; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/dns_resolver.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/dns_resolver.cc b/src/kudu/util/net/dns_resolver.cc index 4c37a95..8031c10 100644 --- a/src/kudu/util/net/dns_resolver.cc +++ b/src/kudu/util/net/dns_resolver.cc @@ -17,15 +17,17 @@ #include "kudu/util/net/dns_resolver.h" -#include +#include + +#include // IWYU pragma: keep #include #include -#include +#include "kudu/gutil/callback.h" #include "kudu/util/flag_tags.h" #include "kudu/util/threadpool.h" #include "kudu/util/net/net_util.h" -#include "kudu/util/net/sockaddr.h" +#include "kudu/util/status.h" DEFINE_int32(dns_num_resolver_threads, 1, "The number of threads to use for DNS resolution"); TAG_FLAG(dns_num_resolver_threads, advanced); http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/dns_resolver.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/dns_resolver.h b/src/kudu/util/net/dns_resolver.h index 4232174..06dfa48 100644 --- a/src/kudu/util/net/dns_resolver.h +++ b/src/kudu/util/net/dns_resolver.h @@ -21,8 +21,7 @@ #include "kudu/gutil/gscoped_ptr.h" #include "kudu/gutil/macros.h" -#include "kudu/util/async_util.h" -#include "kudu/util/status.h" +#include "kudu/util/status_callback.h" namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/net_util-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/net_util-test.cc b/src/kudu/util/net/net_util-test.cc index 3316316..1717d04 100644 --- a/src/kudu/util/net/net_util-test.cc +++ b/src/kudu/util/net/net_util-test.cc @@ -15,18 +15,22 @@ // specific language governing permissions and limitations // under the License. -#include - #include +#include +#include #include #include +#include +#include + #include "kudu/gutil/strings/join.h" #include "kudu/gutil/strings/util.h" #include "kudu/util/net/net_util.h" #include "kudu/util/net/socket.h" #include "kudu/util/net/sockaddr.h" #include "kudu/util/status.h" +#include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" using std::string; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/net_util.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/net_util.cc b/src/kudu/util/net/net_util.cc index 94dbb02..e5918b0 100644 --- a/src/kudu/util/net/net_util.cc +++ b/src/kudu/util/net/net_util.cc @@ -15,24 +15,31 @@ // specific language governing permissions and limitations // under the License. -#include +#include #include +#include #include -#include -#include +#include +#include #include +#include +#include #include #include +#include #include #include #include -#include +#include #include +#include #include "kudu/gutil/endian.h" +#include "kudu/gutil/macros.h" #include "kudu/gutil/map-util.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/strings/join.h" #include "kudu/gutil/strings/numbers.h" #include "kudu/gutil/strings/split.h" @@ -41,7 +48,6 @@ #include "kudu/gutil/strings/util.h" #include "kudu/util/debug/trace_event.h" #include "kudu/util/errno.h" -#include "kudu/util/faststring.h" #include "kudu/util/flag_tags.h" #include "kudu/util/net/net_util.h" #include "kudu/util/net/sockaddr.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/net_util.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/net_util.h b/src/kudu/util/net/net_util.h index b246c5e..c471ae8 100644 --- a/src/kudu/util/net/net_util.h +++ b/src/kudu/util/net/net_util.h @@ -17,6 +17,8 @@ #ifndef KUDU_UTIL_NET_NET_UTIL_H #define KUDU_UTIL_NET_NET_UTIL_H +#include +#include #include #include http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/sockaddr.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/sockaddr.cc b/src/kudu/util/net/sockaddr.cc index 0379382..428d4bd 100644 --- a/src/kudu/util/net/sockaddr.cc +++ b/src/kudu/util/net/sockaddr.cc @@ -18,15 +18,16 @@ #include "kudu/util/net/sockaddr.h" #include -#include #include -#include -#include +#include + +#include +#include #include #include "kudu/gutil/endian.h" #include "kudu/gutil/hash/builtin_type_hash.h" -#include "kudu/gutil/macros.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/stringprintf.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/net/net_util.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/sockaddr.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/sockaddr.h b/src/kudu/util/net/sockaddr.h index 09777f3..3253b39 100644 --- a/src/kudu/util/net/sockaddr.h +++ b/src/kudu/util/net/sockaddr.h @@ -18,7 +18,9 @@ #define KUDU_UTIL_NET_SOCKADDR_H #include -#include + +#include +#include #include #include "kudu/util/status.h" http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/socket.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/socket.cc b/src/kudu/util/net/socket.cc index 748c773..a7ccfcc 100644 --- a/src/kudu/util/net/socket.cc +++ b/src/kudu/util/net/socket.cc @@ -17,20 +17,25 @@ #include "kudu/util/net/socket.h" -#include #include #include #include #include -#include +#include #include +#include +#include +#include #include +#include #include +#include #include #include "kudu/gutil/basictypes.h" +#include "kudu/gutil/port.h" #include "kudu/gutil/stringprintf.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/util/debug/trace_event.h" @@ -41,7 +46,7 @@ #include "kudu/util/net/sockaddr.h" #include "kudu/util/random.h" #include "kudu/util/random_util.h" -#include "kudu/util/subprocess.h" +#include "kudu/util/slice.h" DEFINE_string(local_ip_for_outbound_sockets, "", "IP to bind to when making outgoing socket connections. " http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/net/socket.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/net/socket.h b/src/kudu/util/net/socket.h index 7c04ff6..bc86634 100644 --- a/src/kudu/util/net/socket.h +++ b/src/kudu/util/net/socket.h @@ -17,12 +17,15 @@ #ifndef KUDU_UTIL_NET_SOCKET_H #define KUDU_UTIL_NET_SOCKET_H -#include +#include +#include #include #include "kudu/gutil/macros.h" #include "kudu/util/status.h" +struct iovec; + namespace kudu { class MonoDelta; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/nvm_cache.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/nvm_cache.cc b/src/kudu/util/nvm_cache.cc index 7346f21..fef188c 100644 --- a/src/kudu/util/nvm_cache.cc +++ b/src/kudu/util/nvm_cache.cc @@ -20,27 +20,33 @@ #include "kudu/util/nvm_cache.h" -#include -#include +#include +#include #include -#include #include #include -#include #include #include +#include +#include +#include + +#include "kudu/gutil/atomicops.h" #include "kudu/gutil/atomic_refcount.h" +#include "kudu/gutil/dynamic_annotations.h" +#include "kudu/gutil/gscoped_ptr.h" #include "kudu/gutil/hash/city.h" +#include "kudu/gutil/macros.h" +#include "kudu/gutil/port.h" +#include "kudu/gutil/ref_counted.h" #include "kudu/gutil/stl_util.h" -#include "kudu/gutil/strings/substitute.h" -#include "kudu/util/atomic.h" #include "kudu/util/cache.h" #include "kudu/util/cache_metrics.h" -#include "kudu/util/flags.h" #include "kudu/util/flag_tags.h" #include "kudu/util/locks.h" #include "kudu/util/metrics.h" +#include "kudu/util/slice.h" DEFINE_string(nvm_cache_path, "/vmem", "The path at which the NVM cache will try to allocate its memory. " @@ -62,8 +68,6 @@ TAG_FLAG(nvm_cache_simulate_allocation_failure, unsafe); namespace kudu { -class MetricEntity; - namespace { using std::shared_ptr; http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/nvm_cache.h ---------------------------------------------------------------------- diff --git a/src/kudu/util/nvm_cache.h b/src/kudu/util/nvm_cache.h index 38962f2..9a65316 100644 --- a/src/kudu/util/nvm_cache.h +++ b/src/kudu/util/nvm_cache.h @@ -17,6 +17,7 @@ #ifndef KUDU_UTIL_NVM_CACHE_H_ #define KUDU_UTIL_NVM_CACHE_H_ +#include #include namespace kudu { http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/util/object_pool-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/util/object_pool-test.cc b/src/kudu/util/object_pool-test.cc index d6b34ae..954b834 100644 --- a/src/kudu/util/object_pool-test.cc +++ b/src/kudu/util/object_pool-test.cc @@ -16,6 +16,9 @@ // under the License. #include