The following changes since commit aeb32dfccbd052965b0e50714c12265551f61a00:
Fix confusion between terse and json output (2012-10-08 13:34:31 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (1):
options: cast page_size to unsigned long for sprintf()
Saurabh De (1):
solaris: fix compile error on ctime_r()
options.c | 2 +-
os/os-solaris.h | 3 +++
os/os.h | 4 ++++
stat.c | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/options.c b/options.c
index dd71f1e..84101d1 100644
--- a/options.c
+++ b/options.c
@@ -2493,7 +2493,7 @@ void fio_keywords_init(void)
char buf[128];
long l;
- sprintf(buf, "%lu", page_size);
+ sprintf(buf, "%lu", (unsigned long) page_size);
fio_keywords[0].replace = strdup(buf);
mb_memory = os_phys_mem() / (1024 * 1024);
diff --git a/os/os-solaris.h b/os/os-solaris.h
index d97643d..e7a544e 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -49,6 +49,9 @@ struct solaris_rand_seed {
#define POSIX_MADV_RANDOM MADV_RANDOM
#endif
+#define os_ctime_r(x, y, z) ctime_r((x), (y), (z))
+#define FIO_OS_HAS_CTIME_R
+
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
diff --git a/os/os.h b/os/os.h
index 8d2a6ae..c6da0c3 100644
--- a/os/os.h
+++ b/os/os.h
@@ -142,6 +142,10 @@ typedef unsigned long os_cpu_mask_t;
typedef socklen_t fio_socklen_t;
#endif
+#ifndef FIO_OS_HAS_CTIME_R
+#define os_ctime_r(x, y, z) ctime_r((x), (y))
+#endif
+
#ifdef FIO_USE_GENERIC_SWAP
static inline uint16_t fio_swap16(uint16_t val)
{
diff --git a/stat.c b/stat.c
index 2665952..d041ef3 100644
--- a/stat.c
+++ b/stat.c
@@ -534,7 +534,7 @@ void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
return;
time(&time_p);
- ctime_r((const time_t *) &time_p, time_buf);
+ os_ctime_r((const time_t *) &time_p, time_buf, sizeof(time_buf));
if (!ts->error) {
log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d: %s",
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
