noh integration

Former-commit-id: f09545149a6033b4d5b2a5b5ee0fc2dfc3c8faf8

.gitattributes

@@ -920,7 +920,10 @@ tools/cfar_configs/cfar_probIlr_probP1_strata.sh -text
 tools/cfar_configs/cfar_probIlr_strata.sh -text
 tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh -text
 tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh -text
+tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh -text
 tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh -text
+tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh -text
+tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_probP1_strata.sh -text
@@ -931,6 +934,8 @@ tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_zipr.sh -text
+tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh -text
+tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_structP1Canaries_zipr.sh -text
 tools/cfar_configs/strata_all.json.template -text

tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --diehard

tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --diehard

tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --diehard --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")

tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --diehard

tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --diehard --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")

tools/cfar_configs/strata_variant.json.template

@@ -19,7 +19,8 @@
                         "STRATA_ANNOT_FILE=/variant_specific/a.ncexe.annot",
                         "STRATA_OUTPUT_FILE=/variant_specific/diagnostics.out",
                         "STRATA_EXE_FILE=/variant_specific/a.stratafied",
-                        "SPAWNER_EXE_FILE=/variant_specific/spawned"
+                        "SPAWNER_EXE_FILE=/variant_specific/spawned",
+                        "VARIANTINDEX=<<VARIANTINDEX>>"
                         ,<<ENV>>
 
                         ],
@@ -28,10 +29,12 @@
                         "/dev/cfar_urandom=/dev/urandom",
                         "/proc/self/maps=/proc/self/maps",
                         "/variant_specific/libheaprand.so=<<EXEPATH>>/<<PS_DIR>>/libheaprand.so",
+                        "/variant_specific/noh.so=<<EXEPATH>>/<<PS_DIR>>/noh.so",
                         "/sbin/thttpd=<<EXEPATH>>/<<PS_DIR>>/a.stratafied",
                         "/usr/lib/libstrata.so=<<EXEPATH>>/<<PS_DIR>>/libstrata.so",
                         "<<EXEPATH>>/<<PS_DIR>>/libstrata.so=<<EXEPATH>>/<<PS_DIR>>/libstrata.so",
                         "<<EXEPATH>>/<<PS_DIR>>/libheaprand.so=<<EXEPATH>>/<<PS_DIR>>/libheaprand.so",
+                        "<<EXEPATH>>/<<PS_DIR>>/noh.so=<<EXEPATH>>/<<PS_DIR>>/noh.so",
                         "/variant_specific/a.irdb.fbspri=<<EXEPATH>>/<<PS_DIR>>/a.irdb.fbspri",
                         "/variant_specific/a.ncexe.annot=<<EXEPATH>>/<<PS_DIR>>/a.ncexe.annot",
                         "/variant_specific/diagnostics.out=<<EXEPATH>>/<<PS_DIR>>/diagnostics.out",

tools/generate_mvee_package.sh

@@ -10,14 +10,14 @@ usage()
 Usage:
 	generate_mvee_config.sh 
 
-	[(--diehard|--nodiehard)]
-	[(--structnoh|--nostructnoh)]
-	--indir <path_to_variants>
-	--outdir <path_to_variants>
-	[--args <arguments string in json format> ]
-	[--server <servername>
-	[--class <atd class>
-	[(--help | h )]
+		--indir <path_to_variants>
+		--outdir <path_to_variants>
+		[--args <arguments string in json format> ]
+		[--server <servername>
+		[--class <atd class>
+		[(--diehard|--nodiehard)]
+		[(--structnoh|--nostructnoh)]
+		[(--help | h )]
 "
 }
 

tools/ps_analyze.sh

@@ -788,7 +788,7 @@ if [ -f $PEASOUP_UMBRELLA_DIR/DieHard/src/libdiehard.so ]; then
 	cp $PEASOUP_UMBRELLA_DIR/DieHard/src/libdiehard.so $newdir/libheaprand.so
 fi
 
-if [ -f $PEASOUP_UMBRELLA_DIR/non_overlapping_heap.so ]; then
+if [ -f $PEASOUP_UMBRELLA_DIR/non_overlapping_heap/noh.so ]; then
 	cp $PEASOUP_UMBRELLA_DIR/non_overlapping_heap/noh.so $newdir/noh.so
 fi