Author: tjansen Date: Thu Oct 15 16:59:37 2009 New Revision: 1179 Log: Renamed pisa_perf_set to pisa_perf in neighbor daemon. Fixes compilation with --enable-performance. Modified: trunk/pisand/ndmain.c Modified: trunk/pisand/ndmain.c ============================================================================== --- trunk/pisand/ndmain.c Thu Oct 15 16:55:54 2009 (r1178) +++ trunk/pisand/ndmain.c Thu Oct 15 16:59:37 2009 (r1179) @@ -789,7 +789,7 @@ #ifdef CONFIG_PISA_PERFORMANCE if (!pisand_bench_ne_on) { PISA_DEBUG(PL_GENERIC, "Starting PERF_NEIGHBOR_EXCHANGE\n"); - pisa_perf_start_benchmark(pisa_perf_set, PERF_NEIGHBOR_EXCHANGE); + pisa_perf_start_benchmark(pisa_perf, PERF_NEIGHBOR_EXCHANGE); pisand_bench_ne_on = TRUE; } @@ -803,7 +803,7 @@ { #ifdef CONFIG_PISA_PERFORMANCE PISA_DEBUG(PL_GENERIC, "Stopping PERF_NEIGHBOR_EXCHANGE\n"); - pisa_perf_stop_benchmark(pisa_perf_set, PERF_NEIGHBOR_EXCHANGE); + pisa_perf_stop_benchmark(pisa_perf, PERF_NEIGHBOR_EXCHANGE); pisand_bench_ne_on = FALSE; #endif @@ -816,7 +816,7 @@ { #ifdef CONFIG_PISA_PERFORMANCE PISA_DEBUG(PL_GENERIC, "Writing PERF_NEIGHBOR_EXCHANGE\n"); - pisa_perf_write_benchmark(pisa_perf_set, PERF_NEIGHBOR_EXCHANGE); + pisa_perf_write_benchmark(pisa_perf, PERF_NEIGHBOR_EXCHANGE); #endif } @@ -827,13 +827,13 @@ { #ifdef CONFIG_PISA_PERFORMANCE PISA_DEBUG(PL_GENERIC, "Creating the performance set.\n"); - pisa_perf_set = pisa_perf_create(PERF_MAX); + pisa_perf = pisa_perf_create(PERF_MAX); pisa_check_and_create_dir(PISA_DIR_PERF_RESULTS, DEFAULT_CONFIG_DIR_MODE); - pisa_perf_set_name(pisa_perf_set, PERF_NEIGHBOR_EXCHANGE, PISA_DIR_PERF_RESULTS"/PERF_neighbor_exchange.csv"); + pisa_perf_set_name(pisa_perf, PERF_NEIGHBOR_EXCHANGE, PISA_DIR_PERF_RESULTS"/PERF_neighbor_exchange.csv"); - pisa_perf_open(pisa_perf_set); + pisa_perf_open(pisa_perf); #endif } @@ -843,7 +843,7 @@ static void nd_perf_destroy(void) { #ifdef CONFIG_PISA_PERFORMANCE - pisa_perf_destroy(pisa_perf_set); + pisa_perf_destroy(pisa_perf); #endif }