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

TransactionScheduler: Consume Scheduler w/ PrioGraph #33612

Merged
merged 19 commits into from
Oct 24, 2023
Merged

TransactionScheduler: Consume Scheduler w/ PrioGraph #33612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
eb42e9b
Add prio_graph_scheduler.rs
apfitzge Oct 9, 2023
db4a9ef
Add prio-graph dependency
apfitzge Oct 9, 2023
fb0a52d
Basic structure for schedule
apfitzge Oct 9, 2023
099c4d7
Add Batches
apfitzge Oct 9, 2023
ff3a94f
send_batch(es)
apfitzge Oct 9, 2023
7014bb7
complete_batch
apfitzge Oct 9, 2023
896bb3c
select_thread
apfitzge Oct 9, 2023
ba8b263
TransactionStateContainer::pop
apfitzge Oct 9, 2023
cd49ed4
schedule
apfitzge Oct 9, 2023
dfdc9a8
Add schedule tests
apfitzge Oct 9, 2023
6443dc4
Priority guard test
apfitzge Oct 9, 2023
9e704c9
programs cargo lock
apfitzge Oct 9, 2023
0042813
PrioGraph owns Receiver<FinishedConsumeWork>
apfitzge Oct 19, 2023
4bc3913
Convert priority_guard test to use receive_completed
apfitzge Oct 19, 2023
40f292c
Updated test comment
apfitzge Oct 20, 2023
e40749a
Expand test case and add clarifying comments
apfitzge Oct 20, 2023
1935566
get_transaction_account_access
apfitzge Oct 20, 2023
c0fbeba
num_scheduled check move
apfitzge Oct 20, 2023
96c7751
panic on missing transaction state
apfitzge Oct 20, 2023
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
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ members = [
"zk-token-sdk",
]

exclude = [
"programs/sbf",
]
exclude = ["programs/sbf"]

# This prevents a Travis CI error when building for Windows.
resolver = "2"
Expand Down Expand Up @@ -220,7 +218,9 @@ indexmap = "2.0.2"
indicatif = "0.17.7"
Inflector = "0.11.4"
itertools = "0.10.5"
jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }
jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = [
"unprefixed_malloc_on_supported_platforms",
] }
js-sys = "0.3.64"
json5 = "0.4.1"
jsonrpc-core = "18.0.0"
Expand Down Expand Up @@ -259,6 +259,7 @@ pickledb = { version = "0.5.1", default-features = false }
pkcs8 = "0.8.0"
predicates = "2.1"
pretty-hex = "0.3.0"
prio-graph = "0.1.0"
proc-macro2 = "1.0.69"
proptest = "1.2"
prost = "0.11.9"
Expand Down
1 change: 1 addition & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ log = { workspace = true }
lru = { workspace = true }
min-max-heap = { workspace = true }
num_enum = { workspace = true }
prio-graph = { workspace = true }
quinn = { workspace = true }
rand = { workspace = true }
rand_chacha = { workspace = true }
Expand Down
3 changes: 3 additions & 0 deletions core/src/banking_stage/transaction_scheduler/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ mod batch_id_generator;
#[allow(dead_code)]
mod in_flight_tracker;
#[allow(dead_code)]
mod prio_graph_scheduler;
mod scheduler_error;
#[allow(dead_code)]
mod transaction_id_generator;
Loading