Skip to content

Commit 0eeaa6f

Browse files
peilinokpeilinok
committed
feat: rename symbol names for internal method channel name
1 parent 0f27549 commit 0eeaa6f

File tree

8 files changed

+74
-131
lines changed

8 files changed

+74
-131
lines changed

‎lib/src/method_channel/internal/platform/io/bindings/native_iris_event_bindings.dart

Lines changed: 30 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore_for_file: camel_case_types, non_constant_identifier_names, public_member_api_docs, sort_constructors_first
2-
31
// AUTO GENERATED FILE, DO NOT EDIT.
42
//
53
// Generated by `package:ffigen`.
@@ -21,133 +19,69 @@ class NativeIrisEventBinding {
2119
lookup)
2220
: _lookup = lookup;
2321

24-
int InitDartApiDL(
22+
int RtmInitDartApiDL(
2523
ffi.Pointer<ffi.Void> data,
2624
) {
27-
return _InitDartApiDL(
25+
return _RtmInitDartApiDL(
2826
data,
2927
);
3028
}
3129

32-
late final _InitDartApiDLPtr =
30+
late final _RtmInitDartApiDLPtr =
3331
_lookup<ffi.NativeFunction<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>>(
34-
'InitDartApiDL');
35-
late final _InitDartApiDL =
36-
_InitDartApiDLPtr.asFunction<int Function(ffi.Pointer<ffi.Void>)>();
32+
'RtmInitDartApiDL');
33+
late final _RtmInitDartApiDL =
34+
_RtmInitDartApiDLPtr.asFunction<int Function(ffi.Pointer<ffi.Void>)>();
3735

38-
void Dispose() {
39-
return _Dispose();
36+
void RtmDispose() {
37+
return _RtmDispose();
4038
}
4139

42-
late final _DisposePtr =
43-
_lookup<ffi.NativeFunction<ffi.Void Function()>>('Dispose');
44-
late final _Dispose = _DisposePtr.asFunction<void Function()>();
40+
late final _RtmDisposePtr =
41+
_lookup<ffi.NativeFunction<ffi.Void Function()>>('RtmDispose');
42+
late final _RtmDispose = _RtmDisposePtr.asFunction<void Function()>();
4543

46-
void OnEvent(
44+
void RtmOnEvent(
4745
ffi.Pointer<EventParam> param,
4846
) {
49-
return _OnEvent(
47+
return _RtmOnEvent(
5048
param,
5149
);
5250
}
5351

54-
late final _OnEventPtr =
52+
late final _RtmOnEventPtr =
5553
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<EventParam>)>>(
56-
'OnEvent');
57-
late final _OnEvent =
58-
_OnEventPtr.asFunction<void Function(ffi.Pointer<EventParam>)>();
59-
60-
void OnEventLegacy(
61-
ffi.Pointer<ffi.Int8> event,
62-
ffi.Pointer<ffi.Int8> data,
63-
ffi.Pointer<ffi.Pointer<ffi.Void>> buffer,
64-
ffi.Pointer<ffi.Uint32> length,
65-
int buffer_count,
66-
) {
67-
return _OnEventLegacy(
68-
event,
69-
data,
70-
buffer,
71-
length,
72-
buffer_count,
73-
);
74-
}
75-
76-
late final _OnEventLegacyPtr = _lookup<
77-
ffi.NativeFunction<
78-
ffi.Void Function(
79-
ffi.Pointer<ffi.Int8>,
80-
ffi.Pointer<ffi.Int8>,
81-
ffi.Pointer<ffi.Pointer<ffi.Void>>,
82-
ffi.Pointer<ffi.Uint32>,
83-
ffi.Uint32)>>('OnEventLegacy');
84-
late final _OnEventLegacy = _OnEventLegacyPtr.asFunction<
85-
void Function(ffi.Pointer<ffi.Int8>, ffi.Pointer<ffi.Int8>,
86-
ffi.Pointer<ffi.Pointer<ffi.Void>>, ffi.Pointer<ffi.Uint32>, int)>();
87-
88-
void OnEventExLegacy(
89-
ffi.Pointer<ffi.Int8> event,
90-
ffi.Pointer<ffi.Int8> data,
91-
ffi.Pointer<ffi.Int8> result,
92-
ffi.Pointer<ffi.Pointer<ffi.Void>> buffer,
93-
ffi.Pointer<ffi.Uint32> length,
94-
int buffer_count,
95-
) {
96-
return _OnEventExLegacy(
97-
event,
98-
data,
99-
result,
100-
buffer,
101-
length,
102-
buffer_count,
103-
);
104-
}
54+
'RtmOnEvent');
55+
late final _RtmOnEvent =
56+
_RtmOnEventPtr.asFunction<void Function(ffi.Pointer<EventParam>)>();
10557

106-
late final _OnEventExLegacyPtr = _lookup<
107-
ffi.NativeFunction<
108-
ffi.Void Function(
109-
ffi.Pointer<ffi.Int8>,
110-
ffi.Pointer<ffi.Int8>,
111-
ffi.Pointer<ffi.Int8>,
112-
ffi.Pointer<ffi.Pointer<ffi.Void>>,
113-
ffi.Pointer<ffi.Uint32>,
114-
ffi.Uint32)>>('OnEventExLegacy');
115-
late final _OnEventExLegacy = _OnEventExLegacyPtr.asFunction<
116-
void Function(
117-
ffi.Pointer<ffi.Int8>,
118-
ffi.Pointer<ffi.Int8>,
119-
ffi.Pointer<ffi.Int8>,
120-
ffi.Pointer<ffi.Pointer<ffi.Void>>,
121-
ffi.Pointer<ffi.Uint32>,
122-
int)>();
123-
124-
void RegisterDartPort(
58+
void RtmRegisterDartPort(
12559
int send_port,
12660
) {
127-
return _RegisterDartPort(
61+
return _RtmRegisterDartPort(
12862
send_port,
12963
);
13064
}
13165

132-
late final _RegisterDartPortPtr =
66+
late final _RtmRegisterDartPortPtr =
13367
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
134-
'RegisterDartPort');
135-
late final _RegisterDartPort =
136-
_RegisterDartPortPtr.asFunction<void Function(int)>();
68+
'RtmRegisterDartPort');
69+
late final _RtmRegisterDartPort =
70+
_RtmRegisterDartPortPtr.asFunction<void Function(int)>();
13771

138-
void UnregisterDartPort(
72+
void RtmUnregisterDartPort(
13973
int send_port,
14074
) {
141-
return _UnregisterDartPort(
75+
return _RtmUnregisterDartPort(
14276
send_port,
14377
);
14478
}
14579

146-
late final _UnregisterDartPortPtr =
80+
late final _RtmUnregisterDartPortPtr =
14781
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
148-
'UnregisterDartPort');
149-
late final _UnregisterDartPort =
150-
_UnregisterDartPortPtr.asFunction<void Function(int)>();
82+
'RtmUnregisterDartPort');
83+
late final _RtmUnregisterDartPort =
84+
_RtmUnregisterDartPortPtr.asFunction<void Function(int)>();
15185

15286
late final addresses = _SymbolAddresses(this);
15387
}
@@ -156,24 +90,7 @@ class _SymbolAddresses {
15690
final NativeIrisEventBinding _library;
15791
_SymbolAddresses(this._library);
15892
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<EventParam>)>>
159-
get OnEvent => _library._OnEventPtr;
160-
ffi.Pointer<
161-
ffi.NativeFunction<
162-
ffi.Void Function(
163-
ffi.Pointer<ffi.Int8>,
164-
ffi.Pointer<ffi.Int8>,
165-
ffi.Pointer<ffi.Pointer<ffi.Void>>,
166-
ffi.Pointer<ffi.Uint32>,
167-
ffi.Uint32)>> get OnEventLegacy => _library._OnEventLegacyPtr;
168-
ffi.Pointer<
169-
ffi.NativeFunction<
170-
ffi.Void Function(
171-
ffi.Pointer<ffi.Int8>,
172-
ffi.Pointer<ffi.Int8>,
173-
ffi.Pointer<ffi.Int8>,
174-
ffi.Pointer<ffi.Pointer<ffi.Void>>,
175-
ffi.Pointer<ffi.Uint32>,
176-
ffi.Uint32)>> get OnEventExLegacy => _library._OnEventExLegacyPtr;
93+
get RtmOnEvent => _library._RtmOnEventPtr;
17794
}
17895

