Skip to content

refactor: native FFI for Android and Cocoa SDK #1622

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.

Sign up for GitHub

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

Closed
vaind wants to merge 6 commits into from
Closed

refactor: native FFI for Android and Cocoa SDK #1622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66bc8b6
wip: cocoa SDK ffi
vaind Aug 31, 2023
5903fcf
android JNI ffi
vaind Sep 1, 2023
84d609c
experiment code backup
vaind Sep 1, 2023
0e98205
fixup cocoa ffigen dependency
vaind Sep 1, 2023
ae34a42
analyzer issues
vaind Sep 1, 2023
8367da2
update cocoa bindings
vaind Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup cocoa ffigen dependency
  • Loading branch information
@vaind
vaind committed Sep 1, 2023
commit 0e98205be7f79012065d836542dd7c71fc9b3e4e
174 changes: 97 additions & 77 deletions flutter/lib/src/sentry_cocoa.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23597,17 +23597,17 @@ class SentryCocoa {
'objc_msgSend');
late final __objc_msgSend_831 = __objc_msgSend_831Ptr.asFunction<
ffi.Pointer<
ffi.NativeFunction<
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
ffi
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
Function(ffi.Pointer<ObjCObject>, ffi.Pointer<ObjCSel>)>();

late final _sel_setSizeFunction_1 = _registerName1("setSizeFunction:");
void _objc_msgSend_832(
ffi.Pointer<ObjCObject> obj,
ffi.Pointer<ObjCSel> sel,
ffi.Pointer<
ffi.NativeFunction<
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
ffi
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
value,
) {
return __objc_msgSend_832(
Expand Down Expand Up @@ -36938,19 +36938,20 @@ class ObjCBlock1 extends _ObjCBlockBase {
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(
ffi.UnsignedLong arg0, ffi.Pointer<ffi.Bool> arg1)>>
ffi.Void Function(ffi.UnsignedLong arg0,
ffi.Pointer<ffi.Bool> arg1)>>
ptr)
: this._(
lib._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Void Function(
ffi.Pointer<_ObjCBlock> block,
ffi.UnsignedLong arg0,
ffi.Pointer<ffi.Bool> arg1)>(
_ObjCBlock1_fnPtrTrampoline)
.cast(),
ptr.cast()),
lib
._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Void Function(
ffi.Pointer<_ObjCBlock> block,
ffi.UnsignedLong arg0,
ffi.Pointer<ffi.Bool> arg1)>(
_ObjCBlock1_fnPtrTrampoline)
.cast(),
ptr.cast()),
lib);
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;

Expand Down Expand Up @@ -37351,7 +37352,8 @@ class ObjCBlock6 extends _ObjCBlockBase {
ObjCBlock6.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Int32 Function(ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1)>>
ptr)
Expand Down Expand Up @@ -38439,19 +38441,26 @@ class ObjCBlock10 extends _ObjCBlockBase {
/// Creates a block from a C function pointer.
ObjCBlock10.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ObjCObject> arg0, ffi.Pointer<ObjCObject> arg1, ffi.Pointer<ffi.Bool> arg2)>>
ffi.Pointer<
ffi
.NativeFunction<
ffi.Bool Function(
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
ffi.Pointer<ffi.Bool> arg2)>>
ptr)
: this._(
lib._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Bool Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
ffi.Pointer<ffi.Bool> arg2)>(
_ObjCBlock10_fnPtrTrampoline, false)
.cast(),
ptr.cast()),
lib
._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Bool Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
ffi.Pointer<ffi.Bool> arg2)>(
_ObjCBlock10_fnPtrTrampoline, false)
.cast(),
ptr.cast()),
lib);
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;

Expand Down Expand Up @@ -40734,19 +40743,20 @@ class ObjCBlock12 extends _ObjCBlockBase {
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(
ffi.Pointer<ffi.Void> arg0, ffi.UnsignedLong arg1)>>
ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
ffi.UnsignedLong arg1)>>
ptr)
: this._(
lib._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Void Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ffi.Void> arg0,
ffi.UnsignedLong arg1)>(
_ObjCBlock12_fnPtrTrampoline)
.cast(),
ptr.cast()),
lib
._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Void Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ffi.Void> arg0,
ffi.UnsignedLong arg1)>(
_ObjCBlock12_fnPtrTrampoline)
.cast(),
ptr.cast()),
lib);
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;

