Skip to content

Conversation

@fanquake
Copy link
Member

Extracted from #26292.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK afbcd22, tested on Ubuntu 22.04.

FWIW, ./configure --with-experimental-kernel-lib --enable-experimental-util-chainstate && make still works even with the following diff:

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -886,7 +886,6 @@ libbitcoinkernel_la_SOURCES = \
   chain.cpp \
   chainparamsbase.cpp \
   chainparams.cpp \
-  clientversion.cpp \
   coins.cpp \
   compressor.cpp \
   consensus/merkle.cpp \
@@ -895,11 +894,9 @@ libbitcoinkernel_la_SOURCES = \
   core_read.cpp \
   dbwrapper.cpp \
   deploymentinfo.cpp \
-  deploymentstatus.cpp \
   flatfile.cpp \
   fs.cpp \
   hash.cpp \
-  kernel/chain.cpp \
   kernel/checks.cpp \
   kernel/coinstats.cpp \
   kernel/context.cpp \
@@ -932,7 +929,6 @@ libbitcoinkernel_la_SOURCES = \
   signet.cpp \
   support/cleanse.cpp \
   support/lockedpool.cpp \
-  sync.cpp \
   txdb.cpp \
   txmempool.cpp \
   uint256.cpp \

@fanquake
Copy link
Member Author

still works even with the following diff:

  • sync.cpp \

That's because you didn't test with --enable-debug. Haven't looked at the other suggestions.

@hebasto
Copy link
Member

hebasto commented Oct 31, 2022

That's because you didn't test with --enable-debug.

Correct.

Haven't looked at the other suggestions.

./configure --with-experimental-kernel-lib --enable-experimental-util-chainstate --enable-debug && make still works with the following diff on Ubuntu 22.04:

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -886,7 +886,6 @@ libbitcoinkernel_la_SOURCES = \
   chain.cpp \
   chainparamsbase.cpp \
   chainparams.cpp \
-  clientversion.cpp \
   coins.cpp \
   compressor.cpp \
   consensus/merkle.cpp \
@@ -895,11 +894,9 @@ libbitcoinkernel_la_SOURCES = \
   core_read.cpp \
   dbwrapper.cpp \
   deploymentinfo.cpp \
-  deploymentstatus.cpp \
   flatfile.cpp \
   fs.cpp \
   hash.cpp \
-  kernel/chain.cpp \
   kernel/checks.cpp \
   kernel/coinstats.cpp \
   kernel/context.cpp \

@theuni
Copy link
Member

theuni commented Oct 31, 2022

Concept ACK.

FWIW, I anticipate threadinterrupt coming back to the kernel eventually as I think we'll want to use it to get rid of shutdown.cpp.

I think it's fine to re-add it when it's actually needed though.

@fanquake
Copy link
Member Author

still works with the following diff

  • deploymentstatus.cpp \

If "works" means compiles, then sure, however this also drops the compile-time deployment status sanity checks from the kernel build.

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

Code review ACK afbcd22

@fanquake fanquake merged commit c041d8f into bitcoin:master Nov 1, 2022
@fanquake fanquake deleted the kernel_remove_threadinterrupt branch November 1, 2022 10:13
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 1, 2022
afbcd22 build: remove threadinterrupt from libbitcoinkernel (fanquake)

Pull request description:

  Extracted from bitcoin#26292.

ACKs for top commit:
  hebasto:
    ACK afbcd22, tested on Ubuntu 22.04.
  ryanofsky:
    Code review ACK afbcd22

Tree-SHA512: 9d355f0e417561be41cdd0674a8f94c9ffe3ecfb4063bb9c90f1032cb9d471be11d4fa26de40993e3a411e015272201551fbbb3d3c2b43e4c17bf49386a2741c
@bitcoin bitcoin locked and limited conversation to collaborators Nov 1, 2023
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.

4 participants