More updates to documentation, changes to dragonfly sample read utility

src/network-workloads/README_traces.txt

@@ -91,9 +91,11 @@ mpirun -np 4 ./src/network-workloads//model-net-mpi-replay --sync=3
 Runtime options can be used to enable time-stepped series data of simulation
 with multiple workloads:
 
---enable_sampling = 1 [Turns on sampling after a specific simulated interval.
+--enable_sampling = 1 [Enables sampling of network & workload statistics after a specific simulated interval.
 Default sampling interval is 5 millisec and default sampling end time is 3
-secs.]
+secs. These values can be adjusted at runtime using --sampling_interval and
+--sampling_end_time options.]
+
 
 --lp-io-dir-dir-name [Turns on end of simulation statistics for dragonfly network model]
 

src/networks/model-net/read-dragonfly-sample.c

@@ -33,6 +33,7 @@ struct dfly_rtr_sample
 struct mpi_workload_sample
 {
     int nw_id;
+    int app_id;
     unsigned long num_sends_sample;
     unsigned long num_bytes_sample;
     unsigned long num_waits_sample;
@@ -169,7 +170,10 @@ int main( int argc, char** argv )
     fread(mpi_event_array, mpi_sample_sz, in_sz_mpi / mpi_sample_sz, pFile);
     for(i = 0; i < in_sz_mpi / mpi_sample_sz; i++)
     {
-        fprintf(writeFile, "\n %ld %ld %ld %lf ", mpi_event_array[i].num_sends_sample,
+        fprintf(writeFile, "\n %d %d %lu %lu %lu %lf ",
+                mpi_event_array[i].nw_id,
+                mpi_event_array[i].app_id,
+                mpi_event_array[i].num_sends_sample,
                 mpi_event_array[i].num_bytes_sample,
                 mpi_event_array[i].num_waits_sample,
                 mpi_event_array[i].sample_end_time);