@@ -47,16 +47,19 @@ int ItemIncluded(const char *Line, double secs)
4747
4848
4949
50- #define ITEM_NORMAL 0
51- #define ITEM_START -1
52- #define ITEM_END -2
50+ #define ITEM_NORMAL 0
51+ #define ITEM_START -1
52+ #define ITEM_END -2
53+ #define ITEM_EXCLUDE -3
5354
54- int ProcessTimedItem (struct timeval * When , double Secs , const char * Line )
55+ int ProcessTimedItem (struct timeval * When , double Secs , const char * Line , char * * Output )
5556{
5657 const char * prefix = "" , * postfix = "" ;
5758 char * Tempstr = NULL ;
5859 int RetVal = ITEM_NORMAL ;
5960
61+ //if a start is declared, and we have not encountered a start-line, or
62+ //are between a start-line and an end-line, then ignore this line
6063 if (Started )
6164 {
6265 if ((Settings .WarnTime > -1 ) && (Secs > Settings .WarnTime ))
@@ -71,8 +74,8 @@ int ProcessTimedItem(struct timeval *When, double Secs, const char *Line)
7174 postfix = Settings .NormPostfix ;
7275 }
7376
74- if (Settings .Flags & FLAG_NANOSECS ) printf ( "%s%14.6f%s %s\n" , prefix , Secs , postfix , Line );
75- else printf ( "%s%10.3f%s %s\n" , prefix , Secs , postfix , Line );
77+ if (Settings .Flags & FLAG_NANOSECS ) * Output = FormatStr ( * Output , "%s%14.6f%s %s\n" , prefix , Secs , postfix , Line );
78+ else * Output = FormatStr ( * Output , "%s%10.3f%s %s\n" , prefix , Secs , postfix , Line );
7679
7780 StatsInsert ("default" , When , Secs );
7881
@@ -92,28 +95,33 @@ int ProcessTimedItem(struct timeval *When, double Secs, const char *Line)
9295
9396
9497
95- double ProcessLine (struct timeval * Prev , struct timeval * Curr , const char * Line )
98+ double ProcessLine (struct timeval * Prev , struct timeval * Curr , const char * Line , char * * Output )
9699{
97100 double secs = 0 ;
98101 int result ;
99102
100103 secs = CalcTimediff (Prev , Curr );
104+
105+ //if it's a 'Start' line, then we won't be calculating a difference between it
106+ //and the previous line. Also, if a start is declared, then we will ignore lines
107+ //before a start, or between a start and an end if an end is declared.
101108 if (InPatternList (Line , Settings .StartStrings , NULL ))
102109 {
103110 //if we are in 'warn only' mode, where we only display items that have a time warning
104111 //then we want a 'start string' that matches the start of an interaction to be registered as the start time
105112 //but we don't want it displayed
106- if (! (Settings .Flags & FLAG_WARN_ONLY )) printf ( "%s%10s%s %s\n" , Settings .NormPrefix , " -- " , Settings .NormPostfix , Line );
113+ if (! (Settings .Flags & FLAG_WARN_ONLY )) * Output = FormatStr ( * Output , "%s%10s%s %s\n" , Settings .NormPrefix , " -- " , Settings .NormPostfix , Line );
107114 Started = TRUE;
108115 secs = ITEM_START ;
109116 }
110117 else
111118 {
112119 if (ItemIncluded (Line , secs ))
113120 {
114- result = ProcessTimedItem (Curr , secs , Line );
121+ result = ProcessTimedItem (Curr , secs , Line , Output );
115122 if (result != ITEM_NORMAL ) secs = (double ) result ;
116123 }
124+ else secs = ITEM_EXCLUDE ;
117125 }
118126
119127 return (secs );
@@ -160,11 +168,52 @@ char *TimediffReadLine(char *RetStr, STREAM *S)
160168}
161169
162170
171+ char * HandleStartEndBlock (char * RetStr , double secs , char * Line , struct timeval * PrevTime , struct timeval * CurrTime )
172+ {
173+ //if we aren't using start or end strings, then we will just output the current line
174+ //and PrevTime becomes the CurrTime. We don't use the OutputBuffer provided by RetStr
175+ if ( (! StrValid (Settings .StartStrings )) && (! StrValid (Settings .EndStrings )) )
176+ {
177+ memcpy (PrevTime , CurrTime , sizeof (struct timeval ));
178+ printf ("%s\n" , Line );
179+ return (CopyStr (RetStr , "" ));
180+ }
181+
182+ if (secs == ITEM_START )
183+ {
184+ // on a start we always start a new output block,
185+ // and set PrevTime to CurrTime
186+ memcpy (PrevTime , CurrTime , sizeof (struct timeval ));
187+ RetStr = CopyStr (RetStr , Line );
188+ }
189+ else if (secs == ITEM_END )
190+ {
191+ //on an end we output the always buffered block of lines
192+ RetStr = CatStr (RetStr , Line );
193+ printf ("%s\n" , RetStr );
194+ RetStr = CopyStr (RetStr , "" );
195+ }
196+ else if (secs != ITEM_EXCLUDE )
197+ {
198+ RetStr = CatStr (RetStr , Line );
199+
200+ //if we are measuring time from a start line, then we don't update PrevTime on every line
201+ if (! (Settings .Flags & FLAG_FROM_START )) memcpy (PrevTime , CurrTime , sizeof (struct timeval ));
202+ if (! StrValid (Settings .EndStrings ))
203+ {
204+ printf ("%s\n" , RetStr );
205+ RetStr = CopyStr (RetStr , "" );
206+ }
207+ }
208+
209+ return (RetStr );
210+ }
211+
163212
164213int main (int argc , const char * argv [])
165214{
166215 STREAM * S ;
167- char * Tempstr = NULL ;
216+ char * Tempstr = NULL , * InputLine = NULL , * Output = NULL ;
168217 struct timeval Prev , Curr ;
169218 double secs ;
170219
@@ -178,21 +227,17 @@ int main(int argc, const char *argv[])
178227 S = STREAMOpen (Settings .Input , "r" );
179228 if (S )
180229 {
181- Tempstr = TimediffReadLine (Tempstr , S );
182- while (Tempstr )
230+ InputLine = TimediffReadLine (InputLine , S );
231+ while (InputLine )
183232 {
184- if (StrValid (Tempstr ))
233+ if (StrValid (InputLine ))
185234 {
186- ParseDateTime (Tempstr , & Curr );
187- secs = ProcessLine (& Prev , & Curr , Tempstr );
188-
189- if (Settings .Flags & FLAG_FROM_START )
190- {
191- if (secs == ITEM_START ) memcpy (& Prev , & Curr , sizeof (struct timeval ));
192- }
193- else memcpy (& Prev , & Curr , sizeof (struct timeval ));
235+ ParseDateTime (InputLine , & Curr );
236+ secs = ProcessLine (& Prev , & Curr , InputLine , & Tempstr );
237+ //actual printing of output happens in HandleStartEndBlock
238+ Output = HandleStartEndBlock (Output , secs , Tempstr , & Prev , & Curr );
194239 }
195- Tempstr = TimediffReadLine (Tempstr , S );
240+ InputLine = TimediffReadLine (InputLine , S );
196241 }
197242 //Display stats before closing stream,
198243 //because the stream might be stdin/stdout
@@ -203,5 +248,9 @@ int main(int argc, const char *argv[])
203248 STREAMClose (S );
204249 }
205250
251+ Destroy (InputLine );
252+ Destroy (Tempstr );
253+ Destroy (Output );
254+
206255 return (0 );
207256}
0 commit comments