Skip to content
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.

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

fix(deps): bump tbb and enable its compilation with emscripten #2149

Merged
merged 2 commits into from
Nov 8, 2024

Conversation

therealbobo
Copy link
Contributor

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind bug

/kind cleanup

/kind design

/kind documentation

/kind failing-test

/kind feature

Any specific area of the project related to this PR?

Uncomment one (or more) /area <> lines:

/area API-version

/area build

/area CI

/area driver-kmod

/area driver-bpf

/area driver-modern-bpf

/area libscap-engine-bpf

/area libscap-engine-gvisor

/area libscap-engine-kmod

/area libscap-engine-modern-bpf

/area libscap-engine-nodriver

/area libscap-engine-noop

/area libscap-engine-source-plugin

/area libscap-engine-savefile

/area libscap

/area libpman

/area libsinsp

/area tests

/area proposals

Does this PR require a change in the driver versions?

/version driver-API-version-major

/version driver-API-version-minor

/version driver-API-version-patch

/version driver-SCHEMA-version-major

/version driver-SCHEMA-version-minor

/version driver-SCHEMA-version-patch

What this PR does / why we need it:

Which issue(s) this PR fixes:

This bumps tbb to the latest version available and enables its compilation with emscripten.

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Copy link

github-actions bot commented Nov 5, 2024

Perf diff from master - unit tests

     2.26%     -0.69%  [.] std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>
     5.99%     -0.63%  [.] sinsp_evt::get_type
     0.66%     +0.62%  [.] std::_Hashtable<long, std::pair<long const, std::shared_ptr<sinsp_threadinfo> >, std::allocator<std::pair<long const, std::shared_ptr<sinsp_threadinfo> > >, std::__detail::_Select1st, std::equal_to<long>, std::hash<long>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<false, false, true> >::find
     1.02%     -0.56%  [.] sinsp_split[abi:cxx11]
     3.19%     +0.50%  [.] gzfile_read
     3.59%     -0.47%  [.] sinsp_thread_manager::find_thread
     0.77%     +0.41%  [.] libsinsp::state::stl_container_table_adapter<std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, libsinsp::state::value_table_entry_adapter<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, libsinsp::state::value_table_entry_adapter<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >::dynamic_fields_t>::stl_container_table_adapter
     0.46%     +0.41%  [.] sinsp_fdtable::find
     0.20%     +0.40%  [.] copy_and_sanitize_path
     0.72%     +0.37%  [.] sinsp_parser::event_cleanup

Heap diff from master - unit tests

peak heap memory consumption: 0B
peak RSS (including heaptrack overhead): 0B
total memory leaked: 0B

Heap diff from master - scap file

peak heap memory consumption: 0B
peak RSS (including heaptrack overhead): 0B
total memory leaked: 0B

Benchmarks diff from master

Comparing gbench_data.json to /root/actions-runner/_work/libs/libs/build/gbench_data.json
Benchmark                                                         Time             CPU      Time Old      Time New       CPU Old       CPU New
----------------------------------------------------------------------------------------------------------------------------------------------
BM_sinsp_split_mean                                            +0.0126         +0.0128           141           143           141           143
BM_sinsp_split_median                                          +0.0060         +0.0062           141           142           141           142
BM_sinsp_split_stddev                                          +0.1120         +0.1142             2             2             2             2
BM_sinsp_split_cv                                              +0.0981         +0.1001             0             0             0             0
BM_sinsp_concatenate_paths_relative_path_mean                  +0.0233         +0.0235            59            61            59            61
BM_sinsp_concatenate_paths_relative_path_median                +0.0104         +0.0106            60            60            60            60
BM_sinsp_concatenate_paths_relative_path_stddev                -0.1226         -0.1231             1             1             1             1
BM_sinsp_concatenate_paths_relative_path_cv                    -0.1426         -0.1432             0             0             0             0
BM_sinsp_concatenate_paths_empty_path_mean                     +0.0043         +0.0045            25            25            25            25
BM_sinsp_concatenate_paths_empty_path_median                   +0.0058         +0.0060            25            25            25            25
BM_sinsp_concatenate_paths_empty_path_stddev                   -0.6733         -0.6678             0             0             0             0
BM_sinsp_concatenate_paths_empty_path_cv                       -0.6747         -0.6693             0             0             0             0
BM_sinsp_concatenate_paths_absolute_path_mean                  +0.1290         +0.1292            56            63            56            63
BM_sinsp_concatenate_paths_absolute_path_median                +0.1293         +0.1297            56            63            56            63
BM_sinsp_concatenate_paths_absolute_path_stddev                +0.0485         +0.0464             0             0             0             0
BM_sinsp_concatenate_paths_absolute_path_cv                    -0.0713         -0.0733             0             0             0             0
BM_sinsp_split_container_image_mean                            +0.0038         +0.0040           384           385           384           385
BM_sinsp_split_container_image_median                          +0.0020         +0.0022           384           384           383           384
BM_sinsp_split_container_image_stddev                          +0.7046         +0.7123             3             5             3             5
BM_sinsp_split_container_image_cv                              +0.6982         +0.7055             0             0             0             0

Copy link

codecov bot commented Nov 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.79%. Comparing base (10d5968) to head (a758134).
Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2149   +/-   ##
=======================================
  Coverage   74.79%   74.79%           
=======================================
  Files         254      254           
  Lines       33510    33510           
  Branches     5735     5735           
=======================================
  Hits        25065    25065           
+ Misses       8432     8420   -12     
- Partials       13       25   +12     
Flag Coverage Δ
libsinsp 74.79% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@FedeDP
Copy link
Contributor

FedeDP commented Nov 5, 2024

/milestone 0.19.0

@poiana poiana added this to the 0.19.0 milestone Nov 5, 2024
@@ -32,6 +32,7 @@ include(ExternalProject)
include(BuildPkgConfigDependencies)
include(jsoncpp)
include(zlib)
include(tbb)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need to also drop some

#if !defined(__EMSCRIPTEN__)
#include "tbb/concurrent_unordered_map.h"
#endif

eg: in libsinsp/dns_manager.h?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad! I didn't commit the changes. Let me fix it!

Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana
Copy link
Contributor

poiana commented Nov 6, 2024

LGTM label has been added.

Git tree hash: cdac25b31ccb6f30e403ab38f9d7f53363bf9693

@poiana poiana added the approved label Nov 6, 2024
Copy link
Member

@Andreagit97 Andreagit97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@therealbobo
Copy link
Contributor Author

I'll investigate the failure further given that the fix didn't work @FedeDP

@FedeDP
Copy link
Contributor

FedeDP commented Nov 8, 2024

Have you rebased this branch on latest master?

Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana poiana added the lgtm label Nov 8, 2024
@poiana
Copy link
Contributor

poiana commented Nov 8, 2024

LGTM label has been added.

Git tree hash: 4a82aec18303d0fefaa391bd97d64daec7471e21

@poiana
Copy link
Contributor

poiana commented Nov 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, therealbobo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit aeea096 into falcosecurity:master Nov 8, 2024
48 of 49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants