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

update(cmake): Make sure we link zlib with the correct Windows CRT #1940

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

geraldcombs
Copy link
Contributor

Set CMAKE_POLICY_DEFAULT_CMP0091, CMAKE_MSVC_RUNTIME_LIBRARY, and CMAKE_BUILD_TYPE when we configure zlib, similar to our other dependencies.

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:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Set CMAKE_POLICY_DEFAULT_CMP0091, CMAKE_MSVC_RUNTIME_LIBRARY,
and CMAKE_BUILD_TYPE when we configure zlib, similar to our other
dependencies.

Signed-off-by: Gerald Combs <[email protected]>
@FedeDP
Copy link
Contributor

FedeDP commented Jun 28, 2024

/milestone 0.18.0

@poiana poiana added this to the 0.18.0 milestone Jun 28, 2024
Copy link

Perf diff from master - unit tests

     7.20%     +1.24%  [.] sinsp::next
     5.11%     -1.06%  [.] sinsp_parser::process_event
     5.02%     -0.68%  [.] next
     0.60%     +0.67%  [.] scap_event_encode_params_v
     1.03%     -0.45%  [.] std::_Hashtable<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libsinsp::state::dynamic_struct::field_info>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libsinsp::state::dynamic_struct::field_info> >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::find
     0.63%     -0.44%  [.] get_event_param_as<long>
     1.46%     +0.44%  [.] 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> >::_M_find_before_node
     0.74%     -0.40%  [.] sinsp_fdtable::sinsp_fdtable
     1.31%     -0.39%  [.] sinsp_parser::parse_context_switch
     0.15%     +0.36%  [.] std::_Hashtable<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libsinsp::state::dynamic_struct::field_info>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libsinsp::state::dynamic_struct::field_info> >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::clear

Perf diff from master - scap file

     2.65%     +5.91%  [.] libsinsp::runc::match_container_id
    19.04%     -4.40%  [.] sinsp_filter_check::extract_nocache
    11.72%     -3.63%  [.] sinsp_evt_formatter::tostring_withformat
     5.09%     +2.43%  [.] 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> >::_M_find_before_node
     2.68%     +2.28%  [.] sinsp::next
     5.98%     -1.90%  [.] sinsp_thread_manager::get_thread_ref
     8.31%     -1.40%  [.] sinsp_parser::reset
     8.15%     -1.31%  [.] sinsp_filter_check::rawval_to_string
     5.03%     -1.30%  [.] sinsp_filter_check_thread::extract_single
     4.02%     -0.61%  [.] sinsp_evt::get_type

Heap diff from master - unit tests

total runtime: 0.02s.
calls to allocation functions: 207 (8625/s)
temporary memory allocations: -145 (-6041/s)
peak heap memory consumption: 0B
peak RSS (including heaptrack overhead): 0B
total memory leaked: 0B

Heap diff from master - scap file

total runtime: 0.06s.
calls to allocation functions: 0 (0/s)
temporary memory allocations: -2 (-33/s)
peak heap memory consumption: 0B
peak RSS (including heaptrack overhead): 0B
total memory leaked: 0B

Copy link
Contributor

@incertum incertum 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 Jun 28, 2024

LGTM label has been added.

Git tree hash: 8763591bc83faef522f083dfa95ff1d5f0411e98

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
Thanks!

@poiana
Copy link
Contributor

poiana commented Jun 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: FedeDP, geraldcombs, incertum

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 1058afc into falcosecurity:master Jun 28, 2024
42 of 43 checks passed
@FedeDP FedeDP mentioned this pull request Jul 23, 2024
@FedeDP
Copy link
Contributor

FedeDP commented Jul 31, 2024

/milestone 0.17.3

@poiana poiana modified the milestones: 0.18.0, 0.17.3 Jul 31, 2024
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