-
Notifications
You must be signed in to change notification settings - Fork 705
Cleanup of PcapLiveDevice
capture machinery.
#1838
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
Open
Dimi1010
wants to merge
8
commits into
seladb:dev
Choose a base branch
from
Dimi1010:refactor/standalone-capture-callbacks
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Cleanup of PcapLiveDevice
capture machinery.
#1838
Dimi1010
wants to merge
8
commits into
seladb:dev
from
Dimi1010:refactor/standalone-capture-callbacks
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Removed redundant fields.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #1838 +/- ##
==========================================
- Coverage 82.98% 82.93% -0.06%
==========================================
Files 284 284
Lines 48887 49020 +133
Branches 10334 10601 +267
==========================================
+ Hits 40571 40656 +85
- Misses 7173 7241 +68
+ Partials 1143 1123 -20
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR moves the implementation of the capture procedures to internally linked functions in
PcapLiveDevice.cpp
and aims to reduce the the need for extensive bookkeeping of capture thread only variables.The static member function callback routines for
pcap_dispatch
have been replaced with internal linkage free functions to improve readability and encapsulation. The user token is now expected to be a pointer to a specific capture context object instead of the device instance.Replacement list:
onPacketArrivesCallback
replacesonPacketArrives
. Expects user token of typeCaptureContext
onPacketArrivesAccumulator
replacesonPacketArrivesNoCallback
. Expects user token of typeAccumulatorCaptureContext
onPacketArrivesCallbackWithCancellation
replacesonPacketArrivesBlockingMode
. Expects user token of typeCaptureContextST
onPacketArrivesNoop
to be used when no handling is required.Replaced
captureThreadMain
static private function with internal linkage free functions. The free functions take their inputs as parameters instead of relying on data from the implicitthis
pointer, simplifying data ownership and reducing risk of data races.captureThreadMain
- used for callback or noop capture.captureThreadMainAccumulator
- used for accumulating the packets into aRawPacketVector
.Changed blocking mode capture to utilize
onPacketArrivesCallbackWithCancellation
. The new infrastructure provides a layer of separation between the device threading machinery and the cancellation requests by relying onrequestStop
flag to record a cancellation request that is then forwarded tom_StopThread
after dispatch finishes instead of directly writing tom_StopThread
.Removed
PcapLiveDevice
member fields previously only used to store data for the capture thread as that data is now stored in context objects created on demand during capture startup.