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): Build zlib using CMake on Windows #1899

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

geraldcombs
Copy link
Contributor

Build zlib using CMake on Windows instead of nmake. The nmakefile passes "-base:0x5A4C0000" to the linker, which is too small on Arm64 and not really needed or wanted on any platform these days.

madler/zlib#325

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

@FedeDP
Copy link
Contributor

FedeDP commented Jun 11, 2024

/milestone 0.18.0

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

poiana commented Jun 24, 2024

LGTM label has been added.

Git tree hash: c91900345ad6e4cae9dee16c561ccb3bbb3a7d8a

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

@incertum
Copy link
Contributor

We likely need a rebase, thanks!

Build zlib using CMake on Windows instead of nmake. The nmakefile passes
"-base:0x5A4C0000" to the linker, which is too small on Arm64 and not
really needed or wanted on any platform these days.

madler/zlib#325

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

We likely need a rebase, thanks!

Done.

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

@poiana
Copy link
Contributor

poiana commented Jun 27, 2024

LGTM label has been added.

Git tree hash: 755300389345c711868ed2288d462ddb57ab15fa

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 Jun 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [Andreagit97,FedeDP,LucaGuerra]

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

Copy link

Perf diff from master - unit tests

     4.13%     -1.30%  [.] sinsp_evt::load_params
     4.29%     -1.16%  [.] gzfile_read
     3.26%     +0.85%  [.] sinsp_thread_manager::get_thread_ref
     1.07%     +0.67%  [.] std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>
     0.36%     +0.47%  [.] std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_weak_release
     0.92%     -0.38%  [.] sinsp_threadinfo::~sinsp_threadinfo
     0.88%     +0.37%  [.] sinsp_evt::get_ts
     4.34%     +0.36%  [.] sinsp_thread_manager::find_thread
     1.17%     -0.33%  [.] scap_event_encode_params_v
     0.31%     +0.33%  [.] sinsp_parser::parse_rw_exit

Perf diff from master - scap file

     2.90%     +9.44%  [.] sinsp_filter_check::extract_nocache
    20.08%     -7.64%  [.] sinsp_evt_formatter::tostring_withformat
     2.91%     +6.20%  [.] sinsp::next
    11.55%     -3.99%  [.] sinsp_filter_check_event::extract_single
     8.69%     -3.79%  [.] sinsp_filter_check::rawval_to_string
     2.92%     +3.02%  [.] 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.87%     +2.98%  [.] sinsp_filter_check::get_field_info
     5.81%     -2.02%  [.] libsinsp::runc::match_container_id
     5.82%     -2.01%  [.] 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, std::shared_ptr<sinsp_container_info const> >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::shared_ptr<sinsp_container_info const> > >, 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> >::_M_find_before_node
     2.88%     +1.23%  [.] 0x00000000000a74c0

Heap diff from master - unit tests

total runtime: -0.13s.
calls to allocation functions: 1337 (-10284/s)
temporary memory allocations: 506 (-3892/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.00s.
calls to allocation functions: 0 (0/s)
temporary memory allocations: 1 (250/s)
peak heap memory consumption: 0B
peak RSS (including heaptrack overhead): 0B
total memory leaked: 0B

@poiana poiana merged commit fac0ae4 into falcosecurity:master Jun 27, 2024
40 of 43 checks passed
@FedeDP
Copy link
Contributor

FedeDP commented Jun 28, 2024

Ehy @geraldcombs it seems like this PR broke master CI:

CI Build / build-libs-others-amd64 😨 (windows-latest, MultiThreaded) (push) Failing after 5m

Can you give it a look?

@geraldcombs
Copy link
Contributor Author

Ehy @geraldcombs it seems like this PR broke master CI:

CI Build / build-libs-others-amd64 😨 (windows-latest, MultiThreaded) (push) Failing after 5m

Can you give it a look?

Fix inbound in #1940.

@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
@FedeDP FedeDP mentioned this pull request 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.

6 participants