Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Sep 20, 2016

lore

Share & tools

lore

Jens Axboe

author

2016-09-20 12:00 UTC #0 lore raw

The following changes since commit d22042d2117b78e16b06bab0880422c417007d37:

workqueue: kill SW_F_EXITED (2016-09-16 12:48:32 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 5de1ade5a8a8dd118bdfac835a6cfb4bcf013734:

Windows: fix Time_tToSystemTime function to be 64-bit compliant (2016-09-19 08:28:11 -0600)

----------------------------------------------------------------
Josh Sinykin (2):
Fix garbage characters in json output caused by time_buf being uninitialized
Windows: fix Time_tToSystemTime function to be 64-bit compliant

 os/windows/posix.c | 10 ++++++----
 stat.c             |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

---

Diff of recent changes:

os/windows/posix.c +6 -4

index fd3d9ab..5830e4c 100755
@@ -232,10 +232,12 @@ char *dlerror(void)
 /* Copied from http://blogs.msdn.com/b/joshpoley/archive/2007/12/19/date-time-formats-and-conversions.aspx */
 void Time_tToSystemTime(time_t dosTime, SYSTEMTIME *systemTime)
 {
-    LARGE_INTEGER jan1970FT;
-    LARGE_INTEGER utcFT;
-    jan1970FT.QuadPart = 116444736000000000LL; // january 1st 1970
-    utcFT.QuadPart = ((unsigned __int64)dosTime) * 10000000 + jan1970FT.QuadPart;
+    FILETIME utcFT;
+    LONGLONG jan1970;
+
+    jan1970 = Int32x32To64(dosTime, 10000000) + 116444736000000000;
+    utcFT.dwLowDateTime = (DWORD)jan1970;
+    utcFT.dwHighDateTime = jan1970 >> 32;
 
     FileTimeToSystemTime((FILETIME*)&utcFT, systemTime);
 }

stat.c +2 -0

index 74c2686..c9148ad 100644
@@ -669,6 +669,8 @@ static void show_thread_status_normal(struct thread_stat *ts,
 
 	if (!ddir_rw_sum(ts->io_bytes) && !ddir_rw_sum(ts->total_io_u))
 		return;
+		
+	memset(time_buf, 0, sizeof(time_buf));
 
 	time(&time_p);
 	os_ctime_r((const time_t *) &time_p, time_buf, sizeof(time_buf));