17996
final class EventParam extends ffi.Struct {

‎lib/src/method_channel/internal/platform/io/iris_event_io.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@ class IrisEventIO implements IrisEvent {
2828

2929
late final NativeIrisEventBinding _nativeIrisEventBinding;
3030

31-
/// Initialize the [IrisEvent], which call `InitDartApiDL` directly
31+
/// Initialize the [IrisEvent], which call `RtmInitDartApiDL` directly
3232
void initialize() {
33-
_nativeIrisEventBinding.InitDartApiDL(ffi.NativeApi.initializeApiDLData);
33+
_nativeIrisEventBinding.RtmInitDartApiDL(ffi.NativeApi.initializeApiDLData);
3434
}
3535

3636
/// Register dart [SendPort] to send the message from native
3737
void registerEventHandler(SendPort sendPort) {
38-
_nativeIrisEventBinding.RegisterDartPort(sendPort.nativePort);
38+
_nativeIrisEventBinding.RtmRegisterDartPort(sendPort.nativePort);
3939
}
4040

4141
/// Unregister dart [SendPort] which used to send the message from native
4242
void unregisterEventHandler(SendPort sendPort) {
43-
_nativeIrisEventBinding.UnregisterDartPort(sendPort.nativePort);
43+
_nativeIrisEventBinding.RtmUnregisterDartPort(sendPort.nativePort);
4444
}
4545

4646
/// Clean up native resources
4747
void dispose() {
48-
_nativeIrisEventBinding.Dispose();
48+
_nativeIrisEventBinding.RtmDispose();
4949
}
5050

5151
/// Get the onEvent function pointer from C
5252
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<EventParam>)>>
53-
get onEventPtr => _nativeIrisEventBinding.addresses.OnEvent;
53+
get onEventPtr => _nativeIrisEventBinding.addresses.RtmOnEvent;
5454
}

