summaryrefslogtreecommitdiff
path: root/lib/block_allocator.cpp
diff options
context:
space:
mode:
authorJosh Blum2013-06-05 22:26:26 -0700
committerJosh Blum2013-06-05 22:26:26 -0700
commit43c7ef3e7807ad3035a2882d237b0441e6102817 (patch)
treee7d559f27cf3329d3c1b7e008b2cb422bd72eda9 /lib/block_allocator.cpp
parent58a54c2cc19113d7644b80ec032b89fa1c38a54a (diff)
downloadsandhi-43c7ef3e7807ad3035a2882d237b0441e6102817.tar.gz
sandhi-43c7ef3e7807ad3035a2882d237b0441e6102817.tar.bz2
sandhi-43c7ef3e7807ad3035a2882d237b0441e6102817.zip
gras: compiles now with separate data struct
Diffstat (limited to 'lib/block_allocator.cpp')
-rw-r--r--lib/block_allocator.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/block_allocator.cpp b/lib/block_allocator.cpp
index 0dda99a..86732e2 100644
--- a/lib/block_allocator.cpp
+++ b/lib/block_allocator.cpp
@@ -62,10 +62,10 @@ void BlockActor::handle_top_alloc(const TopAllocMessage &, const Theron::Address
for (size_t i = 0; i < num_outputs; i++)
{
const size_t bytes = recommend_length(
- this->output_allocation_hints[i],
- my_round_up_mult(AT_LEAST_BYTES, this->output_configs[i].item_size),
- this->output_configs[i].reserve_items*this->output_configs[i].item_size,
- this->output_configs[i].maximum_items*this->output_configs[i].item_size
+ data->output_allocation_hints[i],
+ my_round_up_mult(AT_LEAST_BYTES, data->output_configs[i].item_size),
+ data->output_configs[i].reserve_items*data->output_configs[i].item_size,
+ data->output_configs[i].maximum_items*data->output_configs[i].item_size
);
SBufferDeleter deleter = boost::bind(&buffer_returner, this->thread_pool, this->GetAddress(), i, _1);
@@ -74,11 +74,11 @@ void BlockActor::handle_top_alloc(const TopAllocMessage &, const Theron::Address
SBufferConfig config;
config.memory = NULL;
config.length = bytes;
- config.affinity = this->buffer_affinity;
+ config.affinity = data->buffer_affinity;
config.token = token;
BufferQueueSptr queue = block_ptr->output_buffer_allocator(i, config);
- this->output_queues.set_buffer_queue(i, queue);
+ data->output_queues.set_buffer_queue(i, queue);
InputAllocMessage message;
//new token for the downstream allocator