-
Notifications
You must be signed in to change notification settings - Fork 400
Allow to pass DynamicLibrary to Library func #306
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
Open
kolya-ay
wants to merge
1
commit into
node-ffi:master
Choose a base branch
from
kolya-ay:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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 hidden or 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 |
|---|---|---|
|
|
@@ -31,18 +31,20 @@ var EXT = Library.EXT = { | |
| * ForeignFunction. | ||
| */ | ||
|
|
||
| function Library (libfile, funcs, lib) { | ||
| debug('creating Library object for', libfile) | ||
| function Library (dl, funcs, lib) { | ||
| debug('creating Library object for', dl) | ||
|
|
||
| if (libfile && libfile.indexOf(EXT) === -1) { | ||
| debug('appending library extension to library name', EXT) | ||
| libfile += EXT | ||
| if (!(dl instanceof DynamicLibrary)) { | ||
| if (dl && dl.indexOf(EXT) === -1) { | ||
| debug('appending library extension to library name', EXT) | ||
| dl += EXT | ||
| } | ||
| dl = new DynamicLibrary(dl || null, RTLD_NOW) | ||
| } | ||
|
|
||
| if (!lib) { | ||
| lib = {} | ||
| } | ||
| var dl = new DynamicLibrary(libfile || null, RTLD_NOW) | ||
|
|
||
| Object.keys(funcs || {}).forEach(function (func) { | ||
| debug('defining function', func) | ||
|
|
@@ -51,8 +53,7 @@ function Library (libfile, funcs, lib) { | |
| , info = funcs[func] | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you tack |
||
| if (fptr.isNull()) { | ||
| throw new Error('Library: "' + libfile | ||
| + '" returned NULL function pointer for "' + func + '"') | ||
| throw new Error('Library returned NULL function pointer for "' + func + '"') | ||
| } | ||
|
|
||
| var resultType = info[0] | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Let's do
if ('string' === typeof dl || null === dl)instead. I'm paranoid aboutinstanceofand try to avoid it when possible.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.
any particular reason? instanceof is logically correct, no?
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.
IMO
instanceofis an anti-pattern in dynamically typed languages like JavaScript. Consider a DynamicLibrary instance from another "env" (i.e. another copy of node-ffi in the node_modules structure), or another module that implements the DynamicLibrary interface but using a different backend (perhaps libuv's dl functions). Basically the "if it looks like a duck, and quacks like a duck" benefits of dynamic langs are lost with instanceof.