From 2e237f2e2b769b6a9ef7964445a39799dbd4c43c Mon Sep 17 00:00:00 2001 From: Sears Russell Date: Fri, 4 Dec 2009 19:26:23 +0000 Subject: [PATCH] fix memory allocation bug in rose benchmark initialization code --- benchmarks/roseTableTpcCH-workload2.cpp | 2 +- src/stasis/flags.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/roseTableTpcCH-workload2.cpp b/benchmarks/roseTableTpcCH-workload2.cpp index cb6137e..e358d1b 100644 --- a/benchmarks/roseTableTpcCH-workload2.cpp +++ b/benchmarks/roseTableTpcCH-workload2.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) { int ret; // multicolumn is deprecated; want static dispatch! - rose::plugin_id_t * plugins = (rose::plugin_id_t*)malloc(10 * sizeof(rose::plugin_id_t)); + rose::plugin_id_t * plugins = (rose::plugin_id_t*)malloc(20 * sizeof(rose::plugin_id_t)); plugins[0] = rose::plugin_id, Rle, typ0>(); plugins[1] = rose::plugin_id, Rle, typ1>(); // rle diff --git a/src/stasis/flags.c b/src/stasis/flags.c index e19f8db..8fc8835 100644 --- a/src/stasis/flags.c +++ b/src/stasis/flags.c @@ -14,7 +14,7 @@ #ifdef STASIS_BUFFER_MANAGER_FACTORY stasis_buffer_manager_t * stasis_buffer_manager_factory = STASIS_BUFFER_MANAGER_FACTORY; #else -stasis_buffer_manager_t * (*stasis_buffer_manager_factory)(stasis_log_t*, stasis_dirty_page_table_t*) = stasis_buffer_manager_concurrent_hash_factory; +stasis_buffer_manager_t * (*stasis_buffer_manager_factory)(stasis_log_t*, stasis_dirty_page_table_t*) = stasis_buffer_manager_hash_factory; #endif #ifdef BUFFER_MANAGER_O_DIRECT