|
22 | 22 | <tr id="projectrow">
|
23 | 23 | <td id="projectlogo"><img alt="Logo" src="heartbeat.png"/></td>
|
24 | 24 | <td id="projectalign">
|
25 |
| - <div id="projectname">DSPatch<span id="projectnumber"> v.11.1.3</span> |
| 25 | + <div id="projectname">DSPatch<span id="projectnumber"> v.11.2.0</span> |
26 | 26 | </div>
|
27 | 27 | </td>
|
28 | 28 | </tr>
|
|
151 | 151 | <div class="line"><a id="l00093" name="l00093"></a><span class="lineno"> 93</span> <span class="keywordtype">void</span> SetBufferCount( <span class="keywordtype">int</span> bufferCount, <span class="keywordtype">int</span> startBuffer );</div>
|
152 | 152 | <div class="line"><a id="l00094" name="l00094"></a><span class="lineno"> 94</span> <span class="keywordtype">int</span> GetBufferCount() <span class="keyword">const</span>;</div>
|
153 | 153 | <div class="line"><a id="l00095" name="l00095"></a><span class="lineno"> 95</span> </div>
|
154 |
| -<div class="line"><a id="l00096" name="l00096"></a><span class="lineno"> 96</span> <span class="keywordtype">void</span> TickSeries( <span class="keywordtype">int</span> bufferNo );</div> |
| 154 | +<div class="line"><a id="l00096" name="l00096"></a><span class="lineno"> 96</span> <span class="keywordtype">void</span> Tick( <span class="keywordtype">int</span> bufferNo );</div> |
155 | 155 | <div class="line"><a id="l00097" name="l00097"></a><span class="lineno"> 97</span> <span class="keywordtype">void</span> TickParallel( <span class="keywordtype">int</span> bufferNo );</div>
|
156 | 156 | <div class="line"><a id="l00098" name="l00098"></a><span class="lineno"> 98</span> </div>
|
157 |
| -<div class="line"><a id="l00099" name="l00099"></a><span class="lineno"> 99</span> <span class="keywordtype">void</span> ScanSeries( std::vector<Component*>& components );</div> |
| 157 | +<div class="line"><a id="l00099" name="l00099"></a><span class="lineno"> 99</span> <span class="keywordtype">void</span> Scan( std::vector<Component*>& components );</div> |
158 | 158 | <div class="line"><a id="l00100" name="l00100"></a><span class="lineno"> 100</span> <span class="keywordtype">void</span> ScanParallel( std::vector<std::vector<DSPatch::Component*>>& componentsMap, <span class="keywordtype">int</span>& scanPosition );</div>
|
159 | 159 | <div class="line"><a id="l00101" name="l00101"></a><span class="lineno"> 101</span> <span class="keywordtype">void</span> EndScan();</div>
|
160 | 160 | <div class="line"><a id="l00102" name="l00102"></a><span class="lineno"> 102</span> </div>
|
|
213 | 213 | <div class="line"><a id="l00155" name="l00155"></a><span class="lineno"> 155</span> <span class="keywordtype">int</span> toInput;</div>
|
214 | 214 | <div class="line"><a id="l00156" name="l00156"></a><span class="lineno"> 156</span> };</div>
|
215 | 215 | <div class="line"><a id="l00157" name="l00157"></a><span class="lineno"> 157</span> </div>
|
216 |
| -<div class="line"><a id="l00158" name="l00158"></a><span class="lineno"> 158</span> <span class="keywordtype">void</span> _WaitForRelease( <span class="keywordtype">int</span> threadNo );</div> |
217 |
| -<div class="line"><a id="l00159" name="l00159"></a><span class="lineno"> 159</span> <span class="keywordtype">void</span> _ReleaseNextThread( <span class="keywordtype">int</span> threadNo );</div> |
| 216 | +<div class="line"><a id="l00158" name="l00158"></a><span class="lineno"> 158</span> <span class="keywordtype">void</span> _WaitForRelease( <span class="keywordtype">int</span> bufferNo );</div> |
| 217 | +<div class="line"><a id="l00159" name="l00159"></a><span class="lineno"> 159</span> <span class="keywordtype">void</span> _ReleaseNextBuffer( <span class="keywordtype">int</span> bufferNo );</div> |
218 | 218 | <div class="line"><a id="l00160" name="l00160"></a><span class="lineno"> 160</span> </div>
|
219 | 219 | <div class="line"><a id="l00161" name="l00161"></a><span class="lineno"> 161</span> <span class="keywordtype">void</span> _GetOutput( <span class="keywordtype">int</span> bufferNo, <span class="keywordtype">int</span> fromOutput, <span class="keywordtype">int</span> toInput, <a class="code hl_class" href="class_d_s_patch_1_1_signal_bus.html">DSPatch::SignalBus</a>& toBus );</div>
|
220 | 220 | <div class="line"><a id="l00162" name="l00162"></a><span class="lineno"> 162</span> <span class="keywordtype">void</span> _GetOutputParallel( <span class="keywordtype">int</span> bufferNo, <span class="keywordtype">int</span> fromOutput, <span class="keywordtype">int</span> toInput, <a class="code hl_class" href="class_d_s_patch_1_1_signal_bus.html">DSPatch::SignalBus</a>& toBus );</div>
|
|
414 | 414 | <div class="line"><a id="l00356" name="l00356"></a><span class="lineno"> 356</span> <span class="keywordflow">return</span> (<span class="keywordtype">int</span>)_inputBuses.size();</div>
|
415 | 415 | <div class="line"><a id="l00357" name="l00357"></a><span class="lineno"> 357</span>}</div>
|
416 | 416 | <div class="line"><a id="l00358" name="l00358"></a><span class="lineno"> 358</span> </div>
|
417 |
| -<div class="line"><a id="l00359" name="l00359"></a><span class="lineno"> 359</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::TickSeries( <span class="keywordtype">int</span> bufferNo )</div> |
| 417 | +<div class="line"><a id="l00359" name="l00359"></a><span class="lineno"> 359</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::Tick( <span class="keywordtype">int</span> bufferNo )</div> |
418 | 418 | <div class="line"><a id="l00360" name="l00360"></a><span class="lineno"> 360</span>{</div>
|
419 | 419 | <div class="line"><a id="l00361" name="l00361"></a><span class="lineno"> 361</span> <span class="keyword">auto</span>& inputBus = _inputBuses[bufferNo];</div>
|
420 | 420 | <div class="line"><a id="l00362" name="l00362"></a><span class="lineno"> 362</span> <span class="keyword">auto</span>& outputBus = _outputBuses[bufferNo];</div>
|
|
440 | 440 | <div class="line"><a id="l00382" name="l00382"></a><span class="lineno"> 382</span> Process_( inputBus, outputBus );</div>
|
441 | 441 | <div class="line"><a id="l00383" name="l00383"></a><span class="lineno"> 383</span> </div>
|
442 | 442 | <div class="line"><a id="l00384" name="l00384"></a><span class="lineno"> 384</span> <span class="comment">// signal that we're done processing</span></div>
|
443 |
| -<div class="line"><a id="l00385" name="l00385"></a><span class="lineno"> 385</span> _ReleaseNextThread( bufferNo );</div> |
| 443 | +<div class="line"><a id="l00385" name="l00385"></a><span class="lineno"> 385</span> _ReleaseNextBuffer( bufferNo );</div> |
444 | 444 | <div class="line"><a id="l00386" name="l00386"></a><span class="lineno"> 386</span> }</div>
|
445 | 445 | <div class="line"><a id="l00387" name="l00387"></a><span class="lineno"> 387</span> <span class="keywordflow">else</span></div>
|
446 | 446 | <div class="line"><a id="l00388" name="l00388"></a><span class="lineno"> 388</span> {</div>
|
|
473 | 473 | <div class="line"><a id="l00415" name="l00415"></a><span class="lineno"> 415</span> Process_( inputBus, outputBus );</div>
|
474 | 474 | <div class="line"><a id="l00416" name="l00416"></a><span class="lineno"> 416</span> </div>
|
475 | 475 | <div class="line"><a id="l00417" name="l00417"></a><span class="lineno"> 417</span> <span class="comment">// signal that we're done processing</span></div>
|
476 |
| -<div class="line"><a id="l00418" name="l00418"></a><span class="lineno"> 418</span> _ReleaseNextThread( bufferNo );</div> |
| 476 | +<div class="line"><a id="l00418" name="l00418"></a><span class="lineno"> 418</span> _ReleaseNextBuffer( bufferNo );</div> |
477 | 477 | <div class="line"><a id="l00419" name="l00419"></a><span class="lineno"> 419</span> }</div>
|
478 | 478 | <div class="line"><a id="l00420" name="l00420"></a><span class="lineno"> 420</span> <span class="keywordflow">else</span></div>
|
479 | 479 | <div class="line"><a id="l00421" name="l00421"></a><span class="lineno"> 421</span> {</div>
|
|
492 | 492 | <div class="line"><a id="l00434" name="l00434"></a><span class="lineno"> 434</span> }</div>
|
493 | 493 | <div class="line"><a id="l00435" name="l00435"></a><span class="lineno"> 435</span>}</div>
|
494 | 494 | <div class="line"><a id="l00436" name="l00436"></a><span class="lineno"> 436</span> </div>
|
495 |
| -<div class="line"><a id="l00437" name="l00437"></a><span class="lineno"> 437</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::ScanSeries( std::vector<Component*>& components )</div> |
| 495 | +<div class="line"><a id="l00437" name="l00437"></a><span class="lineno"> 437</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::Scan( std::vector<Component*>& components )</div> |
496 | 496 | <div class="line"><a id="l00438" name="l00438"></a><span class="lineno"> 438</span>{</div>
|
497 | 497 | <div class="line"><a id="l00439" name="l00439"></a><span class="lineno"> 439</span> <span class="comment">// continue only if this component has not already been scanned</span></div>
|
498 | 498 | <div class="line"><a id="l00440" name="l00440"></a><span class="lineno"> 440</span> <span class="keywordflow">if</span> ( _scanPosition != -1 )</div>
|
|
506 | 506 | <div class="line"><a id="l00448" name="l00448"></a><span class="lineno"> 448</span> <span class="keywordflow">for</span> ( <span class="keyword">const</span> <span class="keyword">auto</span>& wire : _inputWires )</div>
|
507 | 507 | <div class="line"><a id="l00449" name="l00449"></a><span class="lineno"> 449</span> {</div>
|
508 | 508 | <div class="line"><a id="l00450" name="l00450"></a><span class="lineno"> 450</span> <span class="comment">// scan incoming components</span></div>
|
509 |
| -<div class="line"><a id="l00451" name="l00451"></a><span class="lineno"> 451</span> wire.fromComponent->ScanSeries( components );</div> |
| 509 | +<div class="line"><a id="l00451" name="l00451"></a><span class="lineno"> 451</span> wire.fromComponent->Scan( components );</div> |
510 | 510 | <div class="line"><a id="l00452" name="l00452"></a><span class="lineno"> 452</span> }</div>
|
511 | 511 | <div class="line"><a id="l00453" name="l00453"></a><span class="lineno"> 453</span> </div>
|
512 | 512 | <div class="line"><a id="l00454" name="l00454"></a><span class="lineno"> 454</span> components.emplace_back( <span class="keyword">this</span> );</div>
|
|
577 | 577 | <div class="line"><a id="l00519" name="l00519"></a><span class="lineno"> 519</span> }</div>
|
578 | 578 | <div class="line"><a id="l00520" name="l00520"></a><span class="lineno"> 520</span>}</div>
|
579 | 579 | <div class="line"><a id="l00521" name="l00521"></a><span class="lineno"> 521</span> </div>
|
580 |
| -<div class="line"><a id="l00522" name="l00522"></a><span class="lineno"> 522</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::_WaitForRelease( <span class="keywordtype">int</span> threadNo )</div> |
| 580 | +<div class="line"><a id="l00522" name="l00522"></a><span class="lineno"> 522</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::_WaitForRelease( <span class="keywordtype">int</span> bufferNo )</div> |
581 | 581 | <div class="line"><a id="l00523" name="l00523"></a><span class="lineno"> 523</span>{</div>
|
582 |
| -<div class="line"><a id="l00524" name="l00524"></a><span class="lineno"> 524</span> _releaseFlags[threadNo].WaitAndClear();</div> |
| 582 | +<div class="line"><a id="l00524" name="l00524"></a><span class="lineno"> 524</span> _releaseFlags[bufferNo].WaitAndClear();</div> |
583 | 583 | <div class="line"><a id="l00525" name="l00525"></a><span class="lineno"> 525</span>}</div>
|
584 | 584 | <div class="line"><a id="l00526" name="l00526"></a><span class="lineno"> 526</span> </div>
|
585 |
| -<div class="line"><a id="l00527" name="l00527"></a><span class="lineno"> 527</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::_ReleaseNextThread( <span class="keywordtype">int</span> threadNo )</div> |
| 585 | +<div class="line"><a id="l00527" name="l00527"></a><span class="lineno"> 527</span><span class="keyword">inline</span> <span class="keywordtype">void</span> Component::_ReleaseNextBuffer( <span class="keywordtype">int</span> bufferNo )</div> |
586 | 586 | <div class="line"><a id="l00528" name="l00528"></a><span class="lineno"> 528</span>{</div>
|
587 |
| -<div class="line"><a id="l00529" name="l00529"></a><span class="lineno"> 529</span> <span class="keywordflow">if</span> ( ++threadNo == _bufferCount ) <span class="comment">// we're actually releasing the next available thread</span></div> |
| 587 | +<div class="line"><a id="l00529" name="l00529"></a><span class="lineno"> 529</span> <span class="keywordflow">if</span> ( ++bufferNo == _bufferCount ) <span class="comment">// release the next available buffer</span></div> |
588 | 588 | <div class="line"><a id="l00530" name="l00530"></a><span class="lineno"> 530</span> {</div>
|
589 | 589 | <div class="line"><a id="l00531" name="l00531"></a><span class="lineno"> 531</span> _releaseFlags[0].Set();</div>
|
590 | 590 | <div class="line"><a id="l00532" name="l00532"></a><span class="lineno"> 532</span> }</div>
|
591 | 591 | <div class="line"><a id="l00533" name="l00533"></a><span class="lineno"> 533</span> <span class="keywordflow">else</span></div>
|
592 | 592 | <div class="line"><a id="l00534" name="l00534"></a><span class="lineno"> 534</span> {</div>
|
593 |
| -<div class="line"><a id="l00535" name="l00535"></a><span class="lineno"> 535</span> _releaseFlags[threadNo].Set();</div> |
| 593 | +<div class="line"><a id="l00535" name="l00535"></a><span class="lineno"> 535</span> _releaseFlags[bufferNo].Set();</div> |
594 | 594 | <div class="line"><a id="l00536" name="l00536"></a><span class="lineno"> 536</span> }</div>
|
595 | 595 | <div class="line"><a id="l00537" name="l00537"></a><span class="lineno"> 537</span>}</div>
|
596 | 596 | <div class="line"><a id="l00538" name="l00538"></a><span class="lineno"> 538</span> </div>
|
|
0 commit comments