Rename event-horizon to error-limit; the former may have trendy black-hole

associations, but the latter actually cues one to what it might achieve.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@418

diff --git a/coregrind/valgrind.in b/coregrind/valgrind.in
index fbec27c0a4eabda62205c5d40108ef0e9c951384..23aa12030473fe387a1a9f05967a64f250374e69 100755 (executable)
--- a/coregrind/valgrind.in
+++ b/coregrind/valgrind.in
@@ -41,8 +41,8 @@ do
     --verbose)              vgopts="$vgopts -v"; shift;;
     -q)                     vgopts="$vgopts $arg"; shift;;
     --quiet)                vgopts="$vgopts $arg"; shift;;
-    --event-horizon=no)     vgopts="$vgopts $arg"; shift;;
-    --event-horizon=yes)    vgopts="$vgopts $arg"; shift;;
+    --error-limit=no)       vgopts="$vgopts $arg"; shift;;
+    --error-limit=yes)      vgopts="$vgopts $arg"; shift;;
     --check-addrVs=no)      vgopts="$vgopts $arg"; shift;;
     --check-addrVs=yes)     vgopts="$vgopts $arg"; shift;;
     --gdb-attach=no)        vgopts="$vgopts $arg"; shift;;
@@ -123,7 +123,7 @@ if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo "    --gdb-attach=no|yes       start GDB when errors detected? [no]"
    echo "    --demangle=no|yes         automatically demangle C++ names? [yes]"
    echo "    --num-callers=<number>    show <num> callers in stack traces [4]"
-   echo "    --event-horizon=no|yes    stop showing new errors if too many? [yes]"
+   echo "    --error-limit=no|yes      stop showing new errors if too many? [yes]"
    echo "    --partial-loads-ok=no|yes too hard to explain here; see manual [yes]"
    echo "    --leak-check=no|yes       search for memory leaks at exit? [no]"
    echo "    --leak-resolution=low|med|high"

diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 60eaba05e2dbb01024c64bb7078fc5060e7ab073..46838b603f20d712cb617f7fbe1be34931025f41 100644 (file)
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -497,7 +497,7 @@ static void VG_(maybe_add_context) ( ErrContext* ec )
       the burden of the error-management system becoming excessive in
       extremely buggy programs, although it does make it pretty
       pointless to continue the Valgrind run after this point. */
