Merge remote-tracking branch 'origin/v80-bugfix'

scipopt · Oct 11, 2023 · d278e09 · d278e09
2 parents 64c668c + ec6a823
commit d278e09
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/scip/scip_prob.c b/src/scip/scip_prob.c
@@ -464,6 +464,10 @@ SCIP_RETCODE SCIPreadProb(
          /* display timing statistics */
          SCIPmessagePrintVerbInfo(scip->messagehdlr, scip->set->disp_verblevel, SCIP_VERBLEVEL_FULL,
             "Reading Time: %.2f\n", readingtime);
+
+         /* add reading time to solving time, if requested */
+         if( scip->set->time_reading )
+            SCIPclockSetTime(scip->stat->solvingtime, readingtime);
       }
       retcode = SCIP_OKAY;
       break;
@@ -478,18 +482,6 @@ SCIP_RETCODE SCIPreadProb(
    /* free buffer array */
    SCIPfreeBufferArray(scip, &tmpfilename);
 
-   /* check if reading time should belong to solving time */
-   if( scip->set->time_reading )
-   {
-      SCIP_Real readingtime;
-
-      /* get reading time */
-      readingtime = SCIPgetReadingTime(scip);
-
-      /* add reading time to solving time */
-      SCIPclockSetTime(scip->stat->solvingtime, readingtime);
-   }
-
    return retcode;
 }
 

diff --git a/tests/README.md b/tests/README.md
@@ -131,6 +131,15 @@ This will start a `gdbserver`. To connect, in another terminal use
 >> gdb bin/cons/quadratic/gauge.linux.x86_64.gnu.dbg.spx2 -ex "target remote localhost:1234"
 ```
 
+With old Criterion (before 2.4) and modern gdbserver, the `--debug` option can fail with a protocol error due to tcp not being resolvable.
+A workaround is to add an alias from tcp to localhost before calling the test, e.g.,
+```
+TMP_HOSTS=$(mktemp)
+echo 'tcp localhost' > $TMP_HOSTS
+export HOSTALIASES=$TMP_HOSTS
+```
+See https://github.com/Snaipe/Criterion/issues/301 for more details.
+
 If one doesn't want to use a `gdbserver` use:
 ```
 >> bin/cons/quadratic/gauge.linux.x86_64.gnu.dbg.spx2 --filter *gauge* --debug=idle