Skip to content

Commit bee3aec

Browse files
committed
Skipping hungarian m for members
1 parent a65a5c5 commit bee3aec

File tree

5 files changed

+152
-152
lines changed

5 files changed

+152
-152
lines changed

src/PSParallel/InvokeParallelCommand.cs

+28-28
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public sealed class InvokeParallelCommand : PSCmdlet, IDisposable
4646
[Parameter(ParameterSetName = "NoProgress")]
4747
public SwitchParameter NoProgress { get; set; }
4848

49-
private readonly CancellationTokenSource m_cancelationTokenSource = new CancellationTokenSource();
50-
private PowershellPool m_powershellPool;
51-
private ProgressManager m_progressManager;
49+
private readonly CancellationTokenSource _cancelationTokenSource = new CancellationTokenSource();
50+
private PowershellPool _powershellPool;
51+
private ProgressManager _progressManager;
5252

5353
// this is only used when NoProgress is not specified
5454
// Input is then captured in ProcessRecored and processed in EndProcessing
55-
private List<PSObject> m_input;
55+
private List<PSObject> _input;
5656

5757
private static InitialSessionState GetSessionState(SessionState sessionState)
5858
{
@@ -144,12 +144,12 @@ protected override void BeginProcessing()
144144
{
145145
ValidateParameters();
146146
var iss = GetSessionState();
147-
m_powershellPool = new PowershellPool(ThrottleLimit, iss, m_cancelationTokenSource.Token);
148-
m_powershellPool.Open();
147+
_powershellPool = new PowershellPool(ThrottleLimit, iss, _cancelationTokenSource.Token);
148+
_powershellPool.Open();
149149
if (!NoProgress)
150150
{
151-
m_progressManager = new ProgressManager(ProgressId, ProgressActivity, $"Processing with {ThrottleLimit} workers", ParentProgressId);
152-
m_input = new List<PSObject>(500);
151+
_progressManager = new ProgressManager(ProgressId, ProgressActivity, $"Processing with {ThrottleLimit} workers", ParentProgressId);
152+
_input = new List<PSObject>(500);
153153
}
154154
}
155155

@@ -158,14 +158,14 @@ protected override void ProcessRecord()
158158
{
159159
if(NoProgress)
160160
{
161-
while (!m_powershellPool.TryAddInput(ScriptBlock, InputObject))
161+
while (!_powershellPool.TryAddInput(ScriptBlock, InputObject))
162162
{
163163
WriteOutputs();
164164
}
165165
}
166166
else
167167
{
168-
m_input.Add(InputObject);
168+
_input.Add(InputObject);
169169
}
170170
}
171171

@@ -175,23 +175,23 @@ protected override void EndProcessing()
175175
{
176176
if (!NoProgress)
177177
{
178-
m_progressManager.TotalCount = m_input.Count;
179-
foreach (var i in m_input)
178+
_progressManager.TotalCount = _input.Count;
179+
foreach (var i in _input)
180180
{
181-
m_progressManager.UpdateCurrentProgressRecord($"Starting processing of {i}", m_powershellPool.ProcessedCount);
182-
WriteProgress(m_progressManager.ProgressRecord);
183-
while (!m_powershellPool.TryAddInput(ScriptBlock, i))
181+
_progressManager.UpdateCurrentProgressRecord($"Starting processing of {i}", _powershellPool.ProcessedCount);
182+
WriteProgress(_progressManager.ProgressRecord);
183+
while (!_powershellPool.TryAddInput(ScriptBlock, i))
184184
{
185185
WriteOutputs();
186186
}
187187
}
188188
}
189-
while(!m_powershellPool.WaitForAllPowershellCompleted(100))
189+
while(!_powershellPool.WaitForAllPowershellCompleted(100))
190190
{
191191
if(!NoProgress)
192192
{
193-
m_progressManager.UpdateCurrentProgressRecord("All work queued. Waiting for remaining work to complete.", m_powershellPool.ProcessedCount);
194-
WriteProgress(m_progressManager.ProgressRecord);
193+
_progressManager.UpdateCurrentProgressRecord("All work queued. Waiting for remaining work to complete.", _powershellPool.ProcessedCount);
194+
WriteProgress(_progressManager.ProgressRecord);
195195
}
196196
if (Stopping)
197197
{
@@ -205,25 +205,25 @@ protected override void EndProcessing()
205205
{
206206
if(!NoProgress)
207207
{
208-
WriteProgress(m_progressManager.Completed());
208+
WriteProgress(_progressManager.Completed());
209209
}
210210
}
211211
}
212212

213213
protected override void StopProcessing()
214214
{
215-
m_cancelationTokenSource.Cancel();
216-
m_powershellPool?.Stop();
215+
_cancelationTokenSource.Cancel();
216+
_powershellPool?.Stop();
217217
}
218218

219219
private void WriteOutputs()
220220
{
221221
Debug.WriteLine("Processing output");
222-
if (m_cancelationTokenSource.IsCancellationRequested)
222+
if (_cancelationTokenSource.IsCancellationRequested)
223223
{
224224
return;
225225
}
226-
var streams = m_powershellPool.Streams;
226+
var streams = _powershellPool.Streams;
227227
foreach (var o in streams.Output.ReadAll())
228228
{
229229
WriteObject(o, false);
@@ -256,22 +256,22 @@ private void WriteOutputs()
256256
{
257257
if(!NoProgress)
258258
{
259-
p.ParentActivityId = m_progressManager.ActivityId;
259+
p.ParentActivityId = _progressManager.ActivityId;
260260
}
261261
WriteProgress(p);
262262
}
263263
if(!NoProgress)
264264
{
265-
m_progressManager.UpdateCurrentProgressRecord(m_powershellPool.ProcessedCount);
266-
WriteProgress(m_progressManager.ProgressRecord);
265+
_progressManager.UpdateCurrentProgressRecord(_powershellPool.ProcessedCount);
266+
WriteProgress(_progressManager.ProgressRecord);
267267
}
268268
}
269269
}
270270

271271
public void Dispose()
272272
{
273-
m_powershellPool?.Dispose();
274-
m_cancelationTokenSource.Dispose();
273+
_powershellPool?.Dispose();
274+
_cancelationTokenSource.Dispose();
275275
}
276276

277277
}

src/PSParallel/PowerShellPoolMember.cs

+48-48
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ namespace PSParallel
55
{
66
class PowerShellPoolMember : IDisposable
77
{
8-
private readonly PowershellPool m_pool;
9-
private readonly int m_index;
10-
private readonly PowerShellPoolStreams m_poolStreams;
11-
private PowerShell m_powerShell;
12-
public PowerShell PowerShell => m_powerShell;
13-
public int Index => m_index ;
14-
15-
private readonly PSDataCollection<PSObject> m_input =new PSDataCollection<PSObject>();
16-
private PSDataCollection<PSObject> m_output;
17-
private int m_percentComplete;
18-
public int PercentComplete => m_percentComplete;
8+
private readonly PowershellPool _pool;
9+
private readonly int _index;
10+
private readonly PowerShellPoolStreams _poolStreams;
11+
private PowerShell _powerShell;
12+
public PowerShell PowerShell => _powerShell;
13+
public int Index => _index ;
14+
15+
private readonly PSDataCollection<PSObject> _input =new PSDataCollection<PSObject>();
16+
private PSDataCollection<PSObject> _output;
17+
private int _percentComplete;
18+
public int PercentComplete => _percentComplete;
1919

2020

2121
public PowerShellPoolMember(PowershellPool pool, int index)
2222
{
23-
m_pool = pool;
24-
m_index = index;
25-
m_poolStreams = m_pool.Streams;
26-
m_input.Complete();
23+
_pool = pool;
24+
_index = index;
25+
_poolStreams = _pool.Streams;
26+
_input.Complete();
2727
CreatePowerShell();
2828
}
2929

@@ -33,13 +33,13 @@ private void PowerShellOnInvocationStateChanged(object sender, PSInvocationState
3333
{
3434
case PSInvocationState.Stopped:
3535
ReleasePowerShell();
36-
m_pool.ReportStopped(this);
36+
_pool.ReportStopped(this);
3737
break;
3838
case PSInvocationState.Completed:
3939
case PSInvocationState.Failed:
4040
ReleasePowerShell();
4141
CreatePowerShell();
42-
m_pool.ReportAvailable(this);
42+
_pool.ReportAvailable(this);
4343
break;
4444
}
4545
}
@@ -49,18 +49,18 @@ private void CreatePowerShell()
4949
var powerShell = PowerShell.Create();
5050
HookStreamEvents(powerShell.Streams);
5151
powerShell.InvocationStateChanged += PowerShellOnInvocationStateChanged;
52-
m_powerShell = powerShell;
53-
m_output = new PSDataCollection<PSObject>();
54-
m_output.DataAdded += OutputOnDataAdded;
52+
_powerShell = powerShell;
53+
_output = new PSDataCollection<PSObject>();
54+
_output.DataAdded += OutputOnDataAdded;
5555
}
5656

5757
private void ReleasePowerShell()
5858
{
59-
UnhookStreamEvents(m_powerShell.Streams);
60-
m_powerShell.InvocationStateChanged -= PowerShellOnInvocationStateChanged;
61-
m_output.DataAdded -= OutputOnDataAdded;
62-
m_powerShell.Dispose();
63-
m_powerShell = null;
59+
UnhookStreamEvents(_powerShell.Streams);
60+
_powerShell.InvocationStateChanged -= PowerShellOnInvocationStateChanged;
61+
_output.DataAdded -= OutputOnDataAdded;
62+
_powerShell.Dispose();
63+
_powerShell = null;
6464
}
6565

6666

@@ -88,92 +88,92 @@ private void UnhookStreamEvents(PSDataStreams streams)
8888

8989
public void BeginInvoke(ScriptBlock scriptblock, PSObject inputObject)
9090
{
91-
m_percentComplete = 0;
91+
_percentComplete = 0;
9292
string command = $"param($_,$PSItem, $PSPArallelIndex,$PSParallelProgressId){scriptblock}";
93-
m_powerShell.AddScript(command)
93+
_powerShell.AddScript(command)
9494
.AddParameter("_", inputObject)
9595
.AddParameter("PSItem", inputObject)
96-
.AddParameter("PSParallelIndex", m_index)
97-
.AddParameter("PSParallelProgressId", m_index+1000);
98-
m_powerShell.BeginInvoke(m_input, m_output);
96+
.AddParameter("PSParallelIndex", _index)
97+
.AddParameter("PSParallelProgressId", _index+1000);
98+
_powerShell.BeginInvoke(_input, _output);
9999
}
100100

101101
public void Dispose()
102102
{
103-
var ps = m_powerShell;
103+
var ps = _powerShell;
104104
if (ps != null)
105105
{
106106
UnhookStreamEvents(ps.Streams);
107107
ps.Dispose();
108108
}
109-
m_output.Dispose();
110-
m_input.Dispose();
109+
_output.Dispose();
110+
_input.Dispose();
111111
}
112112

113113
private void OutputOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
114114
{
115115
var item = ((PSDataCollection<PSObject>)sender)[dataAddedEventArgs.Index];
116-
m_poolStreams.Output.Add(item);
116+
_poolStreams.Output.Add(item);
117117
}
118118

119119

120120
private void InformationOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
121121
{
122122
var ir = ((PSDataCollection<InformationRecord>)sender)[dataAddedEventArgs.Index];
123-
m_poolStreams.Information.Add(ir);
123+
_poolStreams.Information.Add(ir);
124124
}
125125

126126
private void ProgressOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
127127
{
128128
var record = ((PSDataCollection<ProgressRecord>)sender)[dataAddedEventArgs.Index];
129-
var change = record.PercentComplete - m_percentComplete;
130-
m_percentComplete = record.PercentComplete;
131-
m_poolStreams.Progress.Add(record);
132-
m_pool.AddProgressChange(change);
129+
var change = record.PercentComplete - _percentComplete;
130+
_percentComplete = record.PercentComplete;
131+
_poolStreams.Progress.Add(record);
132+
_pool.AddProgressChange(change);
133133
}
134134

135135
private void ErrorOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
136136
{
137137
var record = ((PSDataCollection<ErrorRecord>)sender)[dataAddedEventArgs.Index];
138-
m_poolStreams.Error.Add(record);
138+
_poolStreams.Error.Add(record);
139139
}
140140

141141
private void DebugOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
142142
{
143143
var record = ((PSDataCollection<DebugRecord>)sender)[dataAddedEventArgs.Index];
144-
m_poolStreams.Debug.Add(record);
144+
_poolStreams.Debug.Add(record);
145145
}
146146

147147
private void WarningOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
148148
{
149149
var record = ((PSDataCollection<WarningRecord>)sender)[dataAddedEventArgs.Index];
150-
m_poolStreams.Warning.Add(record);
150+
_poolStreams.Warning.Add(record);
151151
}
152152

153153
private void VerboseOnDataAdded(object sender, DataAddedEventArgs dataAddedEventArgs)
154154
{
155155
var record = ((PSDataCollection<VerboseRecord>)sender)[dataAddedEventArgs.Index];
156-
m_poolStreams.Verbose.Add(record);
156+
_poolStreams.Verbose.Add(record);
157157
}
158158

159159
public void Stop()
160160
{
161-
if(m_powerShell.InvocationStateInfo.State != PSInvocationState.Stopped)
161+
if(_powerShell.InvocationStateInfo.State != PSInvocationState.Stopped)
162162
{
163-
UnhookStreamEvents(m_powerShell.Streams);
164-
m_powerShell.BeginStop(OnStopped, null);
163+
UnhookStreamEvents(_powerShell.Streams);
164+
_powerShell.BeginStop(OnStopped, null);
165165
}
166166
}
167167

168168
private void OnStopped(IAsyncResult ar)
169169
{
170-
var ps = m_powerShell;
170+
var ps = _powerShell;
171171
if (ps == null)
172172
{
173173
return;
174174
}
175175
ps.EndStop(ar);
176-
m_powerShell = null;
176+
_powerShell = null;
177177
}
178178
}
179179
}

0 commit comments

Comments
 (0)