diff options
author | Justin Clark-Casey (justincc) | 2013-05-01 19:01:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-01 19:01:43 +0100 |
commit | 206fb306a7820cf593570e35ddfa8e7c5a10e449 (patch) | |
tree | 0ef0fdf42ddc0b63224af52b62b0bad42f62e352 /ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs | |
parent | Fix CAPS to work like they should - do not send caps to the viewer if they're... (diff) | |
download | opensim-SC_OLD-206fb306a7820cf593570e35ddfa8e7c5a10e449.zip opensim-SC_OLD-206fb306a7820cf593570e35ddfa8e7c5a10e449.tar.gz opensim-SC_OLD-206fb306a7820cf593570e35ddfa8e7c5a10e449.tar.bz2 opensim-SC_OLD-206fb306a7820cf593570e35ddfa8e7c5a10e449.tar.xz |
Update SmartThreadPool to latest version 2.2.3 with a major and minor change.
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
Diffstat (limited to 'ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs')
-rw-r--r-- | ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs new file mode 100644 index 0000000..a0bf8b8 --- /dev/null +++ b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs | |||
@@ -0,0 +1,128 @@ | |||
1 | using System; | ||
2 | using System.Threading; | ||
3 | |||
4 | namespace Amib.Threading.Internal | ||
5 | { | ||
6 | #region WorkItemResultTWrapper class | ||
7 | |||
8 | internal class WorkItemResultTWrapper<TResult> : IWorkItemResult<TResult>, IInternalWaitableResult | ||
9 | { | ||
10 | private readonly IWorkItemResult _workItemResult; | ||
11 | |||
12 | public WorkItemResultTWrapper(IWorkItemResult workItemResult) | ||
13 | { | ||
14 | _workItemResult = workItemResult; | ||
15 | } | ||
16 | |||
17 | #region IWorkItemResult<TResult> Members | ||
18 | |||
19 | public TResult GetResult() | ||
20 | { | ||
21 | return (TResult)_workItemResult.GetResult(); | ||
22 | } | ||
23 | |||
24 | public TResult GetResult(int millisecondsTimeout, bool exitContext) | ||
25 | { | ||
26 | return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext); | ||
27 | } | ||
28 | |||
29 | public TResult GetResult(TimeSpan timeout, bool exitContext) | ||
30 | { | ||
31 | return (TResult)_workItemResult.GetResult(timeout, exitContext); | ||
32 | } | ||
33 | |||
34 | public TResult GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle) | ||
35 | { | ||
36 | return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle); | ||
37 | } | ||
38 | |||
39 | public TResult GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle) | ||
40 | { | ||
41 | return (TResult)_workItemResult.GetResult(timeout, exitContext, cancelWaitHandle); | ||
42 | } | ||
43 | |||
44 | public TResult GetResult(out Exception e) | ||
45 | { | ||
46 | return (TResult)_workItemResult.GetResult(out e); | ||
47 | } | ||
48 | |||
49 | public TResult GetResult(int millisecondsTimeout, bool exitContext, out Exception e) | ||
50 | { | ||
51 | return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, out e); | ||
52 | } | ||
53 | |||
54 | public TResult GetResult(TimeSpan timeout, bool exitContext, out Exception e) | ||
55 | { | ||
56 | return (TResult)_workItemResult.GetResult(timeout, exitContext, out e); | ||
57 | } | ||
58 | |||
59 | public TResult GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e) | ||
60 | { | ||
61 | return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle, out e); | ||
62 | } | ||
63 | |||
64 | public TResult GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e) | ||
65 | { | ||
66 | return (TResult)_workItemResult.GetResult(timeout, exitContext, cancelWaitHandle, out e); | ||
67 | } | ||
68 | |||
69 | public bool IsCompleted | ||
70 | { | ||
71 | get { return _workItemResult.IsCompleted; } | ||
72 | } | ||
73 | |||
74 | public bool IsCanceled | ||
75 | { | ||
76 | get { return _workItemResult.IsCanceled; } | ||
77 | } | ||
78 | |||
79 | public object State | ||
80 | { | ||
81 | get { return _workItemResult.State; } | ||
82 | } | ||
83 | |||
84 | public bool Cancel() | ||
85 | { | ||
86 | return _workItemResult.Cancel(); | ||
87 | } | ||
88 | |||
89 | public bool Cancel(bool abortExecution) | ||
90 | { | ||
91 | return _workItemResult.Cancel(abortExecution); | ||
92 | } | ||
93 | |||
94 | public WorkItemPriority WorkItemPriority | ||
95 | { | ||
96 | get { return _workItemResult.WorkItemPriority; } | ||
97 | } | ||
98 | |||
99 | public TResult Result | ||
100 | { | ||
101 | get { return (TResult)_workItemResult.Result; } | ||
102 | } | ||
103 | |||
104 | public object Exception | ||
105 | { | ||
106 | get { return (TResult)_workItemResult.Exception; } | ||
107 | } | ||
108 | |||
109 | #region IInternalWorkItemResult Members | ||
110 | |||
111 | public IWorkItemResult GetWorkItemResult() | ||
112 | { | ||
113 | return _workItemResult.GetWorkItemResult(); | ||
114 | } | ||
115 | |||
116 | public IWorkItemResult<TRes> GetWorkItemResultT<TRes>() | ||
117 | { | ||
118 | return (IWorkItemResult<TRes>)this; | ||
119 | } | ||
120 | |||
121 | #endregion | ||
122 | |||
123 | #endregion | ||
124 | } | ||
125 | |||
126 | #endregion | ||
127 | |||
128 | } | ||