Paths

Table of Contentst

Differential D17134

net: use Sock::WaitMany() instead of CConnman::SocketEvents()
ClosedPublic
Actions

Authored by PiRK on Wed, Nov 13, 17:52.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCadc9c8e45a53: net: use Sock::WaitMany() instead of CConnman::SocketEvents()

Summary

Rename GenerateSelectSet() to GenerateWaitSockets() and adapt it to
generate a wait data suitable for Sock::WaitMany(). Then call it from
CConnman::SocketHandler() and feed the generated data to
Sock::WaitMany().

This way CConnman::SocketHandler() can be unit tested because
Sock::WaitMany() is mockable, so the usage of real sockets can be
avoided.

Resolves https://github.com/bitcoin/bitcoin/issues/21744

This concludes backport of core#24356
https://github.com/bitcoin/bitcoin/pull/24356/commits/6e68ccbefea6509c61fc4405a391a517c6057bb0

Depends on D17133

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Wed, Nov 13, 17:52

Herald added a reviewer: Restricted Project. · View Herald TranscriptWed, Nov 13, 17:52

PiRK requested review of this revision.Wed, Nov 13, 17:52

teamcity edited the summary of this revision. (Show Details)Wed, Nov 13, 17:53

Harbormaster completed remote builds in B31129: Diff 50844.Wed, Nov 13, 18:44

Fabien accepted this revision.Thu, Nov 14, 09:04

This revision is now accepted and ready to land.Thu, Nov 14, 09:04

rebase

Harbormaster completed remote builds in B31143: Diff 50859.Thu, Nov 14, 12:18

PiRK added a child revision: D17138: Rework receive buffer pushback.Thu, Nov 14, 15:23

Closed by commit rABCadc9c8e45a53: net: use Sock::WaitMany() instead of CConnman::SocketEvents() (authored by Vasil Dimov <vd@FreeBSD.org>, committed by PiRK). · Explain WhyMon, Nov 18, 06:42

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABCadc9c8e45a53: net: use Sock::WaitMany() instead of CConnman::SocketEvents().

PiRK removed a child revision: D17138: Rework receive buffer pushback.Mon, Nov 18, 20:01

Revision Contents
Changeset List

Path

Size

src/

net.h

37 lines

net.cpp

203 lines

Diff 50918

View Options

src/net.h