Skip to content

Conversation

Empact
Copy link
Contributor

@Empact Empact commented Apr 25, 2023

As far as I can tell, the code calling for these includes was removed in:
6e68ccb #24356
82d360b #21387

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 25, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK fanquake
Concept ACK ccdle12
Stale ACK jonatack

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #27375 (net: support unix domain sockets for -proxy and -onion by pinheadmz)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@maflcko
Copy link
Member

maflcko commented Apr 26, 2023

Can you add this to iwyu CI to double check and aid reviewers?

@ccdle12
Copy link
Contributor

ccdle12 commented Apr 27, 2023

tACK

I also ran netbase.cpp through the iwyu CI and seems like there maybe a few more unused imports, but I haven't thoroughly tested removing the other ones

netbase.cpp should remove these lines:
- #include <fcntl.h>  // lines 25-25
- #include <poll.h>  // lines 29-29
- #include <chrono>  // lines 18-18
- #include <cstdint>  // lines 19-19
- #include <limits>  // lines 21-21

@jonatack
Copy link
Member

Can you add this to iwyu CI to double check and aid reviewers?

I did that recently for these files while working on #27385; the results are here: https://cirrus-ci.com/task/6749578737745920

Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK b095ac5

Noticed these while doing #27385. Per https://cirrus-ci.com/task/6749578737745920:

net.cpp should remove these lines:
- #include <clientversion.h>  // lines 15-15
- #include <crypto/sha256.h>  // lines 18-18
- #include <fcntl.h>  // lines 45-45
- #include <math.h>  // lines 63-63
- #include <poll.h>  // lines 53-53
- #include <array>  // lines 57-57
- #include <unordered_map>  // lines 61-61

netbase.cpp should remove these lines:
- #include <fcntl.h>  // lines 26-26
- #include <poll.h>  // lines 30-30
- #include <chrono>  // lines 19-19
- #include <cstdint>  // lines 20-20
- #include <limits>  // lines 22-22

Edit: #include <fcntl.h> should be added to util/sock.cpp

@bitcoin bitcoin deleted a comment Apr 28, 2023
@bitcoin bitcoin deleted a comment Apr 28, 2023
@Empact
Copy link
Contributor Author

Empact commented Apr 28, 2023

I'll update this PR on Sunday, just busy with http://btcpp.dev at the moment.

@fanquake
Copy link
Member

fanquake commented May 9, 2023

The scope of this has expanded, and it now conflicts with a number of things, that are much higher priority. You could wait until all the kernel / assumeutxo changes are merged, (and maybe also 27571, to remove the need to update the list), or, revert back to the original non-conflicting change, and that could probably be merged. Otherwise, I think this is likely to just sit for some time, and mostly generate merge-conflict noise in other drahtbot/other PRs.

As far as I can tell, the code calling for these includes was removed in:
6e68ccb bitcoin#24356
82d360b bitcoin#21387
@Empact Empact force-pushed the 2023-04-fcntl-poll-net branch from e6b6efc to 8d9b90a Compare June 28, 2023 21:39
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 8d9b90a

@DrahtBot DrahtBot requested a review from jonatack June 29, 2023 09:32
@fanquake fanquake merged commit e0cd745 into bitcoin:master Jun 29, 2023
@Empact Empact deleted the 2023-04-fcntl-poll-net branch June 29, 2023 15:29
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 30, 2023
… net(base).cpp

8d9b90a Remove now-unnecessary poll, fcntl includes from net(base).cpp (Ben Woosley)

Pull request description:

  As far as I can tell, the code calling for these includes was removed in:
  6e68ccb bitcoin#24356
  82d360b bitcoin#21387

ACKs for top commit:
  fanquake:
    ACK 8d9b90a

Tree-SHA512: e536d60f4cf204a10a5b461eca20c8329aa6b0fd3b27651ac9490ed42d3e22e31d652cd991ddc84c96e4758df15aefa7e7f84c710f2feb6d2e0fcfbda9ad4356
@bitcoin bitcoin locked and limited conversation to collaborators Jun 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants