Commit e69f184
committed
Improve the shutdown behavior
- This commit addresses two issues
- The first is that if there was an exception setting block read or
write sizes, contextConfiguration within ContextTask was not disposed.
This lead to a deadlock that required the process to be restarted
even if the offending parameter was changed.
- When addressing this, I noticed that there may be a more general issue
that is documented on line 314 of ContextTask. The general issue is
that contextConfiguration must always be disposed, and there are
(unlikely) ways that it might not be.
- Additionally, I improved the error messages presented when a ReadSize
or WriteSize exception occurred indicating what value the user needs
to use.
- The second issue was that when a hub was configured as a passthrough
device, it was not reset to a stanard hub when acqusition was stopped.
This could cause issues because the raw device used by passthroughs is
a member of hub zero and could lead to huge required block read sizes
even a headstage was no longer present. To address this, I simply
returned an active disposable whose action is to reset the port to
standard mode fro source.CoonfigureHost in ConfigurePortController,
rather than Disposable.Empty, which did nothing.1 parent 0fcdd85 commit e69f184
2 files changed
+55
-14
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
55 | 57 | | |
56 | 58 | | |
57 | 59 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
258 | | - | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
259 | 261 | | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
268 | 295 | | |
269 | | - | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
270 | 303 | | |
271 | | - | |
| 304 | + | |
272 | 305 | | |
273 | | - | |
274 | | - | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
275 | 312 | | |
276 | 313 | | |
| 314 | + | |
| 315 | + | |
277 | 316 | | |
278 | 317 | | |
279 | 318 | | |
| |||
0 commit comments