[pisa-src] r1177 - trunk/pisacd/cdmain.c

From: Thomas Jansen <mithi@xxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Thu, 15 Oct 2009 16:52:27 +0200
Author: tjansen
Date: Thu Oct 15 16:52:27 2009
New Revision: 1177

Log:
Fixed client build with --enable-performance. 

Deprecating functions was neither complete nor consistent.

Modified:
   trunk/pisacd/cdmain.c

Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c       Thu Oct 15 16:52:05 2009        (r1176)
+++ trunk/pisacd/cdmain.c       Thu Oct 15 16:52:27 2009        (r1177)
@@ -38,6 +38,7 @@
 
 #ifdef CONFIG_PISA_PERFORMANCE
 #include "pisaperf.h"
+#ifdef REMOVE_PREAUTH_CODE
 static int pisacd_bench_all_on = FALSE;
 static int pisacd_bench_pa_on = FALSE;
 static int pisacd_bench_bu_on = FALSE;
@@ -55,6 +56,7 @@
 static void cd_perf_start_benchmark_netconf(void);
 static void cd_perf_stop_benchmark_netconf(void);
 static void cd_perf_write_benchmark_netconf(void);
+#endif /* REMOVE_PREAUTH_CODE */
 static void cd_perf_init(void);
 static void cd_perf_destroy(void);
 #endif /* CONFIG_PISA_PERFORMANCE */
@@ -974,9 +976,6 @@
        alarm(PISACD_DEFAULT_ALARM_INTERVAL);
 /*     PISA_DEBUG(PL_PREAUTH, "Starting alarm with %d seconds.\n", 
PISACD_DEFAULT_ALARM_INTERVAL);*/
 }
-#endif /* REMOVE_PREAUTH_CODE */
-
-#ifdef CONFIG_PISA_PERFORMANCE
 
 /**
  * Start the entire handover benchmark
@@ -1109,6 +1108,9 @@
        PISA_DEBUG(PL_PREAUTH, "Writing PERF_NETWORK_CONFIG\n");
        pisa_perf_write_benchmark(pisa_perf, PERF_NETWORK_CONFIG);
 }
+#endif /* REMOVE_PREAUTH_CODE */
+
+#ifdef CONFIG_PISA_PERFORMANCE
 
 /**
  * Initialize performance measurement data structure
@@ -1120,10 +1122,12 @@
 
        pisa_check_and_create_dir(PISA_DIR_PERF_RESULTS, 
DEFAULT_CONFIG_DIR_MODE);
 
-       pisa_perf_name(pisa_perf, PERF_HANDOVER_ALL, 
PISA_DIR_PERF_RESULTS"/PERF_handover_all.csv");
-       pisa_perf_name(pisa_perf, PERF_PRE_AUTHENTICATION, 
PISA_DIR_PERF_RESULTS"/PERF_pre_authentication.csv");
-       pisa_perf_name(pisa_perf, PERF_BINDING_UPDATE, 
PISA_DIR_PERF_RESULTS"/PERF_binding_update.csv");
-       pisa_perf_name(pisa_perf, PERF_NETWORK_CONFIG, 
PISA_DIR_PERF_RESULTS"/PERF_network_config.csv");
+#ifdef REMOVE_PREAUTH_CODE
+       pisa_perf_set_name(pisa_perf, PERF_HANDOVER_ALL, 
PISA_DIR_PERF_RESULTS"/PERF_handover_all.csv");
+       pisa_perf_set_name(pisa_perf, PERF_PRE_AUTHENTICATION, 
PISA_DIR_PERF_RESULTS"/PERF_pre_authentication.csv");
+       pisa_perf_set_name(pisa_perf, PERF_BINDING_UPDATE, 
PISA_DIR_PERF_RESULTS"/PERF_binding_update.csv");
+       pisa_perf_set_name(pisa_perf, PERF_NETWORK_CONFIG, 
PISA_DIR_PERF_RESULTS"/PERF_network_config.csv");
+#endif /* REMOVE_PREAUTH_CODE */
 
        pisa_perf_open(pisa_perf);
 }
[pisa-src] r1177 - trunk/pisacd/cdmain.c

Other related posts:
