WIP: added nicely formatted output for elapsed time.

ritchielawrence · Jun 21, 2018 · d41f6f4 · d41f6f4
1 parent 107132f
commit d41f6f4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/header.h b/header.h
@@ -96,6 +96,9 @@ BOOL IsAnOutputConsoleDevice(HANDLE h);
 DWORD GetParentProcessId(VOID);
 HANDLE GetPipedProcessHandle(VOID);
 
+int FormatElapsedTime( LARGE_INTEGER* elapsedTime, PCHAR outBuf,
+                                                        const int outBufSize );
+
 // perr.cpp
 DWORD Perror(DWORD dwErrNum);
 VOID Verbose(LPCTSTR szMsg);

diff --git a/helpers.cpp b/helpers.cpp
@@ -1,4 +1,5 @@
 #include "header.h"
+#include <stdio.h>
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 // CreateFullPathW creates the directory structure pointed to by szPath
@@ -230,3 +231,25 @@ HANDLE GetPipedProcessHandle(VOID)
     }
     return hPipedProcess;
 }
+
+int FormatElapsedTime( LARGE_INTEGER* elapsedTime, PCHAR outBuf,
+                                                        const int outBufSize )
+{
+    int h = 0;
+    int m = 0;
+    int len = 0;
+
+    float s = float(elapsedTime->QuadPart / 1000000);
+    m = (int)(s / 60.0);
+    s = s - 60*m;
+
+    h = (int)((float)m/60.0);
+    m = m - 60*h;
+
+    len = snprintf( outBuf, outBufSize, "Elapsed time: %02dh%02dm%06.3fs", h, m, s);
+
+    return len;
+}
+
+
+
diff --git a/main.cpp b/main.cpp
@@ -371,8 +371,8 @@ int main(VOID)
         elapsedTime.QuadPart *= 1000000L;
         elapsedTime.QuadPart /= frequency.QuadPart;
 
-        strLen = snprintf( strElapsedTime, sizeof(strElapsedTime),
-                                "Elapsed Time: %I64d us", elapsedTime.QuadPart );
+        strLen = FormatElapsedTime( &elapsedTime, strElapsedTime,
+                                                    sizeof(strElapsedTime) );
         WriteBufferToConsoleAndFilesA(&args, strElapsedTime, strLen, FALSE,
                                                                         FALSE);
     }