Skip to content

7.7.1 Proposal #11638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
italoacasas merged 9 commits into from
Mar 2, 2017
Merged

7.7.1 Proposal #11638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a918bf
tracing: fix -Wreorder warning
santigimeno Dec 22, 2016
3dc4a5f
tracing: fix -Wunused-private-field warning
santigimeno Dec 22, 2016
b89b2a7
src: always initialize tracing controller in agent
Dec 28, 2016
30c80cb
src: fix TracingController cleanup
jasongin Jan 4, 2017
c8e34b6
build: add missing src/tracing header files
danbev Jan 17, 2017
96f55f9
src: move trace_event.h include to internal header
bnoordhuis Jan 23, 2017
7b253eb
test: increase strictness for test-trace-event
Trott Jan 29, 2017
54e55e0
test: make test-intl-no-icu-data more robust
targos Feb 16, 2017
5c2e415
2017-03-01, Version 7.7.1 (Current)
Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tracing: fix -Wunused-private-field warning 
Remove `external_buffer_` from `InternalTraceBuffer` as it seems not to
be used anywhere.

PR-URL: #10416
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@santigimeno
santigimeno authored and Italo A. Casas committed Mar 1, 2017
commit 3dc4a5f1f4bbf7d7e44690867084485f23ef339e
9 changes: 4 additions & 5 deletions src/tracing/node_trace_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ namespace node {
namespace tracing {

InternalTraceBuffer::InternalTraceBuffer(size_t max_chunks, uint32_t id,
NodeTraceWriter* trace_writer, NodeTraceBuffer* external_buffer)
NodeTraceWriter* trace_writer)
: flushing_(false), max_chunks_(max_chunks),
trace_writer_(trace_writer), external_buffer_(external_buffer),
id_(id) {
trace_writer_(trace_writer), id_(id) {
chunks_.resize(max_chunks);
}

Expand Down Expand Up @@ -90,8 +89,8 @@ void InternalTraceBuffer::ExtractHandle(
NodeTraceBuffer::NodeTraceBuffer(size_t max_chunks,
NodeTraceWriter* trace_writer, uv_loop_t* tracing_loop)
: tracing_loop_(tracing_loop), trace_writer_(trace_writer),
buffer1_(max_chunks, 0, trace_writer, this),
buffer2_(max_chunks, 1, trace_writer, this) {
buffer1_(max_chunks, 0, trace_writer),
buffer2_(max_chunks, 1, trace_writer) {
current_buf_.store(&buffer1_);

flush_signal_.data = this;
Expand Down
4 changes: 1 addition & 3 deletions src/tracing/node_trace_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ class NodeTraceBuffer;
class InternalTraceBuffer {
public:
InternalTraceBuffer(size_t max_chunks, uint32_t id,
NodeTraceWriter* trace_writer,
NodeTraceBuffer* external_buffer);
NodeTraceWriter* trace_writer);

TraceObject* AddTraceEvent(uint64_t* handle);
TraceObject* GetEventByHandle(uint64_t handle);
Expand All @@ -44,7 +43,6 @@ class InternalTraceBuffer {
bool flushing_;
size_t max_chunks_;
NodeTraceWriter* trace_writer_;
NodeTraceBuffer* external_buffer_;
std::vector<std::unique_ptr<TraceBufferChunk>> chunks_;
size_t total_chunks_ = 0;
uint32_t current_chunk_seq_ = 1;
Expand Down