-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat: move allocation logic to rust #1835
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| use std::cmp::min; | ||
| use tokio::sync::{mpsc, oneshot}; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub(crate) struct BlockAllocation { | ||
| pub blocks: Vec<u32>, | ||
| pub slots: Vec<u32>, | ||
| block_allocator: BlockAllocator, | ||
| } | ||
|
|
||
| impl Drop for BlockAllocation { | ||
| fn drop(&mut self) { | ||
| self.block_allocator.free(self.blocks.clone()) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub(crate) struct BlockAllocator { | ||
| /// Channel to communicate with the background task | ||
| block_allocator: mpsc::UnboundedSender<BlockAllocatorCommand>, | ||
| } | ||
|
|
||
| impl BlockAllocator { | ||
| pub(crate) fn new( | ||
| max_batch_total_tokens: u32, | ||
| block_size: u32, | ||
| window_size: Option<u32>, | ||
| ) -> Self { | ||
| // Create channel | ||
| let (sender, receiver) = mpsc::unbounded_channel(); | ||
|
|
||
| // Launch background queue task | ||
| tokio::spawn(block_allocator_task( | ||
| max_batch_total_tokens / block_size, | ||
| block_size, | ||
| window_size, | ||
| receiver, | ||
| )); | ||
|
|
||
| Self { | ||
| block_allocator: sender, | ||
| } | ||
| } | ||
|
|
||
| pub(crate) async fn allocate(&self, tokens: u32) -> Option<BlockAllocation> { | ||
| let (response_sender, response_receiver) = oneshot::channel(); | ||
| self.block_allocator | ||
| .send(BlockAllocatorCommand::Allocate { | ||
| tokens, | ||
| response_sender, | ||
| }) | ||
| .unwrap(); | ||
|
|
||
| response_receiver | ||
| .await | ||
| .unwrap() | ||
| .map(|(blocks, slots)| BlockAllocation { | ||
| blocks, | ||
| slots, | ||
| block_allocator: self.clone(), | ||
| }) | ||
| } | ||
|
|
||
| pub(crate) fn free(&self, blocks: Vec<u32>) { | ||
| self.block_allocator | ||
| .send(BlockAllocatorCommand::Free { blocks }) | ||
| .unwrap(); | ||
| } | ||
| } | ||
|
|
||
| async fn block_allocator_task( | ||
| blocks: u32, | ||
| block_size: u32, | ||
| window_size: Option<u32>, | ||
| mut receiver: mpsc::UnboundedReceiver<BlockAllocatorCommand>, | ||
| ) { | ||
| // Block 0 is reserved for health checks | ||
| let mut free_blocks: Vec<u32> = (1..blocks).collect(); | ||
| while let Some(cmd) = receiver.recv().await { | ||
| match cmd { | ||
| BlockAllocatorCommand::Free { blocks } => free_blocks.extend(blocks), | ||
| BlockAllocatorCommand::Allocate { | ||
| tokens, | ||
| response_sender, | ||
| } => { | ||
| // Apply window size | ||
| let (required_blocks, repeats) = { | ||
| let (tokens, repeats) = match window_size { | ||
| None => (tokens, 1), | ||
| Some(window_size) => { | ||
| let repeats = (tokens + window_size - 1) / window_size; | ||
| let tokens = min(tokens, window_size); | ||
| (tokens, repeats as usize) | ||
| } | ||
| }; | ||
| // Pad to a multiple of block size | ||
| let required_blocks = (tokens + block_size - 1) / block_size; | ||
| (required_blocks, repeats) | ||
| }; | ||
|
|
||
| let tokens = tokens as usize; | ||
| let allocation = if required_blocks > free_blocks.len() as u32 { | ||
| None | ||
| } else { | ||
| let blocks = | ||
| free_blocks.split_off(free_blocks.len() - required_blocks as usize); | ||
| let mut slots = Vec::with_capacity( | ||
| (required_blocks * block_size * repeats as u32) as usize, | ||
| ); | ||
|
|
||
| 'slots: for block_id in blocks.repeat(repeats).iter() { | ||
| for s in (block_id * block_size)..((block_id + 1) * block_size) { | ||
| slots.push(s); | ||
| if slots.len() == tokens { | ||
| break 'slots; | ||
| } | ||
| } | ||
| } | ||
| Some((blocks, slots)) | ||
| }; | ||
| response_sender.send(allocation).unwrap(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| enum BlockAllocatorCommand { | ||
| Free { | ||
| blocks: Vec<u32>, | ||
| }, | ||
| Allocate { | ||
| tokens: u32, | ||
| response_sender: oneshot::Sender<Option<(Vec<u32>, Vec<u32>)>>, | ||
| }, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| mod block_allocator; | ||
| mod queue; | ||
| mod scheduler; | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.