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.

Sign up for GitHub

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

Jump to bottom

Parallel txset nomination #4486

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Parallel txset nomination #4486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
051da59
Initial support for parallel Soroban phase XDR.
dmkozh Jun 12, 2024
af306b2
Add support for the max number of threads per ledger config setting.
dmkozh Jul 2, 2024
0fcd134
Parallel tx set nomination
dmkozh Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ exit /b 0
<ClCompile Include="..\..\src\herder\HerderSCPDriver.cpp" />
<ClCompile Include="..\..\src\herder\HerderUtils.cpp" />
<ClCompile Include="..\..\src\herder\LedgerCloseData.cpp" />
<ClCompile Include="..\..\src\herder\ParallelTxSetBuilder.cpp" />
<ClCompile Include="..\..\src\herder\PendingEnvelopes.cpp" />
<ClCompile Include="..\..\src\herder\QuorumIntersectionCheckerImpl.cpp" />
<ClCompile Include="..\..\src\herder\QuorumTracker.cpp" />
Expand Down Expand Up @@ -684,6 +685,8 @@ exit /b 0
<ClCompile Include="..\..\src\overlay\Tracker.cpp" />
<ClCompile Include="..\..\src\overlay\TxAdverts.cpp" />
<ClCompile Include="..\..\src\overlay\TxDemandsManager.cpp" />
<ClCompile Include="..\..\src\simulation\ApplyLoad.cpp" />
<ClCompile Include="..\..\src\simulation\TxGenerator.cpp" />
<ClCompile Include="..\..\src\test\FuzzerImpl.cpp" />
<ClCompile Include="..\..\src\transactions\AllowTrustOpFrame.cpp" />
<ClCompile Include="..\..\src\transactions\BeginSponsoringFutureReservesOpFrame.cpp" />
Expand Down Expand Up @@ -996,6 +999,7 @@ exit /b 0
<ClInclude Include="..\..\src\herder\HerderSCPDriver.h" />
<ClInclude Include="..\..\src\herder\HerderUtils.h" />
<ClInclude Include="..\..\src\herder\LedgerCloseData.h" />
<ClInclude Include="..\..\src\herder\ParallelTxSetBuilder.h" />
<ClInclude Include="..\..\src\herder\PendingEnvelopes.h" />
<ClInclude Include="..\..\src\herder\QuorumIntersectionChecker.h" />
<ClInclude Include="..\..\src\herder\QuorumIntersectionCheckerImpl.h" />
Expand Down Expand Up @@ -1104,6 +1108,8 @@ exit /b 0
<ClInclude Include="..\..\src\overlay\Tracker.h" />
<ClInclude Include="..\..\src\overlay\TxAdverts.h" />
<ClInclude Include="..\..\src\overlay\TxDemandsManager.h" />
<ClInclude Include="..\..\src\simulation\ApplyLoad.h" />
<ClInclude Include="..\..\src\simulation\TxGenerator.h" />
<ClInclude Include="..\..\src\test\Fuzzer.h" />
<ClInclude Include="..\..\src\test\FuzzerImpl.h" />
<ClInclude Include="..\..\src\transactions\AllowTrustOpFrame.h" />
Expand Down
18 changes: 18 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,15 @@
<ClCompile Include="..\..\src\ledger\LedgerStateSnapshot.cpp">
<Filter>ledger</Filter>
</ClCompile>
<ClCompile Include="..\..\src\herder\ParallelTxSetBuilder.cpp">
<Filter>herder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\simulation\ApplyLoad.cpp">
<Filter>simulation</Filter>
</ClCompile>
<ClCompile Include="..\..\src\simulation\TxGenerator.cpp">
<Filter>simulation</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\util\cpptoml.h">
Expand Down Expand Up @@ -2402,6 +2411,15 @@
<ClInclude Include="..\..\src\main\QueryServer.h">
<Filter>main</Filter>
</ClInclude>
<ClInclude Include="..\..\src\herder\ParallelTxSetBuilder.h">
<Filter>herder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\simulation\ApplyLoad.h">
<Filter>simulation</Filter>
</ClInclude>
<ClInclude Include="..\..\src\simulation\TxGenerator.h">
<Filter>simulation</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ledger\LedgerStateSnapshot.h">
<Filter>ledger</Filter>
</ClInclude>
Expand Down
12 changes: 11 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if test -z "${WFLAGS+set}"; then
WFLAGS="$WFLAGS -Werror=unused-result"
fi

test "${CFLAGS+set}" || CFLAGS="-g -O2 -fno-omit-frame-pointer"
test "${CFLAGS+set}" || CFLAGS="-g -fno-omit-frame-pointer"
test "${CXXFLAGS+set}" || CXXFLAGS="$CFLAGS"

AC_PROG_CC([clang gcc cc])
Expand Down Expand Up @@ -115,6 +115,16 @@ AS_IF([test "x$enable_codecoverage" = "xyes"], [
CFLAGS="$CFLAGS -fprofile-instr-generate -fcoverage-mapping"
])

AC_ARG_ENABLE([debugmode],
AS_HELP_STRING([--enable-debugmode],
[build in debug mode]))

AS_IF([test "x$enable_debugmode" != "xyes"], [
AC_MSG_NOTICE([ adding -O2 optimization flags ])
CXXFLAGS="$CXXFLAGS -O2"
CFLAGS="$CFLAGS -O2"
])

AC_ARG_ENABLE([threadsanitizer],
AS_HELP_STRING([--enable-threadsanitizer],
[build with thread-sanitizer (TSan) instrumentation]))
Expand Down
4 changes: 2 additions & 2 deletions src/herder/HerderImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ HerderImpl::triggerNextLedger(uint32_t ledgerSeqToTrigger,
// our first choice for this round's set is all the tx we have collected
// during last few ledger closes
auto const& lcl = mLedgerManager.getLastClosedLedgerHeader();
TxSetPhaseTransactions txPhases;
PerPhaseTransactionList txPhases;
txPhases.emplace_back(mTransactionQueue.getTransactions(lcl.header));

if (protocolVersionStartsFrom(lcl.header.ledgerVersion,
Expand Down Expand Up @@ -1415,7 +1415,7 @@ HerderImpl::triggerNextLedger(uint32_t ledgerSeqToTrigger,
upperBoundCloseTimeOffset = nextCloseTime - lcl.header.scpValue.closeTime;
lowerBoundCloseTimeOffset = upperBoundCloseTimeOffset;

TxSetPhaseTransactions invalidTxPhases;
PerPhaseTransactionList invalidTxPhases;
invalidTxPhases.resize(txPhases.size());

auto [proposedSet, applicableProposedSet] =
Expand Down
Loading
Loading