squash a few warnings

src/networks/model-net/slimfly.c

@@ -1479,7 +1479,10 @@ void slim_packet_send(terminal_state * s, tw_bf * bf, slim_terminal_message * ms
 	}
 #endif
 
+#if TERMINAL_SENDS_RECVS_LOG || TERMINAL_OCCUPANCY_LOG
 	int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
+#endif
+
 #if TERMINAL_SENDS_RECVS_LOG
 	terminal_sends[s->terminal_id][index]++;
 #endif
@@ -1881,8 +1884,8 @@ void slim_terminal_buf_update(terminal_state * s,
   tw_stime ts = codes_local_latency(lp);
   s->vc_occupancy[0] -= s->params->chunk_size;
 
-int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
 #if TERMINAL_OCCUPANCY_LOG
+int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
 	vc_occupancy_storage_terminal[s->terminal_id][0][index] = s->vc_occupancy[0]/s->params->chunk_size;
 #endif
 
@@ -1987,7 +1990,7 @@ void slimfly_terminal_final( terminal_state * s,
 #endif
 	}
 
-    written += sprintf(s->output_buf + written, "%llu %u %ld %lf %ld %ld %ld %lf\n", lp->gid, s->terminal_id, s->total_msg_size, s->total_time, s->finished_msgs, s->finished_packets, s->finished_chunks, (double)s->total_hops/s->finished_chunks);
+    written += sprintf(s->output_buf + written, "%llu %u %ld %lf %ld %ld %ld %lf\n", LLU(lp->gid), s->terminal_id, s->total_msg_size, s->total_time, s->finished_msgs, s->finished_packets, s->finished_chunks, (double)s->total_hops/s->finished_chunks);
     lp_io_write(lp->gid, "slimfly-msg-stats", written, s->output_buf); 
 
     if(s->terminal_msgs[0] != NULL) 
@@ -2964,7 +2967,6 @@ codes_mapping_get_lp_info(lp->gid, lp_group_name, &mapping_grp_id, NULL,
   assert(output_chan < 4);	//Minimal routing needs 2 vcs and non-minimal needs 4 vcs
   assert(output_port < s->params->radix);
 
-int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
   if(s->vc_occupancy[output_port][output_chan] + s->params->chunk_size <= max_vc_size) 
   {
 #if TRACK_OUTPUT
@@ -2979,6 +2981,7 @@ int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
     s->vc_occupancy[output_port][output_chan] += s->params->chunk_size;
 
 #if ROUTER_OCCUPANCY_LOG
+int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
 	vc_occupancy_storage_router[s->router_id][output_port][output_chan][index] = s->vc_occupancy[output_port][output_chan]/s->params->chunk_size;
 #endif
 
@@ -3222,8 +3225,8 @@ void slim_router_buf_update(router_state * s, tw_bf * bf, slim_terminal_message
   int indx = msg->vc_index;
   int output_chan = msg->output_chan;
   s->vc_occupancy[indx][output_chan] -= s->params->chunk_size;
-int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
 #if ROUTER_OCCUPANCY_LOG
+int index = floor(N_COLLECT_POINTS*(tw_now(lp)/g_tw_ts_end));
 	vc_occupancy_storage_router[s->router_id][indx][output_chan][index] = s->vc_occupancy[indx][output_chan]/s->params->chunk_size;
 #endif
   if(s->queued_msgs[indx][output_chan] != NULL) {
@@ -3343,7 +3346,7 @@ tw_lptype slimfly_lps[] =
      (map_f) codes_mapping,
      sizeof(router_state),
    },
-   {},
+   {NULL, NULL, NULL, NULL, NULL, NULL, 0},
 };
 
 /* returns the slimfly lp type for lp registration */