-
Notifications
You must be signed in to change notification settings - Fork 29.8k
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.
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
node_api: add napi_fatal_exception #19337
Closed
Closed
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7fefdda
n-api: test uncaught exception in worker
mafintosh e602e9c
n-api: fix fatalexception handling in workers
mafintosh a575495
n-api: add napi_fatal_exception
mafintosh de3c603
TBA -> REPLACEME
mafintosh aa5498b
add test and support passing in an error
mafintosh 5ff7ba4
use inline fun instead of macro
mafintosh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
'use strict'; | ||
const common = require('../../common'); | ||
const assert = require('assert'); | ||
const test_async = require(`./build/${common.buildType}/test_async`); | ||
|
||
process.on('uncaughtException', common.mustCall(function(err) { | ||
try { | ||
throw new Error('should not fail'); | ||
} catch (err) { | ||
assert.strictEqual(err.message, 'should not fail'); | ||
} | ||
assert.strictEqual(err.message, 'uncaught'); | ||
})); | ||
|
||
// Successful async execution and completion callback. | ||
test_async.Test(5, {}, common.mustCall(function() { | ||
throw new Error('uncaught'); | ||
})); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"targets": [ | ||
{ | ||
"target_name": "test_fatal_exception", | ||
"sources": [ "test_fatal_exception.c" ] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
'use strict'; | ||
const common = require('../../common'); | ||
const assert = require('assert'); | ||
const test_fatal = require(`./build/${common.buildType}/test_fatal_exception`); | ||
|
||
process.on('uncaughtException', common.mustCall(function(err) { | ||
assert.strictEqual(err.message, 'fatal error'); | ||
})); | ||
|
||
const err = new Error('fatal error'); | ||
test_fatal.Test(err); |
26 changes: 26 additions & 0 deletions
26
test/addons-napi/test_fatal_exception/test_fatal_exception.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#include <node_api.h> | ||
#include "../common.h" | ||
|
||
napi_value Test(napi_env env, napi_callback_info info) { | ||
napi_value err; | ||
size_t argc = 1; | ||
|
||
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, &err, NULL, NULL)); | ||
|
||
NAPI_CALL(env, napi_fatal_exception(env, err)); | ||
|
||
return NULL; | ||
} | ||
|
||
napi_value Init(napi_env env, napi_value exports) { | ||
napi_property_descriptor properties[] = { | ||
DECLARE_NAPI_PROPERTY("Test", Test), | ||
}; | ||
|
||
NAPI_CALL(env, napi_define_properties( | ||
env, exports, sizeof(properties) / sizeof(*properties), properties)); | ||
|
||
return exports; | ||
} | ||
|
||
NAPI_MODULE(NODE_GYP_MODULE_NAME, Init) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One final nit: We generally prefer
inline
functions to preprocessor macros :)