Expand Down Expand Up @@ -41412,18 +41422,23 @@ class ObjCBlock17 extends _ObjCBlockBase {
/// Creates a block from a C function pointer.
ObjCBlock17.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ObjCObject> arg0, ffi.Pointer<ffi.Bool> arg1)>>
ffi.Pointer<
ffi
.NativeFunction<
ffi.Bool Function(ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ffi.Bool> arg1)>>
ptr)
: this._(
lib._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Bool Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ffi.Bool> arg1)>(
_ObjCBlock17_fnPtrTrampoline, false)
.cast(),
ptr.cast()),
lib
._newBlock1(
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
ffi.Bool Function(
ffi.Pointer<_ObjCBlock> block,
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ffi.Bool> arg1)>(
_ObjCBlock17_fnPtrTrampoline, false)
.cast(),
ptr.cast()),
lib);
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;

Expand Down Expand Up @@ -42184,8 +42199,8 @@ class ObjCBlock18 extends _ObjCBlockBase {
ObjCBlock18.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -44805,8 +44820,8 @@ class ObjCBlock21 extends _ObjCBlockBase {
void call() {
return _id.ref.invoke
.cast<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<_ObjCBlock> block)>>()
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<_ObjCBlock> block)>>()
.asFunction<void Function(ffi.Pointer<_ObjCBlock> block)>()(_id);
}
}
Expand Down Expand Up @@ -46087,8 +46102,8 @@ class ObjCBlock22 extends _ObjCBlockBase {
ObjCBlock22.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -49846,7 +49861,8 @@ class ObjCBlock31 extends _ObjCBlockBase {
ObjCBlock31.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Void Function(
ffi.Pointer<_ObjCBlock> arg0,
ffi.Pointer<ObjCObject> arg1,
Expand Down Expand Up @@ -55633,8 +55649,8 @@ class ObjCBlock35 extends _ObjCBlockBase {
ObjCBlock35.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -57575,8 +57591,8 @@ class ObjCBlock36 extends _ObjCBlockBase {
ObjCBlock36.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -59014,8 +59030,8 @@ class NSPointerFunctions extends NSObject {

set sizeFunction(
ffi.Pointer<
ffi.NativeFunction<
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
ffi
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
value) {
_lib._objc_msgSend_832(_id, _lib._sel_setSizeFunction_1, value);
}
Expand Down Expand Up @@ -60830,8 +60846,8 @@ class ObjCBlock39 extends _ObjCBlockBase {
ObjCBlock39.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -61118,7 +61134,8 @@ class ObjCBlock40 extends _ObjCBlockBase {
ObjCBlock40.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Void Function(
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
Expand Down Expand Up @@ -61843,8 +61860,8 @@ class ObjCBlock41 extends _ObjCBlockBase {
ObjCBlock41.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -61912,8 +61929,8 @@ class ObjCBlock42 extends _ObjCBlockBase {
ObjCBlock42.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -63931,7 +63948,8 @@ class ObjCBlock43 extends _ObjCBlockBase {
ObjCBlock43.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Void Function(
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
Expand Down Expand Up @@ -64246,8 +64264,8 @@ class ObjCBlock44 extends _ObjCBlockBase {
ObjCBlock44.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -65244,7 +65262,8 @@ class ObjCBlock47 extends _ObjCBlockBase {
ObjCBlock47.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Void Function(
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
Expand Down Expand Up @@ -65347,7 +65366,8 @@ class ObjCBlock48 extends _ObjCBlockBase {
ObjCBlock48.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi
.NativeFunction<
ffi.Void Function(
ffi.Pointer<ObjCObject> arg0,
ffi.Pointer<ObjCObject> arg1,
Expand Down Expand Up @@ -65804,8 +65824,8 @@ class ObjCBlock49 extends _ObjCBlockBase {
ObjCBlock49.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down Expand Up @@ -69056,8 +69076,8 @@ class ObjCBlock50 extends _ObjCBlockBase {
ObjCBlock50.fromFunctionPointer(
SentryCocoa lib,
ffi.Pointer<
ffi.NativeFunction<
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ffi
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
ptr)
: this._(
lib._newBlock1(
Expand Down
4 changes: 3 additions & 1 deletion flutter/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ dev_dependencies:
yaml: ^3.1.0 # needed for version match (code and pubspec)
flutter_lints: ^2.0.0
ffigen:
path: /Users/ivan/dev/ffigen
git:
url: https://github.com/vaind/ffigen
ref: 4d714b0f2d11e9698a1885ec2d5de15f2ed827f1
jnigen: ^0.5.0

flutter:
Expand Down