Mercurial > projects > mde
annotate mde/scheduler/Init.d @ 45:0fd51d2c6c8a
Several changes to resising windows and layout widgets. This commit still has some bugs.
Moved the implementable widgets from mde.gui.widget.Widget to miscWidgets, leaving base widgets in Widget.
Rewrote some of GridLayoutWidget's implementation. Made many operations general to work for either columns or rows. Some optimisations were intended but ended up being removed due to problems.
Allowed layout's to resize from either direction (only with window resizes).
committer: Diggory Hardy <diggory.hardy@gmail.com>
| author | Diggory Hardy <diggory.hardy@gmail.com> |
|---|---|
| date | Thu, 22 May 2008 11:34:09 +0100 |
| parents | 1530d9c04d4d |
| children | f000d6cd0f74 |
| rev | line source |
|---|---|
| 20 | 1 /* LICENSE BLOCK |
| 2 Part of mde: a Modular D game-oriented Engine | |
| 3 Copyright © 2007-2008 Diggory Hardy | |
| 4 | |
|
26
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
5 This program is free software: you can redistribute it and/or modify it under the terms |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
6 of the GNU General Public License as published by the Free Software Foundation, either |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
7 version 2 of the License, or (at your option) any later version. |
| 20 | 8 |
| 9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | |
| 10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
| 11 See the GNU General Public License for more details. | |
| 12 | |
|
26
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
13 You should have received a copy of the GNU General Public License |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
14 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 15 |
| 16 /************************************************************************************************** | |
| 17 * Initialisation setup and exit cleanup module. | |
| 18 * | |
| 19 * This module provides an infrastructure for handling much of the initialisation and | |
| 20 * deinitialisation of the program. It does not, however, provide much of the (de)initialisation | |
| 21 * code; with the exception of that for the logger. | |
| 22 *************************************************************************************************/ | |
| 23 module mde.scheduler.Init; | |
| 24 | |
|
32
316b0230a849
Lots more work on the GUI. Also renamed lots of files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
31
diff
changeset
|
25 import mde.scheduler.init2; // This module is responsible for setting up some init functions. |
|
316b0230a849
Lots more work on the GUI. Also renamed lots of files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
31
diff
changeset
|
26 import mde.scheduler.initFunctions; |
| 20 | 27 import mde.scheduler.exception; |
| 28 | |
|
32
316b0230a849
Lots more work on the GUI. Also renamed lots of files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
31
diff
changeset
|
29 import mde.Options; |
| 20 | 30 import paths = mde.resource.paths; |
| 31 import mde.exception; | |
| 32 | |
| 33 // tango imports | |
| 34 import tango.core.Thread; | |
| 35 import tango.core.Exception; | |
| 36 import tango.stdc.stringz : fromStringz; | |
| 37 import tango.util.log.Log : Log, Logger; | |
| 38 import tango.util.log.ConsoleAppender : ConsoleAppender; | |
| 39 | |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
40 //version = SwitchAppender; |
| 20 | 41 version (SwitchAppender) { // My own variation, currently just a test |
| 42 import tango.util.log.SwitchingFileAppender : SwitchingFileAppender; | |
| 43 } else { | |
| 44 import tango.util.log.RollingFileAppender : RollingFileAppender; | |
| 45 } | |
| 46 | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
47 // Derelict imports |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
48 import derelict.opengl.gl; |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
49 import derelict.sdl.sdl; |
|
30
467c74d4804d
Major changes to the scheduler, previously only used by the main loop.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
29
diff
changeset
|
50 import derelict.freetype.ft; |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
51 import derelict.util.exception; |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
52 |
| 20 | 53 /** |
| 54 * Static CTOR | |
| 55 * | |
| 56 * This should handle a minimal amount of functionality where useful. For instance, configuring the | |
| 57 * logger here and not in Init allows unittests to use the logger. | |
| 58 */ | |
| 59 static this() | |
| 60 { | |
| 61 // Find/create paths: | |
| 62 try { | |
| 63 paths.resolvePaths(); | |
| 64 } catch (Exception e) { | |
|
28
b5fadd8d930b
Small addition to GUI, paths work-around for Windows.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
26
diff
changeset
|
65 // NOTE: an exception thrown here cannot be caught by main()! |
| 20 | 66 throw new InitException ("Resolving paths failed: " ~ e.msg); |
| 67 } | |
| 68 | |
| 69 // Set up the logger: | |
| 70 { | |
| 71 // Where logging is done to is determined at compile-time, currently just via static ifs. | |
| 72 Logger root = Log.getRootLogger(); | |
|
26
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
73 |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
74 static if (true ) { // Log to files (first appender so root seperator messages don't show on console) |
| 20 | 75 version (SwitchAppender) { |
| 76 root.addAppender (new SwitchingFileAppender (paths.logDir~"/log-.txt", 5)); | |
| 77 } else { | |
| 78 // Use 2 log files with a maximum size of 1 MB: | |
| 79 root.addAppender (new RollingFileAppender (paths.logDir~"/log-.txt", 2, 1024*1024)); | |
|
26
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
80 root.info (""); // some kind of separation between runs |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
81 root.info (""); |
| 20 | 82 } |
| 83 } | |
|
26
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
84 static if (true ) { // Log to the console |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
85 root.addAppender(new ConsoleAppender); |
|
611f7b9063c6
Changed the licensing and removed a few dead files.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
25
diff
changeset
|
86 } |
| 20 | 87 |
| 88 // Set the level here, but set it again once options have been loaded: | |
| 89 debug root.setLevel(root.Level.Trace); | |
| 90 else root.setLevel(root.Level.Info); | |
| 91 } | |
| 92 } | |
| 93 static ~this() | |
| 94 { | |
| 95 } | |
| 96 | |
| 97 /** | |
| 98 * Init class | |
| 99 * | |
| 100 * A scope class created at beginning of the program and destroyed at the end; thus the CTOR | |
| 101 * handles program initialisation and the DTOR handles program cleanup. | |
| 102 */ | |
| 103 scope class Init | |
| 104 { | |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
105 //private bool failure = false; // set true on failure during init, so that clean |
| 20 | 106 private static Logger logger; |
| 107 static this() { | |
| 108 logger = Log.getLogger ("mde.scheduler.Init.Init"); | |
| 109 } | |
| 110 | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
111 /** this() − initialisation |
| 20 | 112 * |
| 113 * Runs general initialisation code, in a threaded manner where this isn't difficult. | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
114 * If any init fails, cleanup is still handled by ~this(). |
| 20 | 115 * |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
116 * Init order: 1. Pre-init (loads components needed by most init functions). 2. Dynamic library |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
117 * loading (load any dynamic libraries first, so that if loading fails nothing else need be |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
118 * done). 3. Init functions (threaded functions handling the rest of initialisation). |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
119 */ |
| 20 | 120 /* In a single-threaded function this could be done with: |
| 121 * scope(failure) cleanup; | |
| 122 * This won't work with a threaded init function since any threads completing succesfully will | |
| 123 * not clean-up, and a fixed list of clean-up functions cannot be used since clean-up functions | |
| 124 * must not run where the initialisation functions have failed. | |
| 125 * Hence a list of clean-up functions is built similarly to scope(failure) --- see addCleanupFct. | |
| 126 */ | |
| 127 this() | |
| 128 { | |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
129 debug logger.trace ("Init: starting"); |
| 20 | 130 |
| 131 //BEGIN Pre-init (stage init0) | |
| 132 /* Load options now. Don't load in a thread since: | |
| 133 * Loading should be fast | |
| 134 * Most work is probably disk access | |
| 135 * It's a really good idea to let the options apply to all other loading. */ | |
| 136 try { | |
| 137 Options.load(); | |
| 138 } catch (optionsLoadException e) { | |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
139 throw new InitException ("Loading options failed: " ~ e.msg); |
| 20 | 140 } |
| 141 | |
|
43
1530d9c04d4d
Column/row resizing implemented for GridLayoutWidget (finally)!
Diggory Hardy <diggory.hardy@gmail.com>
parents:
32
diff
changeset
|
142 // Now re-set the logging level, using the value from the config file: |
|
1530d9c04d4d
Column/row resizing implemented for GridLayoutWidget (finally)!
Diggory Hardy <diggory.hardy@gmail.com>
parents:
32
diff
changeset
|
143 Log.getRootLogger.setLevel (cast(Log.Level) miscOpts.logLevel, true); |
|
1530d9c04d4d
Column/row resizing implemented for GridLayoutWidget (finally)!
Diggory Hardy <diggory.hardy@gmail.com>
parents:
32
diff
changeset
|
144 // And set this (debug option): |
|
1530d9c04d4d
Column/row resizing implemented for GridLayoutWidget (finally)!
Diggory Hardy <diggory.hardy@gmail.com>
parents:
32
diff
changeset
|
145 imde.run = !miscOpts.exitImmediately; |
| 20 | 146 //END Pre-init |
| 147 | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
148 debug logger.trace ("Init: pre-init done"); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
149 |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
150 //BEGIN Load dynamic libraries |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
151 /* Can be done by init functions but much neater to do here. |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
152 * Also means that init functions aren't run if a library fails to load. */ |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
153 try { |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
154 DerelictSDL.load(); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
155 DerelictGL.load(); |
|
30
467c74d4804d
Major changes to the scheduler, previously only used by the main loop.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
29
diff
changeset
|
156 DerelictFT.load(); |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
157 } catch (DerelictException de) { |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
158 logger.fatal ("Loading dynamic library failed:"); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
159 logger.fatal (de.msg); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
160 |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
161 throw new InitException ("Loading dynamic libraries failed (see above)."); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
162 } |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
163 //END Load dynamic libraries |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
164 |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
165 debug logger.trace ("Init: dynamic libraries loaded"); |
| 20 | 166 |
| 167 //BEGIN Init (stages init2, init4) | |
| 168 /* Call init functions. | |
| 169 * | |
| 170 * Current method is to try using threads, and on failure assume no threads were actually | |
| 171 * created and run functions in a non-threaded manner. */ | |
| 172 | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
173 try { |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
174 if (runStageThreaded (init)) runStageForward (init); |
| 20 | 175 } |
| 176 catch (InitStageException) { // This init stage failed. | |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
177 // FIXME: check DTOR still runs |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
178 throw new InitException ("An init function failed (see above message(s))"); |
| 20 | 179 } |
| 180 //END Init | |
| 181 | |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
182 debug logger.trace ("Init: done"); |
| 20 | 183 } |
| 184 | |
| 185 /** DTOR - runs cleanup functions. */ | |
| 186 ~this() | |
| 187 { | |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
188 debug logger.trace ("Cleanup: starting"); |
| 20 | 189 |
| 190 Options.save(); // save options... do so here for now | |
| 191 | |
|
25
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
192 // General cleanup: |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
193 try { |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
194 if (runStageThreaded (cleanup)) runStageReverse (cleanup); |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
195 } |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
196 catch (InitStageException) { |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
197 // Nothing else to do but report: |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
198 logger.error ("One or more cleanup functions failed!"); |
|
2c28ee04a4ed
Some minor and some futile efforts.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
24
diff
changeset
|
199 } |
| 20 | 200 |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
201 debug logger.trace ("Cleanup: done"); |
| 20 | 202 } |
| 203 | |
| 204 | |
| 205 //BEGIN runStage... | |
| 206 private static { | |
| 207 /* The following three functions, runStage*, each run all functions in a stage in some order, | |
| 208 * catching any exceptions thrown by the functions (although this isn't guaranteed for threads), | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
209 * and throw an InitStageException on initFailure. */ |
| 20 | 210 |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
211 const LOG_IF_MSG = "Init function "; |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
212 const LOG_CF_MSG = "Cleanup function "; |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
213 const LOG_F_START = " - running"; |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
214 const LOG_F_END = " - completed"; |
|
45
0fd51d2c6c8a
Several changes to resising windows and layout widgets. This commit still has some bugs.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
43
diff
changeset
|
215 const LOG_F_BAD = " - failed"; |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
216 const LOG_F_FAIL = " - failed: "; |
| 20 | 217 /* Runs all functions consecutively, first-to-last. |
| 218 * If any function fails, halts immediately. */ | |
| 219 void runStageForward (InitStage s) { | |
| 220 foreach (func; s.funcs) { | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
221 if (initFailure) break; |
| 20 | 222 try { |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
223 debug logger.trace (LOG_IF_MSG ~ func.name ~ LOG_F_START); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
224 func.func(); |
|
45
0fd51d2c6c8a
Several changes to resising windows and layout widgets. This commit still has some bugs.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
43
diff
changeset
|
225 debug logger.trace (LOG_IF_MSG ~ func.name ~ (initFailure ? LOG_F_BAD : LOG_F_END)); |
| 20 | 226 } catch (Exception e) { |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
227 logger.fatal (LOG_IF_MSG ~ func.name ~ LOG_F_FAIL ~ |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
228 ((e.msg is null || e.msg == "") ? "(no failure message)" : e.msg) ); |
| 20 | 229 |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
230 setInitFailure(); |
| 20 | 231 } |
| 232 } | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
233 |
|
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
234 if (initFailure) throw new InitStageException; // Problem running; abort and cleanup from here. |
| 20 | 235 } |
| 236 /* Runs all functions consecutively, last-to-first. | |
| 237 * If any function fails, continue until all have been run. */ | |
| 238 void runStageReverse (InitStage s) { | |
| 239 foreach_reverse (func; s.funcs) { | |
| 240 try { | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
241 debug logger.trace (LOG_CF_MSG ~ func.name ~ LOG_F_START); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
242 func.func(); |
|
45
0fd51d2c6c8a
Several changes to resising windows and layout widgets. This commit still has some bugs.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
43
diff
changeset
|
243 debug logger.trace (LOG_CF_MSG ~ func.name ~ (initFailure ? LOG_F_BAD : LOG_F_END)); |
| 20 | 244 } catch (Exception e) { |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
245 logger.fatal (LOG_CF_MSG ~ func.name ~ LOG_F_FAIL ~ |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
246 ((e.msg is null || e.msg == "") ? "(no failure message)" : e.msg) ); |
| 20 | 247 |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
248 setInitFailure(); |
| 20 | 249 } |
| 250 } | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
251 if (initFailure) throw new InitStageException; // Problem running; abort and cleanup from here. |
| 20 | 252 } |
| 253 /* Tries running functions in a threaded way. Returns false if successful, true if not but | |
| 254 * functions should be run without threads. */ | |
| 255 bool runStageThreaded (InitStage s) { | |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
256 if (!miscOpts.useThreads) return true; // Use unthreaded route instead |
| 20 | 257 |
| 258 ThreadGroup tg; | |
| 259 try { // creating/starting threads could fail | |
| 260 tg = new ThreadGroup; | |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
261 foreach (func; s.funcs) { // Start all threads |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
262 debug logger.trace (LOG_IF_MSG ~ func.name ~ LOG_F_START); |
|
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
263 tg.create(func.func); |
|
45
0fd51d2c6c8a
Several changes to resising windows and layout widgets. This commit still has some bugs.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
43
diff
changeset
|
264 debug logger.trace (LOG_IF_MSG ~ func.name ~ (initFailure ? LOG_F_BAD : LOG_F_END)); |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
265 } |
| 20 | 266 } catch (ThreadException e) { // Problem with threading; try without threads |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
267 logger.error ("Caught ThreadException while trying to create threads:"); |
|
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
268 logger.error (e.msg); |
|
29
f985c28c0ec9
A new GUI widget plus changes to the init system.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
28
diff
changeset
|
269 logger.info ("Will disable threads and continue, assuming no threads were created."); |
| 20 | 270 |
|
24
32eff0e01c05
Only locally-changed options are stored in user-config now. Log levels revised.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
21
diff
changeset
|
271 Options.setBool("misc", "useThreads", false); // Disable threads entirely |
| 20 | 272 return true; // Try again without threads |
| 273 } | |
| 274 | |
| 275 /* Wait for all threads to complete. | |
| 276 * | |
| 277 * If something went wrong, we still need to do this before cleaning up. | |
| 278 */ | |
| 279 foreach (t; tg) { | |
| 280 try { | |
| 281 t.join (true); | |
| 282 } catch (Exception e) { | |
| 283 // Relying on catching exceptions thrown by other threads is a bad idea. | |
| 284 // Hence all threads should catch their own exceptions and return safely. | |
| 285 | |
| 286 logger.fatal ("Unhandled exception from Init function:"); | |
| 287 logger.fatal (e.msg); | |
| 288 | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
289 setInitFailure (); // abort (but join other threads first) |
| 20 | 290 } |
| 291 } | |
|
21
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
292 |
|
a60cbb7359dd
Window settings now come from options, and may use OpenGL (enabled/disabled at compile time).
Diggory Hardy <diggory.hardy@gmail.com>
parents:
20
diff
changeset
|
293 if (initFailure) throw new InitStageException; // Problem running; abort and cleanup from here. |
| 20 | 294 return false; // Done successfully |
| 295 } | |
| 296 } | |
| 297 //END runStage... | |
| 298 | |
| 299 debug (mdeUnitTest) unittest { | |
| 300 /* Fake init and cleanup. Use unittest-specific init and cleanup InitStages to avoid | |
| 301 * messing other init/cleanup up. */ | |
| 302 static InitStage initUT, cleanupUT; | |
| 303 | |
| 304 static bool initialised = false; | |
| 305 static void cleanupFunc1 () { | |
| 306 initialised = false; | |
| 307 } | |
| 308 static void cleanupFunc2 () { | |
| 309 assert (initialised == true); | |
| 310 } | |
| 311 | |
| 312 static void initFunc () { | |
| 313 initialised = true; | |
|
30
467c74d4804d
Major changes to the scheduler, previously only used by the main loop.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
29
diff
changeset
|
314 cleanupUT.addFunc (&cleanupFunc1, "UT cleanup 1"); |
|
467c74d4804d
Major changes to the scheduler, previously only used by the main loop.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
29
diff
changeset
|
315 cleanupUT.addFunc (&cleanupFunc2, "UT cleanup 2"); |
| 20 | 316 } |
| 317 | |
|
30
467c74d4804d
Major changes to the scheduler, previously only used by the main loop.
Diggory Hardy <diggory.hardy@gmail.com>
parents:
29
diff
changeset
|
318 initUT.addFunc (&initFunc, "UT init"); |
| 20 | 319 |
| 320 runStageForward (initUT); | |
| 321 assert (initialised); | |
| 322 | |
| 323 runStageReverse (cleanupUT); | |
| 324 assert (!initialised); | |
| 325 | |
| 326 logger.info ("Unittest complete."); | |
| 327 } | |
| 328 } |