From 5c05af50ab77c56074e588234e3726b1a3b6dbb8 Mon Sep 17 00:00:00 2001 From: John Nonweiler Date: Fri, 20 Jul 2018 15:26:58 +0100 Subject: [PATCH 1/5] Make directories match from root --- CODEOWNERS | 82 +++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index fa575bfb0a6..33b59528460 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,58 +3,58 @@ # These files should rarely change -src/big-int/ @kroening -src/ansi-c/ @kroening @tautschnig -src/assembler/ @kroening @tautschnig -src/goto-cc/ @kroening @tautschnig -src/linking/ @kroening @tautschnig -src/memory-models/ @kroening @tautschnig -src/goto-symex/ @kroening @tautschnig @peterschrammel -src/json/ @kroening @tautschnig @peterschrammel -src/langapi/ @kroening @tautschnig @peterschrammel -src/xmllang/ @kroening @tautschnig @peterschrammel -src/nonstd/ @smowton @peterschrammel -src/solvers/cvc @martin-cs @kroening -src/solvers/flattening @martin-cs @kroening @tautschnig @peterschrammel -src/solvers/floatbv @martin-cs @kroening -src/solvers/miniBDD @tautschnig @kroening -src/solvers/prop @martin-cs @kroening @tautschnig @peterschrammel -src/solvers/sat @martin-cs @kroening @tautschnig @peterschrammel -src/solvers/smt2 @martin-cs @tautschnig @peterschrammel -jbmc/src/miniz/ @smowton @mgudemann @peterschrammel +/src/big-int/ @kroening +/src/ansi-c/ @kroening @tautschnig +/src/assembler/ @kroening @tautschnig +/src/goto-cc/ @kroening @tautschnig +/src/linking/ @kroening @tautschnig +/src/memory-models/ @kroening @tautschnig +/src/goto-symex/ @kroening @tautschnig @peterschrammel +/src/json/ @kroening @tautschnig @peterschrammel +/src/langapi/ @kroening @tautschnig @peterschrammel +/src/xmllang/ @kroening @tautschnig @peterschrammel +/src/nonstd/ @smowton @peterschrammel +/src/solvers/cvc @martin-cs @kroening +/src/solvers/flattening @martin-cs @kroening @tautschnig @peterschrammel +/src/solvers/floatbv @martin-cs @kroening +/src/solvers/miniBDD @tautschnig @kroening +/src/solvers/prop @martin-cs @kroening @tautschnig @peterschrammel +/src/solvers/sat @martin-cs @kroening @tautschnig @peterschrammel +/src/solvers/smt2 @martin-cs @tautschnig @peterschrammel +/jbmc/src/miniz/ @smowton @mgudemann @peterschrammel # These files change frequently and changes are high-risk -src/cbmc/ @smowton @kroening @tautschnig @peterschrammel -src/goto-programs/ @smowton @kroening @tautschnig @peterschrammel @pkesseli -src/util/ @smowton @kroening @tautschnig @peterschrammel @pkesseli -src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel -jbmc/src/java_bytecode/ @smowton @mgudemann @thk123 @cristina-david @cesaro @pkesseli @NathanJPhillips @peterschrammel -src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton -src/pointer-analysis/ @martin-cs @peterschrammel @chrisr-diffblue @smowton +/src/cbmc/ @smowton @kroening @tautschnig @peterschrammel +/src/goto-programs/ @smowton @kroening @tautschnig @peterschrammel @pkesseli +/src/util/ @smowton @kroening @tautschnig @peterschrammel @pkesseli +/src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel +/jbmc/src/java_bytecode/ @smowton @mgudemann @thk123 @cristina-david @cesaro @pkesseli @NathanJPhillips @peterschrammel +/src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton +/src/pointer-analysis/ @martin-cs @peterschrammel @chrisr-diffblue @smowton # These files change frequently and changes are medium-risk -src/goto-analyzer/ @martin-cs @chrisr-diffblue @peterschrammel -src/goto-instrument/ @martin-cs @chrisr-diffblue @peterschrammel -src/goto-diff/ @tautschnig @peterschrammel -jbmc/src/jbmc/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel -jbmc/src/janalyzer/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel -jbmc/src/jdiff/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel -src/cpp/ @kroening @tautschnig @peterschrammel +/src/goto-analyzer/ @martin-cs @chrisr-diffblue @peterschrammel +/src/goto-instrument/ @martin-cs @chrisr-diffblue @peterschrammel +/src/goto-diff/ @tautschnig @peterschrammel +/jbmc/src/jbmc/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel +/jbmc/src/janalyzer/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel +/jbmc/src/jdiff/ @smowton @mgudemann @cristina-david @cesaro @pkesseli @peterschrammel +/src/cpp/ @kroening @tautschnig @peterschrammel # These files change frequently and changes are low-risk -src/util/irep_ids.def @diffblue/cbmc-developers +/src/util/irep_ids.def @diffblue/cbmc-developers -unit/ @diffblue/cbmc-developers -regression/ @diffblue/cbmc-developers -jbmc/unit/ @diffblue/cbmc-developers -jbmc/regression/ @diffblue/cbmc-developers +/unit/ @diffblue/cbmc-developers +/regression/ @diffblue/cbmc-developers +/jbmc/unit/ @diffblue/cbmc-developers +/jbmc/regression/ @diffblue/cbmc-developers -scripts/ @diffblue/devops @thk123 @forejtv @peterschrammel -.travis.yml @diffblue/devops @thk123 @forejtv @peterschrammel -appveyor.yml @diffblue/devops @thk123 @forejtv @peterschrammel +/scripts/ @diffblue/devops @thk123 @forejtv @peterschrammel +/.travis.yml @diffblue/devops @thk123 @forejtv @peterschrammel +/appveyor.yml @diffblue/devops @thk123 @forejtv @peterschrammel From 7efd3763de3c9076f4485dd1b15db065f396afa3 Mon Sep 17 00:00:00 2001 From: John Nonweiler Date: Fri, 20 Jul 2018 15:36:26 +0100 Subject: [PATCH 2/5] Remove default code owners (from root folders) --- CODEOWNERS | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 33b59528460..7cfcd837125 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,18 @@ -# These owners will be the default owners for everything in the repo. -* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +# These folders were previously covered by the default owners + +/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/jbmc/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/jbmc/src/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/jbmc/lib/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/src/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/src/clobber/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/src/jsil/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/src/solvers/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/.githooks/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/cmake/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/doc/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/pkg/arch/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue + # These files should rarely change From 25672b2342a12f2db0afd6dec195b1d3988929d7 Mon Sep 17 00:00:00 2001 From: John Nonweiler Date: Fri, 20 Jul 2018 16:39:07 +0100 Subject: [PATCH 3/5] Move irep_ids.def from src/util to src/util/ids --- CODEOWNERS | 2 +- doc/architectural/howto.md | 2 +- scripts/string_table_check.sh | 2 +- src/util/{ => ids}/irep_ids.def | 0 src/util/irep_ids.cpp | 6 +++--- src/util/irep_ids.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/util/{ => ids}/irep_ids.def (100%) diff --git a/CODEOWNERS b/CODEOWNERS index 7cfcd837125..3926c77962a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -61,7 +61,7 @@ # These files change frequently and changes are low-risk -/src/util/irep_ids.def @diffblue/cbmc-developers +/src/util/ids/irep_ids.def @diffblue/cbmc-developers /unit/ @diffblue/cbmc-developers /regression/ @diffblue/cbmc-developers diff --git a/doc/architectural/howto.md b/doc/architectural/howto.md index 266cd139d5f..e8432084151 100644 --- a/doc/architectural/howto.md +++ b/doc/architectural/howto.md @@ -224,7 +224,7 @@ numbered, starting from 0. They can be accessed through the `op0()`, `op1()` and `op2()` methods in the `exprt` class. Every node in the pretty representation has an identifier, accessed -through the `id()` function. The file `util/irep_ids.def` lists the +through the `id()` function. The file `util/ids/irep_ids.def` lists the possible values of these identifiers; have a quick scan through that file. In the pretty representation above, the following facts are true of that particular node: diff --git a/scripts/string_table_check.sh b/scripts/string_table_check.sh index 5bf6d4b2dd2..b47b27e9f2c 100755 --- a/scripts/string_table_check.sh +++ b/scripts/string_table_check.sh @@ -12,7 +12,7 @@ ids_file=$(mktemp) trap cleanup EXIT -gcc -E -P -x c src/util/irep_ids.def \ +gcc -E -P -x c src/util/ids/irep_ids.def \ -D'IREP_ID_ONE(x)=ID_ ## x' -D'IREP_ID_TWO(x,y)=ID_ ## x' > $ids_file for w in $whitelist diff --git a/src/util/irep_ids.def b/src/util/ids/irep_ids.def similarity index 100% rename from src/util/irep_ids.def rename to src/util/ids/irep_ids.def diff --git a/src/util/irep_ids.cpp b/src/util/irep_ids.cpp index 5a6bc4e525d..c6c31baca1a 100644 --- a/src/util/irep_ids.cpp +++ b/src/util/irep_ids.cpp @@ -20,7 +20,7 @@ const char *irep_ids_table[]= #define IREP_ID_ONE(id) #id, #define IREP_ID_TWO(id, str) #str, -#include "irep_ids.def" +#include "ids/irep_ids.def" nullptr, }; @@ -32,7 +32,7 @@ enum class idt:unsigned #define IREP_ID_ONE(the_id) id_##the_id, #define IREP_ID_TWO(the_id, str) id_##the_id, -#include "irep_ids.def" // NOLINT(build/include) +#include "ids/irep_ids.def" // NOLINT(build/include) }; #define IREP_ID_ONE(the_id) \ @@ -49,7 +49,7 @@ enum class idt:unsigned #endif -#include "irep_ids.def" // NOLINT(build/include) +#include "ids/irep_ids.def" // NOLINT(build/include) string_containert::string_containert() { diff --git a/src/util/irep_ids.h b/src/util/irep_ids.h index 7d946bed305..7966a9f2929 100644 --- a/src/util/irep_ids.h +++ b/src/util/irep_ids.h @@ -45,6 +45,6 @@ Author: Reuben Thomas, reuben.thomas@me.com #endif -#include "irep_ids.def" +#include "ids/irep_ids.def" #endif From 47a1eecf08e516887dbe3827ed8af20c42972f2f Mon Sep 17 00:00:00 2001 From: John Nonweiler Date: Fri, 20 Jul 2018 16:42:31 +0100 Subject: [PATCH 4/5] Remove code owners from low-risk files --- CODEOWNERS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 3926c77962a..ae045612412 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -41,7 +41,7 @@ /src/cbmc/ @smowton @kroening @tautschnig @peterschrammel /src/goto-programs/ @smowton @kroening @tautschnig @peterschrammel @pkesseli -/src/util/ @smowton @kroening @tautschnig @peterschrammel @pkesseli +/src/util/* @smowton @kroening @tautschnig @peterschrammel @pkesseli /src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel /jbmc/src/java_bytecode/ @smowton @mgudemann @thk123 @cristina-david @cesaro @pkesseli @NathanJPhillips @peterschrammel /src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton @@ -59,15 +59,15 @@ /src/cpp/ @kroening @tautschnig @peterschrammel -# These files change frequently and changes are low-risk - -/src/util/ids/irep_ids.def @diffblue/cbmc-developers - -/unit/ @diffblue/cbmc-developers -/regression/ @diffblue/cbmc-developers -/jbmc/unit/ @diffblue/cbmc-developers -/jbmc/regression/ @diffblue/cbmc-developers - /scripts/ @diffblue/devops @thk123 @forejtv @peterschrammel /.travis.yml @diffblue/devops @thk123 @forejtv @peterschrammel /appveyor.yml @diffblue/devops @thk123 @forejtv @peterschrammel + + +# The files change frequently, are low-risk and have no owners +# +# /src/util/ids/ +# /unit/ +# /regression/ +# /jbmc/unit/ +# /jbmc/regression/ From 8a46ebe6a19f3305fbb109abfb5769a69cce1e85 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 20 Jul 2018 17:35:55 +0100 Subject: [PATCH 5/5] Distribute former default codeowner entries --- CODEOWNERS | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index ae045612412..246933738d9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,21 +1,9 @@ -# These folders were previously covered by the default owners +# These files should rarely change /* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/jbmc/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/jbmc/src/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/jbmc/lib/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/src/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/src/clobber/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/src/jsil/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/src/solvers/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/.githooks/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /cmake/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue -/doc/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /pkg/arch/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue - - -# These files should rarely change - +/src/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /src/big-int/ @kroening /src/ansi-c/ @kroening @tautschnig /src/assembler/ @kroening @tautschnig @@ -23,10 +11,12 @@ /src/linking/ @kroening @tautschnig /src/memory-models/ @kroening @tautschnig /src/goto-symex/ @kroening @tautschnig @peterschrammel +/src/jsil/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /src/json/ @kroening @tautschnig @peterschrammel /src/langapi/ @kroening @tautschnig @peterschrammel /src/xmllang/ @kroening @tautschnig @peterschrammel /src/nonstd/ @smowton @peterschrammel +/src/solvers/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /src/solvers/cvc @martin-cs @kroening /src/solvers/flattening @martin-cs @kroening @tautschnig @peterschrammel /src/solvers/floatbv @martin-cs @kroening @@ -34,6 +24,9 @@ /src/solvers/prop @martin-cs @kroening @tautschnig @peterschrammel /src/solvers/sat @martin-cs @kroening @tautschnig @peterschrammel /src/solvers/smt2 @martin-cs @tautschnig @peterschrammel +/jbmc/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/jbmc/lib/ @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue +/jbmc/src/* @kroening @tautschnig @peterschrammel @smowton @chrisr-diffblue /jbmc/src/miniz/ @smowton @mgudemann @peterschrammel