Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit b9a5b85

Browse files
committed
Fixed style and added regression test
1 parent e5d442a commit b9a5b85

File tree

2 files changed

+48
-2
lines changed

2 files changed

+48
-2
lines changed

deps/v8/src/sampler.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,7 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
346346
// ISSUE-14576: To avoid deadlock, return if there is a thread lock
347347
if (Isolate::GetProcessWideMutex().Pointer()->TryLock()) {
348348
Isolate::GetProcessWideMutex().Pointer()->Unlock();
349-
}
350-
else {
349+
} else {
351350
return;
352351
}
353352

test/simple/test-regress-GH-14576.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
/*
23+
* Tests for sampler deadlock regression.
24+
* Issue https://github.com/joyent/node/issues/14576
25+
*/
26+
27+
var assert = require('assert');
28+
var cp = require('child_process');
29+
30+
var child = undefined;
31+
32+
var deadlockTimer = setTimeout(function() {
33+
if(child) {
34+
process.kill(child.pid, 'SIGKILL');
35+
}
36+
37+
assert(false, 'Node.js process hung');
38+
}, 10000);
39+
40+
var testScript = "var i = 0; function r() { if(i++ > 2000) return; setTimeout(r, 1); }; r();";
41+
child = cp.exec(process.execPath + ' --prof -e "' + testScript + '"', function(err, stdout, stderr) {
42+
clearTimeout(deadlockTimer);
43+
assert.ifError(err);
44+
45+
// no process hanging, test passed
46+
});
47+

0 commit comments

Comments
 (0)