‎scripts/ffi_gen/ffigen_config_method_channel.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 'NativeIrisEventBinding'
2+
description: 'Bindings to IrisEventHandler'
3+
4+
output: 'lib/src/method_channel/internal/platform/io/bindings/native_iris_event_bindings.dart'
5+
6+
headers:
7+
entry-points:
8+
- 'src/iris_event.h'
9+
10+
include-directives:
11+
- 'src/iris_event.h'
12+
13+
llvm-path:
14+
- '/opt/homebrew/opt/llvm@15'
15+
16+
# Generating typedefs need set the sdk constraints to >=2.14, remove it
17+
# if we can set our sdk constraints to >=2.14
18+
typedefs:
19+
exclude:
20+
- 'Dart_Port'
21+
22+
functions:
23+
symbol-address:
24+
include:
25+
- 'OnEvent' # Match function name.

‎scripts/ffi_gen/run_ffi_gen.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pushd ${PROJECT_ROOT}
1919

2020
flutter packages get
2121
flutter pub run ffigen --config=${MY_PATH}/ffigen_config.yaml
22+
flutter pub run ffigen --config=${MY_PATH}/ffigen_config_method_channel.yaml
2223

2324
popd
2425

‎src/iris_event.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ std::unique_ptr<DartMessageHandlerManager> dartMessageHandlerManager_ = nullptr;
202202
int init_dart_api_times_ = 0;
203203

204204
// Initialize `dart_api_dl.h`
205-
EXPORT intptr_t InitDartApiDL(void *data)
205+
EXPORT intptr_t RtmInitDartApiDL(void *data)
206206
{
207207
std::lock_guard<std::mutex> lock(message_handler_mutex_);
208208
int ret = 0;
@@ -217,7 +217,7 @@ EXPORT intptr_t InitDartApiDL(void *data)
217217
return ret;
218218
}
219219

220-
EXPORT void Dispose()
220+
EXPORT void RtmDispose()
221221
{
222222
std::lock_guard<std::mutex> lock(message_handler_mutex_);
223223
--init_dart_api_times_;
@@ -227,7 +227,7 @@ EXPORT void Dispose()
227227
}
228228
}
229229

230-
EXPORT void OnEvent(EventParam *param)
230+
EXPORT void RtmOnEvent(EventParam *param)
231231
{
232232
std::lock_guard<std::mutex> lock(message_handler_mutex_);
233233
if (dartMessageHandlerManager_)
@@ -236,7 +236,7 @@ EXPORT void OnEvent(EventParam *param)
236236
}
237237
}
238238

239-
EXPORT void RegisterDartPort(Dart_Port send_port)
239+
EXPORT void RtmRegisterDartPort(Dart_Port send_port)
240240
{
241241
std::lock_guard<std::mutex> lock(message_handler_mutex_);
242242
if (dartMessageHandlerManager_)
@@ -245,7 +245,7 @@ EXPORT void RegisterDartPort(Dart_Port send_port)
245245
}
246246
}
247247

248-
EXPORT void UnregisterDartPort(Dart_Port send_port)
248+
EXPORT void RtmUnregisterDartPort(Dart_Port send_port)
249249
{
250250
std::lock_guard<std::mutex> lock(message_handler_mutex_);
251251
if (dartMessageHandlerManager_)

‎src/iris_event.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ extern "C"
2727
} EventParam;
2828

2929
// Initialize `dart_api_dl.h`
30-
EXPORT intptr_t InitDartApiDL(void *data);
30+
EXPORT intptr_t RtmInitDartApiDL(void *data);
3131

32-
EXPORT void Dispose();
32+
EXPORT void RtmDispose();
3333

34-
EXPORT void OnEvent(EventParam *param);
34+
EXPORT void RtmOnEvent(EventParam *param);
3535

36-
EXPORT void RegisterDartPort(Dart_Port send_port);
36+
EXPORT void RtmRegisterDartPort(Dart_Port send_port);
3737

38-
EXPORT void UnregisterDartPort(Dart_Port send_port);
38+
EXPORT void RtmUnregisterDartPort(Dart_Port send_port);
3939

4040
#ifdef __cplusplus
4141
}

‎test_shard/iris_tester/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'com.example.iris_tester'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.6.10'
5+
ext.kotlin_version = '1.7.0'
66
repositories {
77
google()
88
mavenCentral()

‎test_shard/iris_tester/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

0 commit comments

Comments
 (0)