Skip to content

Commit 3337add

Browse files
javachefacebook-github-bot
javache
authored and
facebook-github-bot
committed
Pass string by ref in TurboModule lookup path
Summary: Avoid unnecessary string copies Changelog: [internal] Reviewed By: nlutsenko Differential Revision: D36312750 fbshipit-source-id: caf0985f988eb497de3be3c0526809593b01a9e2
1 parent 51e029e commit 3337add

File tree

13 files changed

+37
-37
lines changed

13 files changed

+37
-37
lines changed

‎ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void CompositeTurboModuleManagerDelegate::registerNatives() {
2727

2828
std::shared_ptr<TurboModule>
2929
CompositeTurboModuleManagerDelegate::getTurboModule(
30-
const std::string moduleName,
31-
const std::shared_ptr<CallInvoker> jsInvoker) {
30+
const std::string &moduleName,
31+
const std::shared_ptr<CallInvoker> &jsInvoker) {
3232
for (auto delegate : mDelegates_) {
3333
if (auto turboModule = delegate->getTurboModule(moduleName, jsInvoker)) {
3434
return turboModule;
@@ -39,7 +39,7 @@ CompositeTurboModuleManagerDelegate::getTurboModule(
3939

4040
std::shared_ptr<TurboModule>
4141
CompositeTurboModuleManagerDelegate::getTurboModule(
42-
const std::string moduleName,
42+
const std::string &moduleName,
4343
const JavaTurboModule::InitParams &params) {
4444
for (auto delegate : mDelegates_) {
4545
if (auto turboModule = delegate->getTurboModule(moduleName, params)) {

‎ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class CompositeTurboModuleManagerDelegate
2929
static void registerNatives();
3030

3131
std::shared_ptr<TurboModule> getTurboModule(
32-
const std::string moduleName,
33-
const std::shared_ptr<CallInvoker> jsInvoker) override;
32+
const std::string &moduleName,
33+
const std::shared_ptr<CallInvoker> &jsInvoker) override;
3434
std::shared_ptr<TurboModule> getTurboModule(
35-
const std::string moduleName,
35+
const std::string &moduleName,
3636
const JavaTurboModule::InitParams &params) override;
3737

3838
private:

‎ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class TurboModuleManagerDelegate
2323
"Lcom/facebook/react/turbomodule/core/TurboModuleManagerDelegate;";
2424

2525
virtual std::shared_ptr<TurboModule> getTurboModule(
26-
const std::string name,
26+
const std::string &name,
2727
const JavaTurboModule::InitParams &params) = 0;
2828
virtual std::shared_ptr<TurboModule> getTurboModule(
29-
const std::string name,
30-
const std::shared_ptr<CallInvoker> jsInvoker) = 0;
29+
const std::string &name,
30+
const std::shared_ptr<CallInvoker> &jsInvoker) = 0;
3131

3232
private:
3333
friend HybridBase;

‎ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
197197
}
198198

199199
std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
200-
const std::string moduleName,
200+
const std::string &moduleName,
201201
const JavaTurboModule::InitParams &params) {
202202
if (moduleName == "SampleTurboModule") {
203203
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);

‎ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public JavaTurboModule {
2525
};
2626

2727
std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
28-
const std::string moduleName,
28+
const std::string &moduleName,
2929
const JavaTurboModule::InitParams &params);
3030

3131
} // namespace react

‎packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ namespace react {
114114
115115
${modules}
116116
117-
std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
117+
std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
118118
${moduleLookups.map(ModuleLookupTemplate).join('\n')}
119119
return nullptr;
120120
}

‎packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace react {
5454
5555
${modules}
5656
57-
std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
57+
std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
5858
5959
} // namespace react
6060
} // namespace facebook

‎packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboMo
2424
2525
}
2626
27-
std::shared_ptr<TurboModule> SampleWithUppercaseName_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
27+
std::shared_ptr<TurboModule> SampleWithUppercaseName_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
2828
if (moduleName == \\"SampleTurboModule\\") {
2929
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
3030
}
@@ -93,7 +93,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboMo
9393
methodMap_[\\"getNullableArray\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getNullableArray};
9494
}
9595
96-
std::shared_ptr<TurboModule> complex_objects_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
96+
std::shared_ptr<TurboModule> complex_objects_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
9797
if (moduleName == \\"SampleTurboModule\\") {
9898
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
9999
}
@@ -130,7 +130,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboMo
130130
131131
}
132132
133-
std::shared_ptr<TurboModule> empty_native_modules_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
133+
std::shared_ptr<TurboModule> empty_native_modules_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
134134
if (moduleName == \\"SampleTurboModule\\") {
135135
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
136136
}
@@ -171,7 +171,7 @@ AliasTurboModuleSpecJSI::AliasTurboModuleSpecJSI(const JavaTurboModule::InitPara
171171
methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_AliasTurboModuleSpecJSI_cropImage};
172172
}
173173
174-
std::shared_ptr<TurboModule> native_modules_with_type_aliases_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
174+
std::shared_ptr<TurboModule> native_modules_with_type_aliases_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
175175
if (moduleName == \\"AliasTurboModule\\") {
176176
return std::make_shared<AliasTurboModuleSpecJSI>(params);
177177
}
@@ -250,7 +250,7 @@ NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const JavaTurboMo
250250
methodMap_[\\"dismissRedbox\\"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
251251
}
252252
253-
std::shared_ptr<TurboModule> real_module_example_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
253+
std::shared_ptr<TurboModule> real_module_example_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
254254
if (moduleName == \\"CameraRollManager\\") {
255255
return std::make_shared<NativeCameraRollManagerSpecJSI>(params);
256256
}
@@ -342,7 +342,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboMo
342342
methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
343343
}
344344
345-
std::shared_ptr<TurboModule> simple_native_modules_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
345+
std::shared_ptr<TurboModule> simple_native_modules_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
346346
if (moduleName == \\"SampleTurboModule\\") {
347347
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
348348
}
@@ -391,7 +391,7 @@ NativeSampleTurboModule2SpecJSI::NativeSampleTurboModule2SpecJSI(const JavaTurbo
391391
methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModule2SpecJSI_voidFunc};
392392
}
393393
394-
std::shared_ptr<TurboModule> two_modules_different_files_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
394+
std::shared_ptr<TurboModule> two_modules_different_files_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
395395
if (moduleName == \\"SampleTurboModule\\") {
396396
return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
397397
}

