pull master

CONTRIBUTORS.md

@@ -6,7 +6,8 @@ Contributors to date (in chronological order, with current affiliations)
 - Shane Snyder, Argonne National Labs
 - Jonathan P. Jenkins
 - Noah Wolfe, RPI
-- Nikhil Jain, Lawrence Livermore Labs
+- Nikhil Jain, Nvidia
+- Giorgis Georgakoudis, Lawrence Livermore Labs
 - Matthieu Dorier, Argonne National Labs
 - Caitlin Ross, RPI
 - Xu Yang, Amazon

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([codes], [1.0.0], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
+AC_INIT([codes], [1.1.0], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
 LT_INIT
 
 

doc/GETTING_STARTED

@@ -202,6 +202,15 @@ should be everything up to the rank number. E.g., if the dumpi files are of the
 form "dumpi-YYYY.MM.DD.HH.MM.SS-XXXX.bin", then the input should be
 "dumpi-YYYY.MM.DD.HH.MM.SS-"
 
+=== Quality of Service
+
+Two models (dragonfly-dally.C and dragonfly-plus.C) can now support traffic 
+differentiation and prioritization. The models support quality of service by
+directing the network traffic on separate class of virtual channels. Additional
+documentation on using traffic classes can be found at the wiki link:
+
+https://xgitlab.cels.anl.gov/codes/codes/wikis/Quality-of-Service
+
 === Workload generator helpers
 
 The codes-jobmap API (codes/codes-jobmap.h) specifies mechanisms to initialize

doc/dev/RELEASE-CHECKLIST.txt

@@ -44,7 +44,7 @@ Notes on how to release a new version of CODES
 4. Upload the release tarball
 - Our release directory is at ftp.mcs.anl.gov/pub/CODES/releases . There's no
   web interface, so you have to get onto an MCS workstation and copy the
-  release in that way (the ftp server is mounted at /homes/ftp).
+  release in that way (the ftp server is mounted at /mcs/ftp.mcs.anl.gov).
 
 5. Update website
 - Project wordpress: http://www.mcs.anl.gov/projects/codes/ (you need

maint/codes.pc.in

@@ -16,16 +16,16 @@ boost_cflags=@BOOST_CFLAGS@
 boost_libs=@BOOST_LIBS@
 argobots_libs=@ARGOBOTS_LIBS@
 argobots_cflags=@ARGOBOTS_CFLAGS@
-conceptual_libs=@CONCEPTUAL_LIBS@
-conceptual_cflags=@CONCEPTUAL_CFLAGS@
 swm_libs=@SWM_LIBS@
 swm_cflags=@SWM_CFLAGS@
 swm_datarootdir=@SWM_DATAROOTDIR@
+conceptual_libs=@CONCEPTUAL_LIBS@
+conceptual_cflags=@CONCEPTUAL_CFLAGS@
 
 Name: codes-base
 Description: Base functionality for CODES storage simulation
 Version: @PACKAGE_VERSION@
 URL: http://trac.mcs.anl.gov/projects/CODES
 Requires:
-Libs: -L${libdir} -lcodes ${ross_libs} ${argobots_libs} ${conceptual_libs} ${swm_libs} ${darshan_libs} ${dumpi_libs} ${cortex_libs}
-Cflags: -I${includedir} ${swm_datarootdir} ${ross_cflags} ${darshan_cflags} ${swm_cflags} ${argobots_cflags} ${conceptual_cflags} ${dumpi_cflags} ${cortex_cflags}
+Libs: -L${libdir} -lcodes ${ross_libs} ${argobots_libs} ${swm_libs} ${darshan_libs} ${dumpi_libs} ${cortex_libs}
+Cflags: -I${includedir} -I${swm_datarootdir} ${ross_cflags} ${darshan_cflags} ${swm_cflags} ${argobots_cflags} ${dumpi_cflags} ${cortex_cflags}

src/network-workloads/conf/online-allocation-cont.conf

-0 1 
-2 3
\ No newline at end of file

src/network-workloads/conf/online-workloads.conf

-2 conceptual-latency
-2 conceptual-latencyall

src/workload/codes-workload.c

@@ -69,7 +69,6 @@ static struct codes_workload_method const * method_array_default[] =
 #ifdef USE_CONC
     &conc_online_comm_workload_method,
 #endif
-
 #ifdef USE_RECORDER
     &recorder_io_workload_method,
 #endif