Skip to content

Commit 6cd5691

Browse files
committed
lola: Extract shared_data_structures into separate targets
1 parent 34471d8 commit 6cd5691

File tree

3 files changed

+33
-19
lines changed

3 files changed

+33
-19
lines changed

score/mw/com/impl/bindings/lola/BUILD

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -216,24 +216,16 @@ cc_library(
216216
)
217217

218218
cc_library(
219-
name = "shared_data_structures",
220-
srcs = [
221-
"service_data_control.cpp",
222-
"service_data_storage.cpp",
223-
],
224-
hdrs = [
225-
"service_data_control.h",
226-
"service_data_storage.h",
227-
],
219+
name = "service_data_storage",
220+
srcs = ["service_data_storage.cpp"],
221+
hdrs = ["service_data_storage.h"],
228222
features = COMPILER_WARNING_FEATURES,
229223
tags = ["FFI"],
230224
visibility = [
231225
"//score/mw/com/impl/bindings/lola/test_doubles:__pkg__",
232226
],
233227
deps = [
234-
":application_id_pid_mapping",
235228
":element_fq_id",
236-
":event",
237229
":event_meta_info",
238230
":i_runtime",
239231
"//score/mw/com/impl:runtime",
@@ -242,6 +234,24 @@ cc_library(
242234
],
243235
)
244236

237+
cc_library(
238+
name = "service_data_control",
239+
srcs = ["service_data_control.cpp"],
240+
hdrs = ["service_data_control.h"],
241+
features = COMPILER_WARNING_FEATURES,
242+
tags = ["FFI"],
243+
visibility = [
244+
"//score/mw/com/impl/bindings/lola/test_doubles:__pkg__",
245+
],
246+
deps = [
247+
":application_id_pid_mapping",
248+
":element_fq_id",
249+
":event_control",
250+
":event_meta_info",
251+
"@score_baselibs//score/memory/shared",
252+
],
253+
)
254+
245255
cc_library(
246256
name = "skeleton",
247257
srcs = [
@@ -268,7 +278,8 @@ cc_library(
268278
":i_shm_path_builder",
269279
":partial_restart_path_builder",
270280
":proxy_instance_identifier",
271-
":shared_data_structures",
281+
":service_data_control",
282+
":service_data_storage",
272283
":shm_path_builder",
273284
":skeleton_instance_identifier",
274285
":transaction_log_registration_guard",
@@ -324,7 +335,8 @@ cc_library(
324335
":event_control",
325336
":event_subscription_control",
326337
":proxy_instance_identifier",
327-
":shared_data_structures",
338+
":service_data_control",
339+
":service_data_storage",
328340
":shm_path_builder",
329341
":slot_collector",
330342
":subscription_state_machine",
@@ -723,7 +735,7 @@ cc_library(
723735
tags = ["FFI"],
724736
visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
725737
deps = [
726-
":shared_data_structures",
738+
":service_data_control",
727739
":transaction_log_id",
728740
":transaction_log_set",
729741
"//score/mw/com/impl:runtime",
@@ -1204,7 +1216,7 @@ cc_gtest_unit_test(
12041216
":element_fq_id",
12051217
":event_meta_info",
12061218
":runtime_mock",
1207-
":shared_data_structures",
1219+
":service_data_storage",
12081220
"//score/mw/com/impl:binding_type",
12091221
"//score/mw/com/impl/test:runtime_mock_guard",
12101222
"@score_baselibs//score/memory/shared:map",

score/mw/com/impl/bindings/lola/service_data_control.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_DATA_CONTROL_H
1414
#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_DATA_CONTROL_H
1515

16-
#include "score/memory/shared/map.h"
17-
#include "score/memory/shared/memory_resource_proxy.h"
18-
#include "score/memory/shared/polymorphic_offset_ptr_allocator.h"
1916
#include "score/mw/com/impl/bindings/lola/application_id_pid_mapping.h"
2017
#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
2118
#include "score/mw/com/impl/bindings/lola/event_control.h"
2219

20+
#include "score/memory/shared/map.h"
21+
#include "score/memory/shared/memory_resource_proxy.h"
22+
#include "score/memory/shared/polymorphic_offset_ptr_allocator.h"
23+
2324
namespace score::mw::com::impl::lola
2425
{
2526
class ServiceDataControl

score/mw/com/impl/bindings/lola/test_doubles/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ cc_library(
4343
deps = [
4444
":fake_memory_resource",
4545
"//score/mw/com/impl/bindings/lola:event",
46-
"//score/mw/com/impl/bindings/lola:shared_data_structures",
46+
"//score/mw/com/impl/bindings/lola:service_data_control",
47+
"//score/mw/com/impl/bindings/lola:service_data_storage",
4748
"//score/mw/com/impl/bindings/lola:skeleton",
4849
"@score_baselibs//score/memory/shared",
4950
"@score_baselibs//score/memory/shared:shared_memory_resource_heap_allocator_mock",

0 commit comments

Comments
 (0)