‎packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public:
3030
};
3131
3232
33-
std::shared_ptr<TurboModule> SampleWithUppercaseName_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
33+
std::shared_ptr<TurboModule> SampleWithUppercaseName_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
3434
3535
} // namespace react
3636
} // namespace facebook
@@ -139,7 +139,7 @@ public:
139139
};
140140
141141
142-
std::shared_ptr<TurboModule> complex_objects_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
142+
std::shared_ptr<TurboModule> complex_objects_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
143143
144144
} // namespace react
145145
} // namespace facebook
@@ -248,7 +248,7 @@ public:
248248
};
249249
250250
251-
std::shared_ptr<TurboModule> empty_native_modules_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
251+
std::shared_ptr<TurboModule> empty_native_modules_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
252252
253253
} // namespace react
254254
} // namespace facebook
@@ -357,7 +357,7 @@ public:
357357
};
358358
359359
360-
std::shared_ptr<TurboModule> native_modules_with_type_aliases_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
360+
std::shared_ptr<TurboModule> native_modules_with_type_aliases_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
361361
362362
} // namespace react
363363
} // namespace facebook
@@ -474,7 +474,7 @@ public:
474474
};
475475
476476
477-
std::shared_ptr<TurboModule> real_module_example_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
477+
std::shared_ptr<TurboModule> real_module_example_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
478478
479479
} // namespace react
480480
} // namespace facebook
@@ -583,7 +583,7 @@ public:
583583
};
584584
585585
586-
std::shared_ptr<TurboModule> simple_native_modules_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
586+
std::shared_ptr<TurboModule> simple_native_modules_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
587587
588588
} // namespace react
589589
} // namespace facebook
@@ -700,7 +700,7 @@ public:
700700
};
701701
702702
703-
std::shared_ptr<TurboModule> two_modules_different_files_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
703+
std::shared_ptr<TurboModule> two_modules_different_files_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
704704
705705
} // namespace react
706706
} // namespace facebook

‎packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace facebook {
1515
namespace react {
1616

1717
std::shared_ptr<TurboModule> RNTesterAppModuleProvider(
18-
const std::string moduleName,
18+
const std::string &moduleName,
1919
const JavaTurboModule::InitParams &params) {
2020
auto module = rntester_ModuleProvider(moduleName, params);
2121
if (module != nullptr) {

0 commit comments

Comments
 (0)