Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Windows: don't fire GC ETW events without ETW consumers

  • Loading branch information...
commit 39d23378592458bfe0644c43567e4103979a0236 1 parent 05fe70b
Igor Zinkovsky authored piscisaureus committed
Showing with 10 additions and 14 deletions.
  1. +0 −8 src/node.cc
  2. +10 −6 src/node_win32_etw_provider-inl.h
View
8 src/node.cc
@@ -30,10 +30,6 @@
# include "node_dtrace.h"
#endif
-#ifdef HAVE_ETW
-# include "node_win32_etw_provider.h"
-#endif
-
#include <locale.h>
#include <signal.h>
#include <stdio.h>
@@ -2901,10 +2897,6 @@ int Start(int argc, char *argv[]) {
// watchers, it blocks.
uv_run(uv_default_loop());
-#ifdef HAVE_ETW
- shutdown_etw();
-#endif
-
EmitExit(process_l);
RunAtExit();
View
16 src/node_win32_etw_provider-inl.h
@@ -116,16 +116,20 @@ void NODE_NET_STREAM_END(node_dtrace_connection_t* conn) {
void NODE_GC_START(GCType type, GCCallbackFlags flags) {
- EVENT_DATA_DESCRIPTOR descriptors[2];
- ETW_WRITE_GC(descriptors, type, flags);
- ETW_WRITE_EVENT(NODE_GC_START_EVENT, descriptors);
+ if (events_enabled > 0) {
+ EVENT_DATA_DESCRIPTOR descriptors[2];
+ ETW_WRITE_GC(descriptors, type, flags);
+ ETW_WRITE_EVENT(NODE_GC_START_EVENT, descriptors);
+ }
}
void NODE_GC_DONE(GCType type, GCCallbackFlags flags) {
- EVENT_DATA_DESCRIPTOR descriptors[2];
- ETW_WRITE_GC(descriptors, type, flags);
- ETW_WRITE_EVENT(NODE_GC_DONE_EVENT, descriptors);
+ if (events_enabled > 0) {
+ EVENT_DATA_DESCRIPTOR descriptors[2];
+ ETW_WRITE_GC(descriptors, type, flags);
+ ETW_WRITE_EVENT(NODE_GC_DONE_EVENT, descriptors);
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.