153 lines
72 KiB
HTML
153 lines
72 KiB
HTML
|
<!DOCTYPE html>
|
||
|
|
<html lang="en" dir="ltr"
|
||
|
|
xmlns:dc="http://purl.org/dc/terms/">
|
||
|
|
<head>
|
||
|
|
<meta charset="utf-8" />
|
||
|
|
<meta name="generator" content="diff2html.py (http://git.droids-corp.org/gitweb/?p=diff2html)" />
|
||
|
|
<!--meta name="author" content="Fill in" /-->
|
||
|
|
<title>HTML Diff spawn/parallel_grep.cpp</title>
|
||
|
|
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAACVBMVEXAAAAAgAD///+K/HwIAAAAJUlEQVQI12NYBQQM2IgGBQ4mCIEQW7oyK4phampkGIQAc1G1AQCRxCNbyW92oQAAAABJRU5ErkJggg==" type="image/png" />
|
||
|
|
<meta property="dc:language" content="en" />
|
||
|
|
<!--meta property="dc:date" content="" /-->
|
||
|
|
<meta property="dc:modified" content="2023-04-26T20:13:18.827078+01:00" />
|
||
|
|
<meta name="description" content="File comparison" />
|
||
|
|
<meta property="dc:abstract" content="File comparison" />
|
||
|
|
<style>
|
||
|
|
table { border:0px; border-collapse:collapse; width: 100%; font-size:0.75em; font-family: Lucida Console, monospace }
|
||
|
|
td.line { color:#8080a0 }
|
||
|
|
th { background: black; color: white }
|
||
|
|
tr.diffunmodified td { background: #D0D0E0 }
|
||
|
|
tr.diffhunk td { background: #A0A0A0 }
|
||
|
|
tr.diffadded td { background: #CCFFCC }
|
||
|
|
tr.diffdeleted td { background: #FFCCCC }
|
||
|
|
tr.diffchanged td { background: #FFFFA0 }
|
||
|
|
span.diffchanged2 { background: #E0C880 }
|
||
|
|
span.diffponct { color: #B08080 }
|
||
|
|
tr.diffmisc td {}
|
||
|
|
tr.diffseparator td {}
|
||
|
|
</style>
|
||
|
|
</head>
|
||
|
|
<body>
|
||
|
|
|
||
|
|
<table class="diff">
|
||
|
|
<tr><th colspan='2'>src/​examples/​cpp03/​spawn/​parallel_grep.​cpp</th><th colspan='2'>src/​examples/​cpp11/​spawn/​parallel_grep.​cpp</th></tr>
|
||
|
|
<tr class="diffhunk"><td colspan="2">⋮</td><td colspan="2">⋮</td></tr><tr class="diffunmodified"><td class="diffline">1 </td><td class="diffpresent">/​/​</td><td class="diffline">1 </td><td class="diffpresent">/​/​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">2 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​parallel_grep.​cpp</td><td class="diffline">2 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​parallel_grep.​cpp</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">3 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​~~~~~~~~~~~~~~~~~</td><td class="diffline">3 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​~~~~~~~~~~~~~~~~~</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">4 </td><td class="diffpresent">/​/​</td><td class="diffline">4 </td><td class="diffpresent">/​/​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">5 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Copyright<span class="diffponct">·</span>​(c)​<span class="diffponct">·</span>​2003-​2023<span class="diffponct">·</span>​Christopher<span class="diffponct">·</span>​M.​<span class="diffponct">·</span>​Kohlhoff<span class="diffponct">·</span>​(chris<span class="diffponct">·</span>​at<span class="diffponct">·</span>​kohlhoff<span class="diffponct">·</span>​dot<span class="diffponct">·</span>​com)​</td><td class="diffline">5 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Copyright<span class="diffponct">·</span>​(c)​<span class="diffponct">·</span>​2003-​2023<span class="diffponct">·</span>​Christopher<span class="diffponct">·</span>​M.​<span class="diffponct">·</span>​Kohlhoff<span class="diffponct">·</span>​(chris<span class="diffponct">·</span>​at<span class="diffponct">·</span>​kohlhoff<span class="diffponct">·</span>​dot<span class="diffponct">·</span>​com)​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">6 </td><td class="diffpresent">/​/​</td><td class="diffline">6 </td><td class="diffpresent">/​/​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">7 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Distributed<span class="diffponct">·</span>​under<span class="diffponct">·</span>​the<span class="diffponct">·</span>​Boost<span class="diffponct">·</span>​Software<span class="diffponct">·</span>​License,​<span class="diffponct">·</span>​Version<span class="diffponct">·</span>​1.​0.​<span class="diffponct">·</span>​(See<span class="diffponct">·</span>​accompanying</td><td class="diffline">7 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Distributed<span class="diffponct">·</span>​under<span class="diffponct">·</span>​the<span class="diffponct">·</span>​Boost<span class="diffponct">·</span>​Software<span class="diffponct">·</span>​License,​<span class="diffponct">·</span>​Version<span class="diffponct">·</span>​1.​0.​<span class="diffponct">·</span>​(See<span class="diffponct">·</span>​accompanying</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">8 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​file<span class="diffponct">·</span>​LICENSE_1_0.​txt<span class="diffponct">·</span>​or<span class="diffponct">·</span>​copy<span class="diffponct">·</span>​at<span class="diffponct">·</span>​http:​/​/​www.​boost.​org/​LICENSE_1_0.​txt)​</td><td class="diffline">8 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​file<span class="diffponct">·</span>​LICENSE_1_0.​txt<span class="diffponct">·</span>​or<span class="diffponct">·</span>​copy<span class="diffponct">·</span>​at<span class="diffponct">·</span>​http:​/​/​www.​boost.​org/​LICENSE_1_0.​txt)​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">9 </td><td class="diffpresent">/​/​</td><td class="diffline">9 </td><td class="diffpresent">/​/​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">10 </td><td class="diffpresent"></td><td class="diffline">10 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">11 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​detached.​hpp></td><td class="diffline">11 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​detached.​hpp></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">12 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​dispatch.​hpp></td><td class="diffline">12 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​dispatch.​hpp></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">13 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​post.​hpp></td><td class="diffline">13 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​post.​hpp></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">14 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​spawn.​hpp></td><td class="diffline">14 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​spawn.​hpp></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">15 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​strand.​hpp></td><td class="diffline">15 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​strand.​hpp></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">16 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​thread_pool.​hpp></td><td class="diffline">16 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<asio/​thread_pool.​hpp></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">17 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<boost/​bind/​bind.​hpp></td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">18 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<fstream></td><td class="diffline">17 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<fstream></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">19 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<iostream></td><td class="diffline">18 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<iostream></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">20 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<string></td><td class="diffline">19 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<string></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">21 </td><td class="diffpresent"></td><td class="diffline">20 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffchanged"><td class="diffline">22 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​detached<span class="diffchanged2">_</span><span class="diffchanged2">t</span>;​</td><td class="diffline">21 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​detached;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">23 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​dispatch;​</td><td class="diffline">22 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​dispatch;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">24 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​spawn;​</td><td class="diffline">23 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​spawn;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">25 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​strand;​</td><td class="diffline">24 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​strand;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">26 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​thread_pool;​</td><td class="diffline">25 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​thread_pool;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">27 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​yield_context;​</td><td class="diffline">26 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​yield_context;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">28 </td><td class="diffpresent"></td><td class="diffline">27 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">29 </td><td class="diffpresent">void<span class="diffponct">·</span>​print_match(std:​:​string<span class="diffponct">·</span>​input_file,​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​line)​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">30 </td><td class="diffpresent">{</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">31 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cout<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​input_file<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​':​'<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​line<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​std:​:​endl;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">32 </td><td class="diffpresent">}</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">33 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">34 </td><td class="diffpresent">void<span class="diffponct">·</span>​search_file(std:​:​string<span class="diffponct">·</span>​search_string,​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​input_file,​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">35 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​strand<thread_pool:​:​executor_type><span class="diffponct">·</span>​output_strand,​<span class="diffponct">·</span>​yield_context<span class="diffponct">·</span>​yield)​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">36 </td><td class="diffpresent">{</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">37 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​ifstream<span class="diffponct">·</span>​is(input_file.​c_str()​)​;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">38 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​line;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">39 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​size_t<span class="diffponct">·</span>​line_num<span class="diffponct">·</span>​=<span class="diffponct">·</span>​0;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">40 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​while<span class="diffponct">·</span>​(std:​:​getline(is,​<span class="diffponct">·</span>​line)​)​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">41 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">42 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​If<span class="diffponct">·</span>​we<span class="diffponct">·</span>​find<span class="diffponct">·</span>​a<span class="diffponct">·</span>​match,​<span class="diffponct">·</span>​send<span class="diffponct">·</span>​a<span class="diffponct">·</span>​message<span class="diffponct">·</span>​to<span class="diffponct">·</span>​the<span class="diffponct">·</span>​output.​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">43 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(line.​find(search_string)​<span class="diffponct">·</span>​!=<span class="diffponct">·</span>​std:​:​string:​:​npos)​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">44 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">45 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​dispatch(output_stran​d,​<span class="diffponct">·</span>​boost:​:​bind(&print_match,​<span class="diffponct">·</span>​input_file,​<span class="diffponct">·</span>​line)​)​;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">46 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">47 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">48 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Every<span class="diffponct">·</span>​so<span class="diffponct">·</span>​often<span class="diffponct">·</span>​we<span class="diffponct">·</span>​yield<span class="diffponct">·</span>​control<span class="diffponct">·</span>​to<span class="diffponct">·</span>​another<span class="diffponct">·</span>​coroutine.​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">49 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(++line_num<span class="diffponct">·</span>​%<span class="diffponct">·</span>​10<span class="diffponct">·</span>​==<span class="diffponct">·</span>​0)​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">50 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​post(yield)​;​</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">51 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">52 </td><td class="diffpresent">}</td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffdeleted"><td class="diffline">53 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">54 </td><td class="diffpresent">int<span class="diffponct">·</span>​main(int<span class="diffponct">·</span>​argc,​<span class="diffponct">·</span>​char*<span class="diffponct">·</span>​argv[])​</td><td class="diffline">28 </td><td class="diffpresent">int<span class="diffponct">·</span>​main(int<span class="diffponct">·</span>​argc,​<span class="diffponct">·</span>​char*<span class="diffponct">·</span>​argv[])​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">55 </td><td class="diffpresent">{</td><td class="diffline">29 </td><td class="diffpresent">{</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">56 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​try</td><td class="diffline">30 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​try</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">57 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">31 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">58 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(argc<span class="diffponct">·</span>​<<span class="diffponct">·</span>​2)​</td><td class="diffline">32 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(argc<span class="diffponct">·</span>​<<span class="diffponct">·</span>​2)​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">59 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">33 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">60 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Usage:​<span class="diffponct">·</span>​parallel_grep<span class="diffponct">·</span>​<string><span class="diffponct">·</span>​<files.​.​.​>\n";​</td><td class="diffline">34 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Usage:​<span class="diffponct">·</span>​parallel_grep<span class="diffponct">·</span>​<string><span class="diffponct">·</span>​<files.​.​.​>\n";​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">61 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​1;​</td><td class="diffline">35 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​1;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">62 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">36 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">63 </td><td class="diffpresent"></td><td class="diffline">37 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">64 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​We<span class="diffponct">·</span>​use<span class="diffponct">·</span>​a<span class="diffponct">·</span>​fixed<span class="diffponct">·</span>​size<span class="diffponct">·</span>​pool<span class="diffponct">·</span>​of<span class="diffponct">·</span>​threads<span class="diffponct">·</span>​for<span class="diffponct">·</span>​reading<span class="diffponct">·</span>​the<span class="diffponct">·</span>​input<span class="diffponct">·</span>​files.​<span class="diffponct">·</span>​The</td><td class="diffline">38 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​We<span class="diffponct">·</span>​use<span class="diffponct">·</span>​a<span class="diffponct">·</span>​fixed<span class="diffponct">·</span>​size<span class="diffponct">·</span>​pool<span class="diffponct">·</span>​of<span class="diffponct">·</span>​threads<span class="diffponct">·</span>​for<span class="diffponct">·</span>​reading<span class="diffponct">·</span>​the<span class="diffponct">·</span>​input<span class="diffponct">·</span>​files.​<span class="diffponct">·</span>​The</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">65 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​number<span class="diffponct">·</span>​of<span class="diffponct">·</span>​threads<span class="diffponct">·</span>​is<span class="diffponct">·</span>​automatically<span class="diffponct">·</span>​determined<span class="diffponct">·</span>​based<span class="diffponct">·</span>​on<span class="diffponct">·</span>​the<span class="diffponct">·</span>​number<span class="diffponct">·</span>​of</td><td class="diffline">39 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​number<span class="diffponct">·</span>​of<span class="diffponct">·</span>​threads<span class="diffponct">·</span>​is<span class="diffponct">·</span>​automatically<span class="diffponct">·</span>​determined<span class="diffponct">·</span>​based<span class="diffponct">·</span>​on<span class="diffponct">·</span>​the<span class="diffponct">·</span>​number<span class="diffponct">·</span>​of</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">66 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​CPUs<span class="diffponct">·</span>​available<span class="diffponct">·</span>​in<span class="diffponct">·</span>​the<span class="diffponct">·</span>​system.​</td><td class="diffline">40 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​CPUs<span class="diffponct">·</span>​available<span class="diffponct">·</span>​in<span class="diffponct">·</span>​the<span class="diffponct">·</span>​system.​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">67 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​thread_pool<span class="diffponct">·</span>​pool;​</td><td class="diffline">41 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​thread_pool<span class="diffponct">·</span>​pool;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">68 </td><td class="diffpresent"></td><td class="diffline">42 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">69 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​To<span class="diffponct">·</span>​prevent<span class="diffponct">·</span>​the<span class="diffponct">·</span>​output<span class="diffponct">·</span>​from<span class="diffponct">·</span>​being<span class="diffponct">·</span>​garbled,​<span class="diffponct">·</span>​we<span class="diffponct">·</span>​use<span class="diffponct">·</span>​a<span class="diffponct">·</span>​strand<span class="diffponct">·</span>​to<span class="diffponct">·</span>​synchronise</td><td class="diffline">43 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​To<span class="diffponct">·</span>​prevent<span class="diffponct">·</span>​the<span class="diffponct">·</span>​output<span class="diffponct">·</span>​from<span class="diffponct">·</span>​being<span class="diffponct">·</span>​garbled,​<span class="diffponct">·</span>​we<span class="diffponct">·</span>​use<span class="diffponct">·</span>​a<span class="diffponct">·</span>​strand<span class="diffponct">·</span>​to<span class="diffponct">·</span>​synchronise</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">70 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​printing.​</td><td class="diffline">44 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​printing.​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">71 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​strand<thread_pool:​:​executor_type><span class="diffponct">·</span>​output_strand(pool.​get_executor()​)​;​</td><td class="diffline">45 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​strand<thread_pool:​:​executor_type><span class="diffponct">·</span>​output_strand(pool.​get_executor()​)​;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">72 </td><td class="diffpresent"></td><td class="diffline">46 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">73 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Spawn<span class="diffponct">·</span>​a<span class="diffponct">·</span>​new<span class="diffponct">·</span>​coroutine<span class="diffponct">·</span>​for<span class="diffponct">·</span>​each<span class="diffponct">·</span>​file<span class="diffponct">·</span>​specified<span class="diffponct">·</span>​on<span class="diffponct">·</span>​the<span class="diffponct">·</span>​command<span class="diffponct">·</span>​line.​</td><td class="diffline">47 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Spawn<span class="diffponct">·</span>​a<span class="diffponct">·</span>​new<span class="diffponct">·</span>​coroutine<span class="diffponct">·</span>​for<span class="diffponct">·</span>​each<span class="diffponct">·</span>​file<span class="diffponct">·</span>​specified<span class="diffponct">·</span>​on<span class="diffponct">·</span>​the<span class="diffponct">·</span>​command<span class="diffponct">·</span>​line.​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">74 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​search_string<span class="diffponct">·</span>​=<span class="diffponct">·</span>​argv[1];​</td><td class="diffline">48 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​search_string<span class="diffponct">·</span>​=<span class="diffponct">·</span>​argv[1];​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">75 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffponct">·</span>​(int<span class="diffponct">·</span>​argn<span class="diffponct">·</span>​=<span class="diffponct">·</span>​2;​<span class="diffponct">·</span>​argn<span class="diffponct">·</span>​<<span class="diffponct">·</span>​argc;​<span class="diffponct">·</span>​++argn)​</td><td class="diffline">49 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffponct">·</span>​(int<span class="diffponct">·</span>​argn<span class="diffponct">·</span>​=<span class="diffponct">·</span>​2;​<span class="diffponct">·</span>​argn<span class="diffponct">·</span>​<<span class="diffponct">·</span>​argc;​<span class="diffponct">·</span>​++argn)​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">76 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">50 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">77 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​input_file<span class="diffponct">·</span>​=<span class="diffponct">·</span>​argv[argn];​</td><td class="diffline">51 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​input_file<span class="diffponct">·</span>​=<span class="diffponct">·</span>​argv[argn];​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">78 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​spawn(pool,​</td><td class="diffline">52 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​spawn(pool,​</td></tr>
|
||
|
|
<tr class="diffchanged"><td class="diffline">79 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span>(<span class="diffchanged2">&</span><span class="diffchanged2">s</span>e<span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span>_<span class="diffchanged2">f</span><span class="diffchanged2">i</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span>e<span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">,​</span></td><td class="diffline">53 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">[</span><span class="diffchanged2">=</span><span class="diffchanged2">]</span>(<span class="diffchanged2">y</span><span class="diffchanged2">i</span>e<span class="diffchanged2">l</span><span class="diffchanged2">d</span>_<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span>e<span class="diffchanged2">x</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">y</span><span class="diffchanged2">i</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">)​</span></td></tr>
|
||
|
|
<tr class="diffchanged"><td class="diffline">80 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">p</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">i</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">o</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">p</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">_</span><span class="diffchanged2">1</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span></td><td class="diffline">54 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
||
|
|
<tr class="diffchanged"><td class="diffline">81 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​det<span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span>e<span class="diffchanged2">d</span>_t()​)​;​</td><td class="diffline">55 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span>d<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span>e<span class="diffchanged2">a</span><span class="diffchanged2">m</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">p</span><span class="diffchanged2">u</span>t<span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">i</span><span class="diffchanged2">l</span>e<span class="diffchanged2">.​</span><span class="diffchanged2">c</span>_<span class="diffchanged2">s</span>t<span class="diffchanged2">r</span>()​)​;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">56 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​string<span class="diffponct">·</span>​line;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">57 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​size_t<span class="diffponct">·</span>​line_num<span class="diffponct">·</span>​=<span class="diffponct">·</span>​0;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">58 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​while<span class="diffponct">·</span>​(std:​:​getline(is,​<span class="diffponct">·</span>​line)​)​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">59 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">60 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​If<span class="diffponct">·</span>​we<span class="diffponct">·</span>​find<span class="diffponct">·</span>​a<span class="diffponct">·</span>​match,​<span class="diffponct">·</span>​send<span class="diffponct">·</span>​a<span class="diffponct">·</span>​message<span class="diffponct">·</span>​to<span class="diffponct">·</span>​the<span class="diffponct">·</span>​output.​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">61 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(line.​find(search_string)​<span class="diffponct">·</span>​!=<span class="diffponct">·</span>​std:​:​string:​:​npos)​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">62 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">63 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​dispatch(output_stran​d,​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">64 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​[=]</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">65 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">66 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cout<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​input_file<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​':​'<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​line<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​std:​:​endl;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">67 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​})​;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">68 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">69 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">70 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Every<span class="diffponct">·</span>​so<span class="diffponct">·</span>​often<span class="diffponct">·</span>​we<span class="diffponct">·</span>​yield<span class="diffponct">·</span>​control<span class="diffponct">·</span>​to<span class="diffponct">·</span>​another<span class="diffponct">·</span>​coroutine.​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">71 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(++line_num<span class="diffponct">·</span>​%<span class="diffponct">·</span>​10<span class="diffponct">·</span>​==<span class="diffponct">·</span>​0)​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">72 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​post(yield)​;​</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">73 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">74 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​},​<span class="diffponct">·</span>​detached)​;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">82 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">75 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">83 </td><td class="diffpresent"></td><td class="diffline">76 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">84 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Join<span class="diffponct">·</span>​the<span class="diffponct">·</span>​thread<span class="diffponct">·</span>​pool<span class="diffponct">·</span>​to<span class="diffponct">·</span>​wait<span class="diffponct">·</span>​for<span class="diffponct">·</span>​all<span class="diffponct">·</span>​the<span class="diffponct">·</span>​spawned<span class="diffponct">·</span>​tasks<span class="diffponct">·</span>​to<span class="diffponct">·</span>​complete.​</td><td class="diffline">77 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​/​/​<span class="diffponct">·</span>​Join<span class="diffponct">·</span>​the<span class="diffponct">·</span>​thread<span class="diffponct">·</span>​pool<span class="diffponct">·</span>​to<span class="diffponct">·</span>​wait<span class="diffponct">·</span>​for<span class="diffponct">·</span>​all<span class="diffponct">·</span>​the<span class="diffponct">·</span>​spawned<span class="diffponct">·</span>​tasks<span class="diffponct">·</span>​to<span class="diffponct">·</span>​complete.​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">85 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​pool.​join()​;​</td><td class="diffline">78 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​pool.​join()​;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">86 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">79 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">87 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​catch<span class="diffponct">·</span>​(std:​:​exception&<span class="diffponct">·</span>​e)​</td><td class="diffline">80 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​catch<span class="diffponct">·</span>​(std:​:​exception&<span class="diffponct">·</span>​e)​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">88 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">81 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">89 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Exception:​<span class="diffponct">·</span>​"<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​e.​what()​<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"\n";​</td><td class="diffline">82 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Exception:​<span class="diffponct">·</span>​"<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​e.​what()​<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"\n";​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">90 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">83 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">91 </td><td class="diffpresent"></td><td class="diffline">84 </td><td class="diffpresent"></td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">92 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​0;​</td><td class="diffline">85 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​0;​</td></tr>
|
||
|
|
<tr class="diffunmodified"><td class="diffline">93 </td><td class="diffpresent">}</td><td class="diffline">86 </td><td class="diffpresent">}</td></tr>
|
||
|
|
|
||
|
|
</table>
|
||
|
|
|
||
|
|
<footer>
|
||
|
|
<p>Modified at 26.04.2023. HTML formatting created by <a href="http://git.droids-corp.org/gitweb/?p=diff2html;a=summary">diff2html</a>. </p>
|
||
|
|
</footer>
|
||
|
|
</body></html>
|