Skip to content

Commit

Permalink
src: trace threadpool event
Browse files Browse the repository at this point in the history
  • Loading branch information
theanarkh committed Aug 31, 2022
1 parent ab89024 commit ef94baa
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 17 deletions.
2 changes: 2 additions & 0 deletions doc/api/tracing.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ The available categories are:
* `node.bootstrap`: Enables capture of Node.js bootstrap milestones.
* `node.console`: Enables capture of `console.time()` and `console.count()`
output.
* `node.threadpool`: Enables capture of Node.js threadpool,
except asynchronous file IO and DNS.
* `node.dns.native`: Enables capture of trace data for DNS queries.
* `node.net.native`: Enables capture of trace data for network.
* `node.environment`: Enables capture of Node.js Environment milestones.
Expand Down
13 changes: 6 additions & 7 deletions src/crypto/crypto_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,13 @@ class CryptoJob : public AsyncWrap, public ThreadPoolWork {
public:
using AdditionalParams = typename CryptoJobTraits::AdditionalParameters;

explicit CryptoJob(
Environment* env,
v8::Local<v8::Object> object,
AsyncWrap::ProviderType type,
CryptoJobMode mode,
AdditionalParams&& params)
explicit CryptoJob(Environment* env,
v8::Local<v8::Object> object,
AsyncWrap::ProviderType type,
CryptoJobMode mode,
AdditionalParams&& params)
: AsyncWrap(env, object, type),
ThreadPoolWork(env),
ThreadPoolWork(env, ThreadPoolWorkType::CRYPTO),
mode_(mode),
params_(std::move(params)) {
// If the CryptoJob is async, then the instance will be
Expand Down
2 changes: 1 addition & 1 deletion src/node_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ class Work : public node::AsyncResource, public node::ThreadPoolWork {
env->isolate,
async_resource,
*v8::String::Utf8Value(env->isolate, async_resource_name)),
ThreadPoolWork(env->node_env()),
ThreadPoolWork(env->node_env(), ThreadPoolWorkType::NODE_API),
_env(env),
_data(data),
_execute(execute),
Expand Down
11 changes: 5 additions & 6 deletions src/node_blob.cc
Original file line number Diff line number Diff line change
Expand Up @@ -308,13 +308,12 @@ void Blob::GetDataObject(const v8::FunctionCallbackInfo<v8::Value>& args) {
}
}

FixedSizeBlobCopyJob::FixedSizeBlobCopyJob(
Environment* env,
Local<Object> object,
Blob* blob,
FixedSizeBlobCopyJob::Mode mode)
FixedSizeBlobCopyJob::FixedSizeBlobCopyJob(Environment* env,
Local<Object> object,
Blob* blob,
FixedSizeBlobCopyJob::Mode mode)
: AsyncWrap(env, object, AsyncWrap::PROVIDER_FIXEDSIZEBLOBCOPY),
ThreadPoolWork(env),
ThreadPoolWork(env, ThreadPoolWorkType::BLOB),
mode_(mode) {
if (mode == FixedSizeBlobCopyJob::Mode::SYNC) MakeWeak();
source_ = blob->entries();
Expand Down
25 changes: 24 additions & 1 deletion src/node_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,14 @@ class DebugSealHandleScope {

class ThreadPoolWork {
public:
explicit inline ThreadPoolWork(Environment* env) : env_(env) {
enum class ThreadPoolWorkType {
BLOB,
CRYPTO,
ZLIB,
NODE_API,
};
explicit inline ThreadPoolWork(Environment* env, ThreadPoolWorkType type)
: env_(env), type_(type) {
CHECK_NOT_NULL(env);
}
inline virtual ~ThreadPoolWork() = default;
Expand All @@ -271,9 +278,25 @@ class ThreadPoolWork {

Environment* env() const { return env_; }

const char* type_name() {
switch (type_) {
case ThreadPoolWorkType::BLOB:
return "blob";
case ThreadPoolWorkType::CRYPTO:
return "crypto";
case ThreadPoolWorkType::ZLIB:
return "zlib";
case ThreadPoolWorkType::NODE_API:
return "node_api";
default:
return "unknown";
}
}

private:
Environment* env_;
uv_work_t work_req_;
ThreadPoolWorkType type_;
};

#define TRACING_CATEGORY_NODE "node"
Expand Down
2 changes: 1 addition & 1 deletion src/node_zlib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork {

CompressionStream(Environment* env, Local<Object> wrap)
: AsyncWrap(env, wrap, AsyncWrap::PROVIDER_ZLIB),
ThreadPoolWork(env),
ThreadPoolWork(env, ThreadPoolWorkType::ZLIB),
write_result_(nullptr) {
MakeWeak();
}
Expand Down
10 changes: 9 additions & 1 deletion src/threadpoolwork-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "util-inl.h"
#include "node_internals.h"
#include "tracing/trace_event.h"
#include "util-inl.h"

namespace node {

void ThreadPoolWork::ScheduleWork() {
env_->IncreaseWaitingRequestCounter();
TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(
TRACING_CATEGORY_NODE1(threadpool), type_name(), this);
int status = uv_queue_work(
env_->event_loop(),
&work_req_,
Expand All @@ -41,6 +44,11 @@ void ThreadPoolWork::ScheduleWork() {
[](uv_work_t* req, int status) {
ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req);
self->env_->DecreaseWaitingRequestCounter();
TRACE_EVENT_NESTABLE_ASYNC_END1(TRACING_CATEGORY_NODE1(threadpool),
self->type_name(),
self,
"result",
status);
self->AfterThreadPoolWork(status);
});
CHECK_EQ(status, 0);
Expand Down
64 changes: 64 additions & 0 deletions test/parallel/test-trace-events-threadpool.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const fs = require('fs');
const path = require('path');
const tmpdir = require('../common/tmpdir');

if (!common.hasCrypto)
common.skip('missing crypto');

const { hkdf } = require('crypto');
const { deflate } = require('zlib');
const { Blob } = require('buffer');


if (process.env.isChild === '1') {
hkdf('sha512', 'key', 'salt', 'info', 64, () => {});
deflate('hello', () => {});
// Make async call
const blob = new Blob(['h'.repeat(4096 * 2)]);
blob.arrayBuffer();
return;
}

tmpdir.refresh();
const FILE_NAME = path.join(tmpdir.path, 'node_trace.1.log');

cp.spawnSync(process.execPath,
[
'--trace-events-enabled',
'--trace-event-categories', 'node.threadpool',
__filename,
],
{
cwd: tmpdir.path,
env: {
...process.env,
isChild: '1',
},
});

assert(fs.existsSync(FILE_NAME));
const data = fs.readFileSync(FILE_NAME);
const traces = JSON.parse(data.toString()).traceEvents;
assert(traces.length > 0);
let blobCount = 0;
let zlibCount = 0;
let cryptoCount = 0;
traces.forEach((item) => {
if (item.cat === 'node,node.threadpool') {
if (item.name === 'blob') {
blobCount++;
} else if (item.name === 'zlib') {
zlibCount++;
} else if (item.name === 'crypto') {
cryptoCount++;
}
}
});
// There are three types, each type has two events at least
assert.strictEqual(blobCount >= 2, true);
assert.strictEqual(zlibCount >= 2, true);
assert.strictEqual(cryptoCount >= 2, true);

0 comments on commit ef94baa

Please sign in to comment.