|
@@ -11,15 +11,16 @@ if [[ $BASH_SOURCE = */* ]]; then
|
|
|
cd -- "${BASH_SOURCE%/*}/" || exit
|
|
|
fi
|
|
|
|
|
|
-# If the master NUMA commands are set, use them for Circuit ORAM
|
|
|
-if [ "$NUMA_P0" != "" ]; then
|
|
|
- export ORAM_NUMA_C="$NUMA_P0"
|
|
|
+# If the Duoram NUMA commands are set, but Circuit-ORAM-specific ones are not,
|
|
|
+# use them for Circuit ORAM.
|
|
|
+if [ "$ORAM_NUMA_C" == "" -a "$DUORAM_NUMA_P0" != "" ]; then
|
|
|
+ export ORAM_NUMA_C="$DUORAM_NUMA_P0"
|
|
|
fi
|
|
|
-if [ "$NUMA_P1" != "" ]; then
|
|
|
- export ORAM_NUMA_D="$NUMA_P1"
|
|
|
+if [ "$ORAM_NUMA_D" == "" -a "$DUORAM_NUMA_P1" != "" ]; then
|
|
|
+ export ORAM_NUMA_D="$DUORAM_NUMA_P1"
|
|
|
fi
|
|
|
-if [ "$NUMA_P2" != "" ]; then
|
|
|
- export ORAM_NUMA_E="$NUMA_P2"
|
|
|
+if [ "$ORAM_NUMA_E" == "" -a "$DUORAM_NUMA_P2" != "" ]; then
|
|
|
+ export ORAM_NUMA_E="$DUORAM_NUMA_P2"
|
|
|
fi
|
|
|
|
|
|
# Allow running only subsets of the experiment suite. Valid values are
|