Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
31073919
Commit
31073919
authored
8 years ago
by
Adam Welc
Browse files
Options
Downloads
Patches
Plain Diff
Fixes to the native interface.
parent
d513ed12
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
+3
-3
3 additions, 3 deletions
com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
+1
-1
1 addition, 1 deletion
com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
with
4 additions
and
4 deletions
com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
+
3
−
3
View file @
31073919
...
...
@@ -645,17 +645,17 @@ SEXP R_getContextSrcRef(CTXT context) {
int
R_insideBrowser
()
{
JNIEnv
*
jniEnv
=
getEnv
();
jmethodID
methodID
=
checkGetMethodID
(
jniEnv
,
UpCallsRFFIClass
,
"R_insideBrowser"
,
"()I"
,
0
);
return
(
*
jniEnv
)
->
Call
Static
IntMethod
(
jniEnv
,
UpCallsRFFI
Class
,
methodID
);
return
(
*
jniEnv
)
->
CallIntMethod
(
jniEnv
,
UpCallsRFFI
Object
,
methodID
);
}
int
R_isGlobal
(
CTXT
context
)
{
JNIEnv
*
jniEnv
=
getEnv
();
jmethodID
methodID
=
checkGetMethodID
(
jniEnv
,
UpCallsRFFIClass
,
"R_isGlobal"
,
"(Ljava/lang/Object;)I"
,
0
);
return
(
*
jniEnv
)
->
Call
Static
IntMethod
(
jniEnv
,
UpCallsRFFI
Class
,
methodID
,
context
);
return
(
*
jniEnv
)
->
CallIntMethod
(
jniEnv
,
UpCallsRFFI
Object
,
methodID
,
context
);
}
int
R_isEqual
(
void
*
x
,
void
*
y
)
{
JNIEnv
*
jniEnv
=
getEnv
();
jmethodID
methodID
=
checkGetMethodID
(
jniEnv
,
UpCallsRFFIClass
,
"R_isEqual"
,
"(Ljava/lang/Object;Ljava/lang/Object;)I"
,
0
);
return
(
*
jniEnv
)
->
Call
Static
IntMethod
(
jniEnv
,
UpCallsRFFI
Class
,
methodID
,
x
,
y
);
return
(
*
jniEnv
)
->
CallIntMethod
(
jniEnv
,
UpCallsRFFI
Object
,
methodID
,
x
,
y
);
}
This diff is collapsed.
Click to expand it.
com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
+
1
−
1
View file @
31073919
...
...
@@ -88,7 +88,7 @@ static jmp_buf* callErrorJmpBufTable[CALLDEPTH_STACK_SIZE];
void
init_utils
(
JNIEnv
*
env
,
jobject
upCallsInstance
)
{
curenv
=
env
;
UpCallsRFFIClass
=
(
*
env
)
->
GetObjectClass
(
env
,
upCallsInstance
);
UpCallsRFFIClass
=
(
*
env
)
->
NewGlobalRef
(
env
,
(
*
env
)
->
GetObjectClass
(
env
,
upCallsInstance
)
)
;
UpCallsRFFIObject
=
(
*
env
)
->
NewGlobalRef
(
env
,
upCallsInstance
);
if
(
TRACE_ENABLED
&&
traceFile
==
NULL
)
{
if
(
!
isEmbedded
)
{
...
...
This diff is collapsed.
Click to expand it.
Julien Lopez
@jlopez
mentioned in commit
39811a2c
·
8 years ago
mentioned in commit
39811a2c
mentioned in commit 39811a2cd9f5545513295d2af554ccdacdd79171
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment