Merge pull request #1665 from clasp-developers/quit-other-thread

Bike · web-flow · commit 4906174153e2 · 2025-02-10T14:09:47.000-05:00
Quit other thread
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -7,6 +7,12 @@
 
 ## Fixed
 * Weak pointers and weak hash tables survive snapshot save/load.
+* `ext:quit` can be used from any thread, not just the initial thread.
+
+## Removed
+* `-z`/`--snapshot-symbols-save` command line option, occasionally used
+  for snapshot debugging. You can call `core:mangled-symbol-names` if the
+  effect is still needed.
 
 # Version 2.7.0 (LLVM15-19) 2025-01-21
 
diff --git a/include/clasp/core/commandLineOptions.h b/include/clasp/core/commandLineOptions.h
@@ -66,8 +66,6 @@ struct CommandLineOptions {
   std::string _DescribeFile;
   long _RandomNumberSeed;
   bool _ExportedSymbolsCheck;
-  bool _ExportedSymbolsSave;
-  std::string _ExportedSymbolsFilename;
   bool _NoInform;
   bool _NoPrint;
   bool _DebuggerDisabled;
diff --git a/include/clasp/core/exceptions.h b/include/clasp/core/exceptions.h
@@ -198,32 +198,8 @@ namespace core {
 
 class DebugStream;
 
-/*! To exit the program throw this exception
- */
-class ExitProgramException : public std::exception {
-private:
-  int _ExitResult;
-
-public:
-  ExitProgramException(int result) : _ExitResult(result){};
-  int getExitResult() { return this->_ExitResult; };
-};
-
-/*! To exit the program throw this exception
- */
-class TerminateProgramIfBatch {
-private:
-  int _ExitResult;
-  string _Message;
-
-public:
-  TerminateProgramIfBatch(int result, string const& message) : _ExitResult(result), _Message(message){};
-  string message() const { return this->_Message; };
-  int getExitResult() { return this->_ExitResult; };
-};
-
 #pragma GCC visibility push(default)
-class ATTR_WEAK CatchThrow {
+class ATTR_WEAK CatchThrow : public std::exception {
   virtual void keyFunctionForVtable() ATTR_WEAK;
 
 private:
@@ -232,19 +208,22 @@ class ATTR_WEAK CatchThrow {
 public:
   CatchThrow(T_sp tag) : _Tag(tag){};
   T_sp getTag() { return this->_Tag; };
+  const char* what() const noexcept override { return "Lisp Throw exception"; }
 };
 
-class ATTR_WEAK Unwind {
+class ATTR_WEAK Unwind : public std::exception {
   virtual void keyFunctionForVtable() ATTR_WEAK;
 
 private:
   void* _Frame; // NOT GC'd use FIXNUM tagged_ptr
   size_t _Index;
 
 public:
-  ATTR_WEAK Unwind(void* frame, size_t index) : _Frame(frame), _Index(index){};
+  ATTR_WEAK Unwind(void* frame, size_t index)
+    : _Frame(frame), _Index(index){};
   void* getFrame() const { return this->_Frame; };
   size_t index() const { return this->_Index; };
+  const char* what() const noexcept override { return "Lisp Unwind exception"; }
 };
 
 #pragma GCC visibility pop
diff --git a/include/clasp/core/lisp.h b/include/clasp/core/lisp.h
@@ -874,4 +874,6 @@ extern bool global_Started;
 void dumpDebuggingLayouts();
 T_mv cl__intern(String_sp symbol_name, T_sp package_desig);
 
+[[noreturn]] void core__exit(int);
+
 }; // namespace core
diff --git a/src/core/commandLineOptions.cc b/src/core/commandLineOptions.cc
@@ -88,11 +88,6 @@ const char* help = R"dx(Usage: clasp <options>
       Check symbols while starting up and verify that snapshot save will
       work. The symbols can be recovered at runtime calling by
       (core:mangled-symbol-names <stream>).
-  -z, --snapshot-symbols-save <file>
-      Accumulate symbols while starting up and verify that snapshot save will
-      work. The symbols can be recovered at runtime calling by
-      (core:mangled-symbol-names <stream>). They are written out to the <file>
-      on exit.
   -f, --feature <feature>
       Add the feature to *features*
   -e, --eval <form>
@@ -334,10 +329,6 @@ void process_clasp_arguments(CommandLineOptions* options) {
       options->_PauseForDebugger = true;
     } else if (*arg == "-y" || *arg == "--snapshot-symbols") {
       options->_ExportedSymbolsCheck = true;
-    } else if (*arg == "-z" || *arg == "--snapshot-symbols-save") {
-      options->_ExportedSymbolsCheck = true;
-      options->_ExportedSymbolsSave = true;
-      options->_ExportedSymbolsFilename = *++arg;
     } else if (*arg == "-m" || *arg == "--disable-mpi") {
       options->_DisableMpi = true;
     } else if (*arg == "-v" || *arg == "--version") {
@@ -440,7 +431,7 @@ void process_clasp_arguments(CommandLineOptions* options) {
 CommandLineOptions::CommandLineOptions(int argc, const char* argv[])
     : _ProcessArguments(process_clasp_arguments), _DisableMpi(false), _AddressesP(false), _StartupType(DEFAULT_STARTUP_TYPE),
       _FreezeStartupType(false), _HasDescribeFile(false), _StartupFile(""), _ExportedSymbolsCheck(false),
-      _ExportedSymbolsSave(false), _RandomNumberSeed(0), _NoInform(false), _NoPrint(false), _DebuggerDisabled(false),
+      _RandomNumberSeed(0), _NoInform(false), _NoPrint(false), _DebuggerDisabled(false),
       _Interactive(true), _Version(false), _SilentStartup(true), _GenerateTrampolines(false),
       _RCFileName(std::string(getenv("HOME")) + "/.clasprc"), _NoRc(false), _PauseForDebugger(false) {
   if (argc == 0) {
diff --git a/src/core/debugger2.cc b/src/core/debugger2.cc
@@ -155,7 +155,7 @@ T_mv early_debug_inner(DebuggerFrame_sp bot, bool can_continue) {
     line = myReadLine(sprompt.str(), end_of_transmission);
     if (end_of_transmission) {
       printf("%s:%d Exiting debugger\n", __FILE__, __LINE__);
-      throw ExitProgramException(0);
+      core__exit(0);
     }
     char cmd;
     string eline;
diff --git a/src/core/lisp.cc b/src/core/lisp.cc
@@ -1401,7 +1401,7 @@ CL_LAMBDA(&optional (exit-value 0));
 CL_DECLARE();
 CL_DOCSTRING(R"dx(exit)dx");
 DOCGROUP(clasp);
-CL_DEFUN void core__exit(int exitValue) {
+[[noreturn]] CL_DEFUN void core__exit(int exitValue) {
 #ifdef CLASP_APPLE_SILICON
   exit(exitValue);
 #else
@@ -1416,7 +1416,7 @@ CL_DEFUN void core__exit(int exitValue) {
   }
   VirtualMachine& vm = my_thread->_VM;
   vm.shutdown();
-  throw(ExitProgramException(exitValue));
+  exit(exitValue);
 #endif
 };
 
@@ -2211,24 +2211,23 @@ void Lisp::dump_apropos(const char* part) const {
 
 bool Lisp::load(int& exitCode) {
   MultipleValues& mvn = core::lisp_multipleValues();
-  try {
-    switch (global_options->_StartupType) {
-    case cloInitLisp: {
-      Pathname_sp initPathname = cl__pathname(SimpleBaseString_O::make(globals_->_InitFileName));
-      if (!global_options->_SilentStartup) {
-        printf("Loading image %s\n", _rep_(initPathname).c_str());
-      }
-      T_mv result = core__load_no_package_set(initPathname);
-      if (result.nilp()) {
-        T_sp err = mvn.second(result.number_of_values());
-        printf("Could not load %s error: %s\n", _rep_(initPathname).c_str(), _rep_(err).c_str());
-        exitCode = 1;
-        return false;
-      }
-    } break;
-    case cloBaseImage:
-    case cloExtensionImage:
-    case cloImageFile:
+  switch (global_options->_StartupType) {
+  case cloInitLisp: {
+    Pathname_sp initPathname = cl__pathname(SimpleBaseString_O::make(globals_->_InitFileName));
+    if (!global_options->_SilentStartup) {
+      printf("Loading image %s\n", _rep_(initPathname).c_str());
+    }
+    T_mv result = core__load_no_package_set(initPathname);
+    if (result.nilp()) {
+      T_sp err = mvn.second(result.number_of_values());
+      printf("Could not load %s error: %s\n", _rep_(initPathname).c_str(), _rep_(err).c_str());
+      exitCode = 1;
+      return false;
+    }
+  } break;
+  case cloBaseImage:
+  case cloExtensionImage:
+  case cloImageFile:
       if (startup_functions_are_waiting()) {
         startup_functions_invoke(NULL);
       } else {
@@ -2251,36 +2250,21 @@ bool Lisp::load(int& exitCode) {
         }
       }
       break;
-    default:
+  default:
       break;
-    }
-  } catch (core::ExitProgramException& ee) {
-    exitCode = ee.getExitResult();
-    return false;
   }
   return true;
 };
 
 int Lisp::run() {
-  int exitCode;
-  try {
-    if (ext::_sym_STARtoplevel_hookSTAR->symbolValue().notnilp()) {
-      core::T_sp fn = ext::_sym_STARtoplevel_hookSTAR->symbolValue();
-      core::eval::funcall(fn);
-    } else if (global_options->_Interactive) {
-      this->readEvalPrintInteractive();
-    }
-    exitCode = 0;
-  } catch (core::ExitProgramException& ee) {
-    exitCode = ee.getExitResult();
-  }
-  if (global_options->_ExportedSymbolsSave) {
-    T_sp stream = core::cl__open(core::SimpleBaseString_O::make(global_options->_ExportedSymbolsFilename), StreamDirection::output);
-    core::core__mangledSymbols(stream);
-    cl__close(stream);
+  if (ext::_sym_STARtoplevel_hookSTAR->symbolValue().notnilp()) {
+    core::T_sp fn = ext::_sym_STARtoplevel_hookSTAR->symbolValue();
+    core::eval::funcall(fn);
+  } else if (global_options->_Interactive) {
+    this->readEvalPrintInteractive();
   }
 
-  return exitCode;
+  return 0;
 };
 
 FileScope_mv Lisp::getOrRegisterFileScope(const string& fileName) {
diff --git a/src/gctools/startRunStop.cc b/src/gctools/startRunStop.cc
@@ -105,13 +105,6 @@ int handleFatalCondition() {
   int exitCode = 0;
   try {
     throw;
-  } catch (core::ExitProgramException& ee) {
-    // Do nothing
-    //            printf("Caught ExitProgram in %s:%d\n", __FILE__, __LINE__);
-    exitCode = ee.getExitResult();
-  } catch (core::TerminateProgramIfBatch& ee) {
-    // Do nothing
-    printf("Caught TerminateProgramIfBatch in %s:%d\n", __FILE__, __LINE__);
   } catch (core::CatchThrow& ee) {
     core::clasp_write_string(fmt::format("{}:{} Uncaught THROW tag[{}] - this should NEVER happen - the stack should never be "
                                          "unwound unless there is a CATCH clause that matches the THROW",

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ T_mv early_debug_inner(DebuggerFrame_sp bot, bool can_continue) {`
`155`	`155`	`line = myReadLine(sprompt.str(), end_of_transmission);`
`156`	`156`	`if (end_of_transmission) {`
`157`	`157`	`printf("%s:%d Exiting debugger\n", __FILE__, __LINE__);`
`158`		`- throw ExitProgramException(0);`
	`158`	`+ core__exit(0);`
`159`	`159`	`}`
`160`	`160`	`char cmd;`
`161`	`161`	`string eline;`