X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=2aef4c2c0896efe6f021ef54c021468a27c2f639;hb=d127f7709f7ac64fbbc537131bfd02bb29bc1ebe;hp=6b4f08569a7a70f6d3f0c346c972b11113c7e29d;hpb=50c1fe2d3e8bbfdb54873b213eb3a148cfa1f00d;p=flightgear.git diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx index 6b4f08569..2aef4c2c0 100644 --- a/src/Main/bootstrap.cxx +++ b/src/Main/bootstrap.cxx @@ -25,6 +25,10 @@ # include #endif +#ifdef HAVE_WINDOWS_H +#include +#endif + #if defined(HAVE_FEENABLEEXCEPT) #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -34,6 +38,10 @@ # include #endif +#ifndef _WIN32 +# include // for gethostname() +#endif + #include #include #include @@ -41,34 +49,31 @@ #include #include -#include -#include #include #include using std::cerr; using std::endl; +#include #include "main.hxx" #include "globals.hxx" #include "fg_props.hxx" -#include "fgviewer.hxx" #include "fg_os.hxx" -char *homedir = ::getenv( "HOME" ); -char *hostname = ::getenv( "HOSTNAME" ); -bool free_hostname = false; +std::string homedir; +std::string hostname; -// foreward declaration. +// forward declaration. void fgExitCleanup(); static bool fpeAbort = false; -static void handleFPE(int); static void initFPE(); #if defined(HAVE_FEENABLEEXCEPT) +static void handleFPE(int); static void initFPE () { @@ -87,6 +92,7 @@ static void handleFPE(int) } #elif defined(__linux__) && defined(__i386__) +static void handleFPE(int); static void initFPE () { @@ -109,52 +115,23 @@ handleFPE (int num) SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)"); } #else -static void handleFPE(int) -{ -} - static void initFPE() { } #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(_WIN32) int main ( int argc, char **argv ); int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - logbuf::has_no_console(); main( __argc, __argv ); } #endif -#if defined( sgi ) -#include -#include -#include - -/* - * set the special "flush zero" bit (FS, bit 24) in the Control Status - * Register of the FPU of R4k and beyond so that the result of any - * underflowing operation will be clamped to zero, and no exception of - * any kind will be generated on the CPU. This has no effect on an - * R3000. - */ -void flush_fpe(void) -{ - union fpc_csr f; - f.fc_word = get_fpc_csr(); - f.fc_struct.flush = 1; - set_fpc_csr(f.fc_word); -} -#endif - static void fg_terminate() { cerr << endl << - "Uncaught Exception: you should see a meaningful error message\n" - "here, but your GLUT (or SDL) library was apparently compiled\n" - "and/or linked without exception support. Please complain to\n" - "its provider!" + "Uncaught Exception: missing exception handler on some thread" << endl << endl; abort(); } @@ -162,7 +139,23 @@ static void fg_terminate() { int _bootstrap_OSInit; // Main entry point; catch any exceptions that have made it this far. -int main ( int argc, char **argv ) { +int main ( int argc, char **argv ) +{ +#if defined(_MSC_VER) || defined(_WIN32) + // Don't show blocking "no disk in drive" error messages on Windows 7, + // silently return errors to application instead. + // See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX" + SetErrorMode(SEM_NOOPENFILEERRORBOX); + + hostname = ::getenv( "COMPUTERNAME" ); +#else + // Unix(alike) systems + char _hostname[256]; + gethostname(_hostname, 256); + hostname = _hostname; + + signal(SIGPIPE, SIG_IGN); +#endif #ifdef PTW32_STATIC_LIB // Initialise static pthread win32 lib @@ -183,23 +176,6 @@ int main ( int argc, char **argv ) { } initFPE(); #endif -#if !defined( _MSC_VER ) && !defined( __MINGW32__ ) - signal(SIGPIPE, SIG_IGN); -#endif - -#if defined(sgi) - flush_fpe(); - - // Bind all non-rendering threads to CPU1 - // This will reduce the jitter caused by them to an absolute minimum, - // but it will only work with superuser authority. - if ( geteuid() == 0 ) - { - sysmp(MP_CLOCK, 0); // bind the timer only to CPU0 - sysmp(MP_ISOLATE, 1 ); // Isolate CPU1 - sysmp(MP_NONPREEMPTIVE, 1 ); // disable process time slicing on CPU1 - } -#endif // Enable floating-point exceptions for Windows #if defined( _MSC_VER ) && defined( DEBUG ) @@ -207,9 +183,6 @@ int main ( int argc, char **argv ) { _control87( _EM_INEXACT, _MCW_EM ); #endif -#if defined( HAVE_BC5PLUS ) - _control87(MCW_EM, MCW_EM); /* defined in float.h */ -#endif bool fgviewer = false; for (int i = 0; i < argc; ++i) { if (!strcmp("--fgviewer", argv[i])) { @@ -221,12 +194,19 @@ int main ( int argc, char **argv ) { // FIXME: add other, more specific // exceptions. try { + // http://code.google.com/p/flightgear-bugs/issues/detail?id=1231 + // ensure sglog is inited before atexit() is registered, so logging + // is possible inside fgExitCleanup + sglog(); + std::set_terminate(fg_terminate); atexit(fgExitCleanup); if (fgviewer) fgviewerMain(argc, argv); else fgMainInit(argc, argv); + + } catch (const sg_throwable &t) { // We must use cerr rather than // logging, since logging may be @@ -235,11 +215,14 @@ int main ( int argc, char **argv ) { if (std::strlen(t.getOrigin()) != 0) cerr << " (received from " << t.getOrigin() << ')' << endl; - } catch (const string &s) { - cerr << "Fatal error: " << s << endl; + } catch (const std::exception &e ) { + cerr << "Fatal error (std::exception): " << e.what() << endl; + + } catch (const std::string &s) { + cerr << "Fatal error (std::string): " << s << endl; } catch (const char *s) { - cerr << "Fatal error: " << s << endl; + cerr << "Fatal error (const char*): " << s << endl; } catch (...) { cerr << "Unknown exception in the main loop. Aborting..." << endl; @@ -250,16 +233,15 @@ int main ( int argc, char **argv ) { return 0; } -// do some clean up on exit. Specifically we want to call alutExit() -// which happens in the sound manager destructor. +// do some clean up on exit. Specifically we want to delete the sound-manager, +// so OpenAL device and context are released cleanly void fgExitCleanup() { if (_bootstrap_OSInit != 0) fgSetMouseCursor(MOUSE_CURSOR_POINTER); + // on the common exit path globals is already deleted, and NULL, + // so this only happens on error paths. delete globals; - - if (free_hostname && hostname != NULL) - free(hostname); }