diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-07-05 01:08:00 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-07-05 01:08:00 -0700 |
| commit | 298f8065857630e414d84e4ee785a6d17e5f99bb (patch) | |
| tree | 8880a092ab59850a6f821ba892f3904ab464431c /html/003trace.cc.html | |
| parent | f28f2636c6707e1a33bebacafd0486f4965978ea (diff) | |
| download | mu-298f8065857630e414d84e4ee785a6d17e5f99bb.tar.gz | |
3102
Diffstat (limited to 'html/003trace.cc.html')
| -rw-r--r-- | html/003trace.cc.html | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/html/003trace.cc.html b/html/003trace.cc.html index 71d2844d..13cba511 100644 --- a/html/003trace.cc.html +++ b/html/003trace.cc.html @@ -214,22 +214,19 @@ ostream& <span class="Normal">operator</span><<<span class="Delimiter" <span class="PreProc">#define DUMP(label) </span><span class="Normal">if</span><span class="PreProc"> (Trace_stream) cerr << Trace_stream</span><span class="Delimiter">-></span><span class="PreProc">readable_contents(label)</span><span class="Delimiter">;</span> -<span class="Comment">// All scenarios save their traces in the repo, just like code. This gives</span> -<span class="Comment">// future readers more meat when they try to make sense of a new project.</span> -<span class="Normal">static</span> string Trace_dir = <span class="Constant">".traces/"</span><span class="Delimiter">;</span> -string Trace_file<span class="Delimiter">;</span> +<span class="Normal">bool</span> Save_trace = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span> <span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span> lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span> ~lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// in case tests close Trace_stream</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_file<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> - ofstream fout<span class="Delimiter">((</span>Trace_dir+Trace_file<span class="Delimiter">).</span>c_str<span class="Delimiter">());</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span> + ofstream fout<span class="Delimiter">(</span><span class="Constant">"last_trace"</span><span class="Delimiter">);</span> fout << Trace_stream<span class="Delimiter">-></span>readable_contents<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span class="Delimiter">}</span> - <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">,</span> Trace_file = <span class="Constant">""</span><span class="Delimiter">;</span> + <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Delimiter">};</span> @@ -251,12 +248,8 @@ START_TRACING_UNTIL_END_OF_SCOPE string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span> split_label_contents<span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> - <span class="Identifier">continue</span><span class="Delimiter">;</span> - - <span class="Normal">if</span> <span class="Delimiter">(</span>contents != trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> - <span class="Identifier">continue</span><span class="Delimiter">;</span> - + <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>contents != trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> ++curr_expected_line<span class="Delimiter">;</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < SIZE<span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> ++curr_expected_line<span class="Delimiter">;</span> @@ -265,8 +258,14 @@ START_TRACING_UNTIL_END_OF_SCOPE <span class="Delimiter">}</span> ++Num_failures<span class="Delimiter">;</span> - cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << contents << <span class="Constant">"] in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> - DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>line_exists_anywhere<span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span> + cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): line ["</span> << label << <span class="Constant">": "</span> << contents << <span class="Constant">"] out of order in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> + DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> + <span class="Delimiter">}</span> + <span class="Normal">else</span> <span class="Delimiter">{</span> + cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << contents << <span class="Constant">"] in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> + DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span> + <span class="Delimiter">}</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -284,6 +283,14 @@ START_TRACING_UNTIL_END_OF_SCOPE <span class="Delimiter">}</span> <span class="Delimiter">}</span> +<span class="Normal">bool</span> line_exists_anywhere<span class="Delimiter">(</span><span class="Normal">const</span> string& label<span class="Delimiter">,</span> <span class="Normal">const</span> string& contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> + <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>contents == trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> + <span class="Delimiter">}</span> + <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> +<span class="Delimiter">}</span> + ^L <span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -373,27 +380,25 @@ string trim<span class="Delimiter">(</span><span class="Normal">const</span> str <span class="Delimiter">}</span> <span class="Delimiter">:(before "End Includes")</span> -<span class="PreProc">#include</span><span class="Constant"><vector></span> +<span class="PreProc">#include </span><span class="Constant"><vector></span> <span class="Normal">using</span> std::vector<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant"><list></span> +<span class="PreProc">#include </span><span class="Constant"><list></span> <span class="Normal">using</span> std::list<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant"><map></span> +<span class="PreProc">#include </span><span class="Constant"><map></span> <span class="Normal">using</span> std::map<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant"><set></span> +<span class="PreProc">#include </span><span class="Constant"><set></span> <span class="Normal">using</span> std::set<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant"><algorithm></span> +<span class="PreProc">#include </span><span class="Constant"><algorithm></span> -<span class="PreProc">#include</span><span class="Constant"><sstream></span> +<span class="PreProc">#include </span><span class="Constant"><sstream></span> <span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span> <span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant"><fstream></span> +<span class="PreProc">#include </span><span class="Constant"><fstream></span> <span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span> <span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span> -<span class="PreProc">#include</span><span class="Constant">"termbox/termbox.h"</span> - -<span class="PreProc">#define unused __attribute__((unused))</span> +<span class="PreProc">#include </span><span class="Constant">"termbox/termbox.h"</span> <span class="Delimiter">:(before "End Globals")</span> <span class="Comment">//: In future layers we'll use the depth field as follows:</span> |