From d8ca259e1f751e8a976848368e75c909e3d5c6d8 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Mon, 21 Oct 2024 15:57:12 +0200 Subject: [PATCH] chore(userpace/libsinsp): rename `pair.{first,second}` to just `first` and `second`. Signed-off-by: Federico Di Pierro --- userspace/libsinsp/state/table_adapters.h | 4 ++-- userspace/libsinsp/test/plugins.ut.cpp | 8 ++++---- .../plugins/syscall_subtables_array_pair.cpp | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/userspace/libsinsp/state/table_adapters.h b/userspace/libsinsp/state/table_adapters.h index 6857e81e91..ac281ab020 100644 --- a/userspace/libsinsp/state/table_adapters.h +++ b/userspace/libsinsp/state/table_adapters.h @@ -68,8 +68,8 @@ class pair_table_entry_adapter : public libsinsp::state::table_entry { inline dynamic_fields_t(): fixed_dynamic_fields_infos( - {_dfi::build("pair.first", 0, s_dynamic_fields_id), - _dfi::build("pair.second", 1, s_dynamic_fields_id)}) {} + {_dfi::build("first", 0, s_dynamic_fields_id), + _dfi::build("second", 1, s_dynamic_fields_id)}) {} virtual ~dynamic_fields_t() = default; }; diff --git a/userspace/libsinsp/test/plugins.ut.cpp b/userspace/libsinsp/test/plugins.ut.cpp index 538baa023c..ed8173a4ab 100644 --- a/userspace/libsinsp/test/plugins.ut.cpp +++ b/userspace/libsinsp/test/plugins.ut.cpp @@ -1001,19 +1001,19 @@ TEST_F(sinsp_with_test_input, plugin_subtables_array_pair) { // get an accessor to a dynamic field representing the array's values ASSERT_EQ(subtable->dynamic_fields()->fields().size(), 2); // pair.first, pair.second - auto dfield_first = subtable->dynamic_fields()->fields().find("pair.first"); + auto dfield_first = subtable->dynamic_fields()->fields().find("first"); ASSERT_NE(dfield_first, subtable->dynamic_fields()->fields().end()); ASSERT_EQ(dfield_first->second.readonly(), false); ASSERT_EQ(dfield_first->second.valid(), true); - ASSERT_EQ(dfield_first->second.name(), "pair.first"); + ASSERT_EQ(dfield_first->second.name(), "first"); ASSERT_EQ(dfield_first->second.info(), libsinsp::state::typeinfo::of()); auto dfield_first_acc = dfield_first->second.new_accessor(); - auto dfield_second = subtable->dynamic_fields()->fields().find("pair.second"); + auto dfield_second = subtable->dynamic_fields()->fields().find("second"); ASSERT_NE(dfield_second, subtable->dynamic_fields()->fields().end()); ASSERT_EQ(dfield_second->second.readonly(), false); ASSERT_EQ(dfield_second->second.valid(), true); - ASSERT_EQ(dfield_second->second.name(), "pair.second"); + ASSERT_EQ(dfield_second->second.name(), "second"); ASSERT_EQ(dfield_second->second.info(), libsinsp::state::typeinfo::of()); auto dfield_second_acc = dfield_second->second.new_accessor(); diff --git a/userspace/libsinsp/test/plugins/syscall_subtables_array_pair.cpp b/userspace/libsinsp/test/plugins/syscall_subtables_array_pair.cpp index 79a3eb611b..f1223f0008 100644 --- a/userspace/libsinsp/test/plugins/syscall_subtables_array_pair.cpp +++ b/userspace/libsinsp/test/plugins/syscall_subtables_array_pair.cpp @@ -121,21 +121,21 @@ ss_plugin_t* plugin_init(const ss_plugin_init_input* in, ss_plugin_rc* rc) { // obtain accessor to one of the fields of file descriptor tables (name) ret->table_field_cgroupstable_first = in->tables->fields_ext->get_table_field(cgroupstable, - "pair.first", + "first", ss_plugin_state_type::SS_PLUGIN_ST_STRING); if(!ret->table_field_cgroupstable_first) { *rc = SS_PLUGIN_FAILURE; - ret->lasterr = "can't get sub-table 'pair.first' field"; + ret->lasterr = "can't get sub-table 'first' field"; return ret; } ret->table_field_cgroupstable_second = in->tables->fields_ext->get_table_field(cgroupstable, - "pair.second", + "second", ss_plugin_state_type::SS_PLUGIN_ST_STRING); if(!ret->table_field_cgroupstable_second) { *rc = SS_PLUGIN_FAILURE; - ret->lasterr = "can't get sub-table 'pair.second' field"; + ret->lasterr = "can't get sub-table 'second' field"; return ret; } @@ -203,13 +203,13 @@ ss_plugin_rc plugin_parse_event(ss_plugin_t* s, ps->table_field_cgroupstable_first, &data); if(res != SS_PLUGIN_SUCCESS) { - ps->lasterr = "can't read subtable entry pair.first field: " + + ps->lasterr = "can't read subtable entry first field: " + std::string(in->get_owner_last_error(in->owner)); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE; } if(strcmp(data.str, "") != 0) { - ps->lasterr = "wrong string read from subtable entry pair.first field: " + + ps->lasterr = "wrong string read from subtable entry first field: " + std::string(data.str); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE; @@ -221,13 +221,13 @@ ss_plugin_rc plugin_parse_event(ss_plugin_t* s, ps->table_field_cgroupstable_second, &data); if(res != SS_PLUGIN_SUCCESS) { - ps->lasterr = "can't read subtable entry pair.second field: " + + ps->lasterr = "can't read subtable entry second field: " + std::string(in->get_owner_last_error(in->owner)); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE; } if(strcmp(data.str, "") != 0) { - ps->lasterr = "wrong string read from subtable entry pair.second field: " + + ps->lasterr = "wrong string read from subtable entry second field: " + std::string(data.str); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE; @@ -239,7 +239,7 @@ ss_plugin_rc plugin_parse_event(ss_plugin_t* s, ps->table_field_cgroupstable_first, &data); if(res != SS_PLUGIN_SUCCESS) { - ps->lasterr = "can't write subtable entry pair.first field: " + + ps->lasterr = "can't write subtable entry first field: " + std::string(in->get_owner_last_error(in->owner)); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE; @@ -251,7 +251,7 @@ ss_plugin_rc plugin_parse_event(ss_plugin_t* s, ps->table_field_cgroupstable_second, &data); if(res != SS_PLUGIN_SUCCESS) { - ps->lasterr = "can't write subtable entry pair.second field: " + + ps->lasterr = "can't write subtable entry second field: " + std::string(in->get_owner_last_error(in->owner)); printf("ERR %s\n", ps->lasterr.c_str()); return SS_PLUGIN_FAILURE;