From c0f0c38535db1b2ae77029630604fa4bbb993e32 Mon Sep 17 00:00:00 2001 From: jeyanthinath Date: Wed, 26 Jul 2017 13:57:18 +0530 Subject: [PATCH] build: enable C++ linting for src/*/* Fixes: https://github.com/nodejs/node/issues/14490 PR-URL: https://github.com/nodejs/node/pull/14497 Reviewed-By: Timothy Gu Reviewed-By: Khaidi Chu Reviewed-By: Refael Ackermann --- Makefile | 5 +++++ src/tracing/agent.h | 2 +- src/tracing/node_trace_buffer.cc | 13 ++++++++----- src/tracing/node_trace_buffer.h | 7 +++---- src/tracing/node_trace_writer.cc | 17 ++++++++++------- src/tracing/node_trace_writer.h | 8 ++++---- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 6c7986779421b9..652c591e2bfe96 100644 --- a/Makefile +++ b/Makefile @@ -891,11 +891,16 @@ CPPLINT_EXCLUDE += src/queue.h CPPLINT_EXCLUDE += src/tree.h CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h) CPPLINT_EXCLUDE += $(wildcard test/addons-napi/??_*/*.cc test/addons-napi/??_*/*.h) +# These files were copied more or less verbatim from V8. +CPPLINT_EXCLUDE += src/tracing/trace_event.h src/tracing/trace_event_common.h CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \ src/*.c \ src/*.cc \ src/*.h \ + src/*/*.c \ + src/*/*.cc \ + src/*/*.h \ test/addons/*/*.cc \ test/addons/*/*.h \ test/cctest/*.cc \ diff --git a/src/tracing/agent.h b/src/tracing/agent.h index 2174d5b8965c2a..6966c2e43be4d2 100644 --- a/src/tracing/agent.h +++ b/src/tracing/agent.h @@ -11,7 +11,7 @@ namespace tracing { class Agent { public: - explicit Agent(); + Agent(); void Start(v8::Platform* platform, const std::string& enabled_categories); void Stop(); diff --git a/src/tracing/node_trace_buffer.cc b/src/tracing/node_trace_buffer.cc index 4e99361cbefee3..c8d71b762ef1de 100644 --- a/src/tracing/node_trace_buffer.cc +++ b/src/tracing/node_trace_buffer.cc @@ -94,7 +94,8 @@ NodeTraceBuffer::NodeTraceBuffer(size_t max_chunks, current_buf_.store(&buffer1_); flush_signal_.data = this; - int err = uv_async_init(tracing_loop_, &flush_signal_, NonBlockingFlushSignalCb); + int err = uv_async_init(tracing_loop_, &flush_signal_, + NonBlockingFlushSignalCb); CHECK_EQ(err, 0); exit_signal_.data = this; @@ -105,7 +106,7 @@ NodeTraceBuffer::NodeTraceBuffer(size_t max_chunks, NodeTraceBuffer::~NodeTraceBuffer() { uv_async_send(&exit_signal_); Mutex::ScopedLock scoped_lock(exit_mutex_); - while(!exited_) { + while (!exited_) { exit_cond_.Wait(scoped_lock); } } @@ -138,7 +139,7 @@ bool NodeTraceBuffer::Flush() { bool NodeTraceBuffer::TryLoadAvailableBuffer() { InternalTraceBuffer* prev_buf = current_buf_.load(); if (prev_buf->IsFull()) { - uv_async_send(&flush_signal_); // trigger flush on a separate thread + uv_async_send(&flush_signal_); // trigger flush on a separate thread InternalTraceBuffer* other_buf = prev_buf == &buffer1_ ? &buffer2_ : &buffer1_; if (!other_buf->IsFull()) { @@ -165,8 +166,10 @@ void NodeTraceBuffer::NonBlockingFlushSignalCb(uv_async_t* signal) { void NodeTraceBuffer::ExitSignalCb(uv_async_t* signal) { NodeTraceBuffer* buffer = reinterpret_cast(signal->data); uv_close(reinterpret_cast(&buffer->flush_signal_), nullptr); - uv_close(reinterpret_cast(&buffer->exit_signal_), [](uv_handle_t* signal) { - NodeTraceBuffer* buffer = reinterpret_cast(signal->data); + uv_close(reinterpret_cast(&buffer->exit_signal_), + [](uv_handle_t* signal) { + NodeTraceBuffer* buffer = + reinterpret_cast(signal->data); Mutex::ScopedLock scoped_lock(buffer->exit_mutex_); buffer->exited_ = true; buffer->exit_cond_.Signal(scoped_lock); diff --git a/src/tracing/node_trace_buffer.h b/src/tracing/node_trace_buffer.h index 296c958b80e3fa..4d725ce31f2d4d 100644 --- a/src/tracing/node_trace_buffer.h +++ b/src/tracing/node_trace_buffer.h @@ -1,5 +1,5 @@ -#ifndef SRC_NODE_TRACE_BUFFER_H_ -#define SRC_NODE_TRACE_BUFFER_H_ +#ifndef SRC_TRACING_NODE_TRACE_BUFFER_H_ +#define SRC_TRACING_NODE_TRACE_BUFFER_H_ #include "node_mutex.h" #include "tracing/node_trace_writer.h" @@ -75,7 +75,6 @@ class NodeTraceBuffer : public TraceBuffer { // Used to wait until async handles have been closed. ConditionVariable exit_cond_; std::unique_ptr trace_writer_; - // TODO: Change std::atomic to something less contentious. std::atomic current_buf_; InternalTraceBuffer buffer1_; InternalTraceBuffer buffer2_; @@ -84,4 +83,4 @@ class NodeTraceBuffer : public TraceBuffer { } // namespace tracing } // namespace node -#endif // SRC_NODE_TRACING_CONTROLLER_H_ +#endif // SRC_TRACING_NODE_TRACE_BUFFER_H_ diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc index 41753c5e65e557..ff3c981d103d09 100644 --- a/src/tracing/node_trace_writer.cc +++ b/src/tracing/node_trace_writer.cc @@ -27,7 +27,7 @@ void NodeTraceWriter::WriteSuffix() { { Mutex::ScopedLock scoped_lock(stream_mutex_); if (total_traces_ > 0) { - total_traces_ = 0; // so we don't write it again in FlushPrivate + total_traces_ = 0; // so we don't write it again in FlushPrivate // Appends "]}" to stream_. delete json_trace_writer_; should_flush = true; @@ -49,7 +49,7 @@ NodeTraceWriter::~NodeTraceWriter() { } uv_async_send(&exit_signal_); Mutex::ScopedLock scoped_lock(request_mutex_); - while(!exited_) { + while (!exited_) { exit_cond_.Wait(scoped_lock); } } @@ -110,8 +110,8 @@ void NodeTraceWriter::FlushSignalCb(uv_async_t* signal) { trace_writer->FlushPrivate(); } -// TODO: Remove (is it necessary to change the API? Since because of WriteSuffix -// it no longer matters whether it's true or false) +// TODO(matthewloring): Remove (is it necessary to change the API? +// Since because of WriteSuffix it no longer matters whether it's true or false) void NodeTraceWriter::Flush() { Flush(true); } @@ -172,9 +172,12 @@ void NodeTraceWriter::WriteCb(uv_fs_t* req) { // static void NodeTraceWriter::ExitSignalCb(uv_async_t* signal) { NodeTraceWriter* trace_writer = static_cast(signal->data); - uv_close(reinterpret_cast(&trace_writer->flush_signal_), nullptr); - uv_close(reinterpret_cast(&trace_writer->exit_signal_), [](uv_handle_t* signal) { - NodeTraceWriter* trace_writer = static_cast(signal->data); + uv_close(reinterpret_cast(&trace_writer->flush_signal_), + nullptr); + uv_close(reinterpret_cast(&trace_writer->exit_signal_), + [](uv_handle_t* signal) { + NodeTraceWriter* trace_writer = + static_cast(signal->data); Mutex::ScopedLock scoped_lock(trace_writer->request_mutex_); trace_writer->exited_ = true; trace_writer->exit_cond_.Signal(scoped_lock); diff --git a/src/tracing/node_trace_writer.h b/src/tracing/node_trace_writer.h index 5813db0ab1fd33..7d8294afc29784 100644 --- a/src/tracing/node_trace_writer.h +++ b/src/tracing/node_trace_writer.h @@ -1,5 +1,5 @@ -#ifndef SRC_NODE_TRACE_WRITER_H_ -#define SRC_NODE_TRACE_WRITER_H_ +#ifndef SRC_TRACING_NODE_TRACE_WRITER_H_ +#define SRC_TRACING_NODE_TRACE_WRITER_H_ #include #include @@ -17,7 +17,7 @@ using v8::platform::tracing::TracingController; class NodeTraceWriter : public TraceWriter { public: - NodeTraceWriter(uv_loop_t* tracing_loop); + explicit NodeTraceWriter(uv_loop_t* tracing_loop); ~NodeTraceWriter(); void AppendTraceEvent(TraceObject* trace_event) override; @@ -71,4 +71,4 @@ class NodeTraceWriter : public TraceWriter { } // namespace tracing } // namespace node -#endif // SRC_NODE_TRACE_WRITER_H_ +#endif // SRC_TRACING_NODE_TRACE_WRITER_H_