-   if (VG_(clo_event_horizon) 
+   if (VG_(clo_error_limit) 
        && (vg_n_errs_shown >= M_VG_COLLECT_NO_ERRORS_AFTER_SHOWN
            || vg_n_errs_found >= M_VG_COLLECT_NO_ERRORS_AFTER_FOUND)) {
       if (!stopping_message) {
@@ -518,7 +518,7 @@ static void VG_(maybe_add_context) ( ErrContext* ec )
          VG_(message)(Vg_UserMsg, 
             "Final error counts will be inaccurate.  Go fix your program!");
          VG_(message)(Vg_UserMsg, 
-            "Rerun with --event-horizon=no to disable this cutoff.  Note");
+            "Rerun with --error-limit=no to disable this cutoff.  Note");
          VG_(message)(Vg_UserMsg, 
             "that your program may now segfault without prior warning from");
          VG_(message)(Vg_UserMsg, 

diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 97d6b4e3d6ed0b0c0414908f081405568c6b01b5..fb675b949e6e7d9c3522f5657f66ff2c3b4f8156 100644 (file)
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -219,7 +219,7 @@ typedef struct {
 #define VG_CLO_MAX_SFILES 10
 
 /* Should we stop collecting errors if too many appear?  default: YES */
-extern Bool  VG_(clo_event_horizon);
+extern Bool  VG_(clo_error_limit);
 /* Shall we V-check addrs (they are always A checked too): default: YES */
 extern Bool  VG_(clo_check_addrVs);
 /* Enquire about whether to attach to GDB at errors?   default: NO */

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index ceec5d0452fa378393d67cd3fc9ebae2ef78f113..afdcfe68503f206707177f712157d9afd599a2fc 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -399,7 +399,7 @@ UInt VG_(num_scheduling_events_MAJOR) = 0;
    Values derived from command-line options.
    ------------------------------------------------------------------ */
 
-Bool   VG_(clo_event_horizon);
+Bool   VG_(clo_error_limit);
 Bool   VG_(clo_check_addrVs);
 Bool   VG_(clo_GDB_attach);
 Int    VG_(sanity_level);
@@ -533,7 +533,7 @@ static void process_cmd_line_options ( void )
 #  define STREQN(nn,s1,s2) (0==VG_(strncmp_ws)((s1),(s2),(nn)))
 
    /* Set defaults. */
-   VG_(clo_event_horizon)    = True;
+   VG_(clo_error_limit)      = True;
    VG_(clo_check_addrVs)     = True;
    VG_(clo_GDB_attach)       = False;
    VG_(sanity_level)         = 1;
@@ -710,10 +710,10 @@ static void process_cmd_line_options ( void )
       else if (STREQ(argv[i], "-q") || STREQ(argv[i], "--quiet"))
          VG_(clo_verbosity)--;
 
-      else if (STREQ(argv[i], "--event-horizon=yes"))
-         VG_(clo_event_horizon) = True;
-      else if (STREQ(argv[i], "--event-horizon=no"))
-         VG_(clo_event_horizon) = False;
+      else if (STREQ(argv[i], "--error-limit=yes"))
+         VG_(clo_error_limit) = True;
+      else if (STREQ(argv[i], "--error-limit=no"))
+         VG_(clo_error_limit) = False;
 
       else if (STREQ(argv[i], "--check-addrVs=yes"))
          VG_(clo_check_addrVs) = True;

diff --git a/valgrind.in b/valgrind.in
index fbec27c0a4eabda62205c5d40108ef0e9c951384..23aa12030473fe387a1a9f05967a64f250374e69 100755 (executable)
--- a/valgrind.in
+++ b/valgrind.in
@@ -41,8 +41,8 @@ do
     --verbose)              vgopts="$vgopts -v"; shift;;
     -q)                     vgopts="$vgopts $arg"; shift;;
     --quiet)                vgopts="$vgopts $arg"; shift;;
-    --event-horizon=no)     vgopts="$vgopts $arg"; shift;;
-    --event-horizon=yes)    vgopts="$vgopts $arg"; shift;;
+    --error-limit=no)       vgopts="$vgopts $arg"; shift;;
+    --error-limit=yes)      vgopts="$vgopts $arg"; shift;;
     --check-addrVs=no)      vgopts="$vgopts $arg"; shift;;
     --check-addrVs=yes)     vgopts="$vgopts $arg"; shift;;
     --gdb-attach=no)        vgopts="$vgopts $arg"; shift;;
@@ -123,7 +123,7 @@ if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo "    --gdb-attach=no|yes       start GDB when errors detected? [no]"
    echo "    --demangle=no|yes         automatically demangle C++ names? [yes]"
    echo "    --num-callers=<number>    show <num> callers in stack traces [4]"
-   echo "    --event-horizon=no|yes    stop showing new errors if too many? [yes]"
+   echo "    --error-limit=no|yes      stop showing new errors if too many? [yes]"
    echo "    --partial-loads-ok=no|yes too hard to explain here; see manual [yes]"
    echo "    --leak-check=no|yes       search for memory leaks at exit? [no]"
    echo "    --leak-resolution=low|med|high"

diff --git a/vg_errcontext.c b/vg_errcontext.c
index 60eaba05e2dbb01024c64bb7078fc5060e7ab073..46838b603f20d712cb617f7fbe1be34931025f41 100644 (file)
--- a/vg_errcontext.c
+++ b/vg_errcontext.c
@@ -497,7 +497,7 @@ static void VG_(maybe_add_context) ( ErrContext* ec )
       the burden of the error-management system becoming excessive in
       extremely buggy programs, although it does make it pretty
       pointless to continue the Valgrind run after this point. */
