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

cleanup(scap,sinsp): remove userspace/common #1454

Merged
merged 4 commits into from
Nov 2, 2023

Conversation

gnosek
Copy link
Contributor

@gnosek gnosek commented Oct 30, 2023

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-engine-udig

/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:

This PR removes userspace/common/. It contained:

  • int types defined in types.h, which can be easily replaced with stdint.h
  • a #define for strcasecmp for MSVC, moved to the one place that uses it (note: it's inconsistent with the other place that uses strcasecmp
  • falcosecurity/log.h which should just live in scap
  • strl* implementations for when an environment doesn't supply them; I moved this to libscap/

The downside of having all this outside libscap is complicating the include path, especially given that types.h was included in driver/ppm_events_public.h using a relative path, which just about made it impossible to include directly outside libscap. Sadly, the config file for strl.h still needs to be autogenerated but that can be mostly handled via LIBSCAP_INCLUDE_DIRS.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

None of the shouting BREAKING CHANGEs below should really affect users of the code but still.

Does this PR introduce a user-facing change?:

cleanup(build): you no longer need to include ../common
BREAKING CHANGE: ../common/falcosecurity/log.h is now scap_log.h
BREAKING CHANGE: ../common/types.h no longer exists (use stdint.h)
BREAKING CHANGE: ../common/strl.h is now strl.h (within libscap)
BREAKING CHANGE: ../common/common_config.h (used only by strl.h) is now scap_strl_config.h

@github-actions
Copy link

Please double check driver/SCHEMA_VERSION file. See versioning.

/hold

@gnosek
Copy link
Contributor Author

gnosek commented Oct 30, 2023

Please double check driver/SCHEMA_VERSION file. See versioning.

Dear bot, I did double-check. Replacing __u64 with uint64_t doesn't really constitute an API change.

@gnosek
Copy link
Contributor Author

gnosek commented Oct 30, 2023

/unhold

@poiana
Copy link
Contributor

poiana commented Oct 31, 2023

LGTM label has been added.

Git tree hash: db02bc8932cb3528b8534e71b7829bf6fca0e49e

@jasondellaluce
Copy link
Contributor

/milestone 0.14.0

@poiana poiana added this to the 0.14.0 milestone Oct 31, 2023
Yes, the strl* functions are used in libsinsp too, but that
doesn't make them too different from all the other helper
functions.

Eventually this could become a tiny library of its own but we're
not quite there yet.

Signed-off-by: Grzegorz Nosek <[email protected]>
@gnosek
Copy link
Contributor Author

gnosek commented Oct 31, 2023

New changes are detected. LGTM label has been removed.

FWIW it's just a (conflict-free) rebase, zero code changes

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 2, 2023

LGTM label has been added.

Git tree hash: 166b473194175fb441508bd19a5553c89156c3ef

@poiana
Copy link
Contributor

poiana commented Nov 2, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: FedeDP, gnosek, jasondellaluce

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 [FedeDP,gnosek,jasondellaluce]

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 129a62c into falcosecurity:master Nov 2, 2023
30 of 31 checks passed
@gnosek gnosek deleted the remove-common branch November 4, 2023 06:55
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