|
1 | 1 | using System;
|
2 | 2 | using System.Collections;
|
3 | 3 | using System.Collections.Generic;
|
| 4 | +using System.Linq; |
| 5 | +using System.Reflection; |
4 | 6 | using System.Runtime.CompilerServices;
|
| 7 | +using System.Text; |
5 | 8 | using System.Threading;
|
6 |
| -using System.Threading.Tasks; |
7 | 9 | using UnityEngine;
|
8 | 10 | using UnityAsyncAwaitUtil;
|
9 | 11 |
|
@@ -255,7 +257,23 @@ public IEnumerator Run()
|
255 | 257 | }
|
256 | 258 | catch (Exception e)
|
257 | 259 | {
|
258 |
| - _awaiter.Complete(default(T), e); |
| 260 | + // The IEnumerators we have in the process stack do not tell us the |
| 261 | + // actual names of the coroutine methods but it does tell us the objects |
| 262 | + // that the IEnumerators are associated with, so we can at least try |
| 263 | + // adding that to the exception output |
| 264 | + var objectTrace = GenerateObjectTrace(_processStack); |
| 265 | + |
| 266 | + if (objectTrace.Any()) |
| 267 | + { |
| 268 | + _awaiter.Complete( |
| 269 | + default(T), new Exception( |
| 270 | + GenerateObjectTraceMessage(objectTrace), e)); |
| 271 | + } |
| 272 | + else |
| 273 | + { |
| 274 | + _awaiter.Complete(default(T), e); |
| 275 | + } |
| 276 | + |
259 | 277 | yield break;
|
260 | 278 | }
|
261 | 279 |
|
@@ -285,6 +303,58 @@ public IEnumerator Run()
|
285 | 303 | }
|
286 | 304 | }
|
287 | 305 | }
|
| 306 | + |
| 307 | + string GenerateObjectTraceMessage(List<Type> objTrace) |
| 308 | + { |
| 309 | + var result = new StringBuilder(); |
| 310 | + |
| 311 | + foreach (var objType in objTrace) |
| 312 | + { |
| 313 | + if (result.Length != 0) |
| 314 | + { |
| 315 | + result.Append(" -> "); |
| 316 | + } |
| 317 | + |
| 318 | + result.Append(objType.ToString()); |
| 319 | + } |
| 320 | + |
| 321 | + result.AppendLine(); |
| 322 | + return "Unity Coroutine Object Trace: " + result.ToString(); |
| 323 | + } |
| 324 | + |
| 325 | + static List<Type> GenerateObjectTrace(IEnumerable<IEnumerator> enumerators) |
| 326 | + { |
| 327 | + var objTrace = new List<Type>(); |
| 328 | + |
| 329 | + foreach (var enumerator in enumerators) |
| 330 | + { |
| 331 | + // NOTE: This only works with scripting engine 4.6 |
| 332 | + // And could easily stop working with unity updates |
| 333 | + var field = enumerator.GetType().GetField("$this", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); |
| 334 | + |
| 335 | + if (field == null) |
| 336 | + { |
| 337 | + continue; |
| 338 | + } |
| 339 | + |
| 340 | + var obj = field.GetValue(enumerator); |
| 341 | + |
| 342 | + if (obj == null) |
| 343 | + { |
| 344 | + continue; |
| 345 | + } |
| 346 | + |
| 347 | + var objType = obj.GetType(); |
| 348 | + |
| 349 | + if (!objTrace.Any() || objType != objTrace.Last()) |
| 350 | + { |
| 351 | + objTrace.Add(objType); |
| 352 | + } |
| 353 | + } |
| 354 | + |
| 355 | + objTrace.Reverse(); |
| 356 | + return objTrace; |
| 357 | + } |
288 | 358 | }
|
289 | 359 |
|
290 | 360 | static class InstructionWrappers
|
|
0 commit comments