-   if (VG_(clo_event_horizon) 
+   if (VG_(clo_error_limit) 
        && (vg_n_errs_shown >= M_VG_COLLECT_NO_ERRORS_AFTER_SHOWN
            || vg_n_errs_found >= M_VG_COLLECT_NO_ERRORS_AFTER_FOUND)) {
       if (!stopping_message) {
@@ -518,7 +518,7 @@ static void VG_(maybe_add_context) ( ErrContext* ec )
          VG_(message)(Vg_UserMsg, 
             "Final error counts will be inaccurate.  Go fix your program!");
          VG_(message)(Vg_UserMsg, 
-            "Rerun with --event-horizon=no to disable this cutoff.  Note");
+            "Rerun with --error-limit=no to disable this cutoff.  Note");
          VG_(message)(Vg_UserMsg, 
             "that your program may now segfault without prior warning from");
          VG_(message)(Vg_UserMsg, 

diff --git a/vg_include.h b/vg_include.h
index 97d6b4e3d6ed0b0c0414908f081405568c6b01b5..fb675b949e6e7d9c3522f5657f66ff2c3b4f8156 100644 (file)
--- a/vg_include.h
+++ b/vg_include.h
@@ -219,7 +219,7 @@ typedef struct {
 #define VG_CLO_MAX_SFILES 10
 
 /* Should we stop collecting errors if too many appear?  default: YES */
-extern Bool  VG_(clo_event_horizon);
+extern Bool  VG_(clo_error_limit);
 /* Shall we V-check addrs (they are always A checked too): default: YES */
 extern Bool  VG_(clo_check_addrVs);
 /* Enquire about whether to attach to GDB at errors?   default: NO */

diff --git a/vg_main.c b/vg_main.c
index ceec5d0452fa378393d67cd3fc9ebae2ef78f113..afdcfe68503f206707177f712157d9afd599a2fc 100644 (file)
--- a/vg_main.c
+++ b/vg_main.c
@@ -399,7 +399,7 @@ UInt VG_(num_scheduling_events_MAJOR) = 0;
    Values derived from command-line options.
    ------------------------------------------------------------------ */
 
-Bool   VG_(clo_event_horizon);
+Bool   VG_(clo_error_limit);
 Bool   VG_(clo_check_addrVs);
 Bool   VG_(clo_GDB_attach);
 Int    VG_(sanity_level);
@@ -533,7 +533,7 @@ static void process_cmd_line_options ( void )
 #  define STREQN(nn,s1,s2) (0==VG_(strncmp_ws)((s1),(s2),(nn)))
 
    /* Set defaults. */
-   VG_(clo_event_horizon)    = True;
+   VG_(clo_error_limit)      = True;
    VG_(clo_check_addrVs)     = True;
    VG_(clo_GDB_attach)       = False;
    VG_(sanity_level)         = 1;
@@ -710,10 +710,10 @@ static void process_cmd_line_options ( void )
       else if (STREQ(argv[i], "-q") || STREQ(argv[i], "--quiet"))
          VG_(clo_verbosity)--;
 
-      else if (STREQ(argv[i], "--event-horizon=yes"))
-         VG_(clo_event_horizon) = True;
-      else if (STREQ(argv[i], "--event-horizon=no"))
-         VG_(clo_event_horizon) = False;
+      else if (STREQ(argv[i], "--error-limit=yes"))
+         VG_(clo_error_limit) = True;
+      else if (STREQ(argv[i], "--error-limit=no"))
+         VG_(clo_error_limit) = False;
 
       else if (STREQ(argv[i], "--check-addrVs=yes"))
          VG_(clo_check_addrVs) = True;