Use log_info() throughout

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/engines/net.c b/engines/net.c
index 51bc671fc3a1ba23a0e60ce91f80cc375db0990d..f7e4f2d0b748725c0613868e461c2a071d73f018 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -111,7 +111,7 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
        struct pollfd pfd;
        int ret;
 
-       fprintf(f_out, "fio: waiting for connection\n");
+       log_info("fio: waiting for connection\n");
 
        /*
         * Accept loop. poll for incoming events, accept them. Repeat until we

diff --git a/filesetup.c b/filesetup.c
index 053bda9d70f684e6d6fac6eba093f806e87fb51d..faef907aeefd44429896aa156f2fa4944593cac4 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -204,9 +204,8 @@ static int create_files(struct thread_data *td)
        }
 
        temp_stall_ts = 1;
-       fprintf(f_out, "%s: Laying out IO file(s) (%u files / %LuMiB)\n",
-                               td->name, new_files,
-                               total_file_size >> 20);
+       log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+                               td->name, new_files, total_file_size >> 20);
 
        err = 0;
        for_each_file(td, f, i) {

diff --git a/fio.c b/fio.c
index 5f06940f81e6a3b2ff7c1aeaeb4c27b197e5ddfd..b5fada8983e90c2caeb4ca7c4c9ed1bed9a63e5a 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -132,12 +132,12 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
                        return 0;
 
                if (bytes < td->rate_bytes) {
-                       fprintf(f_out, "%s: min rate %u not met\n", td->name, td->ratemin);
+                       log_err("%s: min rate %u not met\n", td->name, td->ratemin);
                        return 1;
                } else {
                        rate = (bytes - td->rate_bytes) / spent;
                        if (rate < td->ratemin || bytes < td->rate_bytes) {
-                               fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+                               log_err("%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
                                return 1;
                        }
                }

diff --git a/init.c b/init.c
index e794b3720c3dc1813c7018bd86e586bfa8dc4697..4af00ff98b2273d9788312de6640caf80b157dd7 100644 (file)
--- a/init.c
+++ b/init.c
@@ -757,7 +757,7 @@ static void put_job(struct thread_data *td)
                return;
 
        if (td->error)
-               fprintf(f_out, "fio: %s\n", td->verror);
+               log_info("fio: %s\n", td->verror);
 
        memset(&threads[td->thread_number - 1], 0, sizeof(*td));
        thread_number--;
@@ -1054,7 +1054,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (!terse_output) {
                if (!job_add_num) {
                        if (!strcmp(td->io_ops->name, "cpuio"))
-                               fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
+                               log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
                        else {
                                char *c1, *c2, *c3, *c4;
 
@@ -1063,7 +1063,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                                c3 = to_kmg(td->min_bs[DDIR_WRITE]);
                                c4 = to_kmg(td->max_bs[DDIR_WRITE]);
 
-                               fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[td->td_ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
+                               log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[td->td_ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
 
                                free(c1);
                                free(c2);
@@ -1071,7 +1071,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                                free(c4);
                        }
                } else if (job_add_num == 1)
-                       fprintf(f_out, "...\n");
+                       log_info("...\n");
        }
 
        /*

diff --git a/memory.c b/memory.c
index d9cfe9bae2c0b35f24ec3e301ef74d459b4d8407..9df2321153b0a944e4dca53707480f8030bb6cf1 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -34,7 +34,7 @@ int fio_pin_memory(void)
        if (phys_mem) {
                if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
                        mlock_size = phys_mem - 128 * 1024 * 1024;
-                       fprintf(f_out, "fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
+                       log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
                }
        }
 

diff --git a/stat.c b/stat.c
index 815e3ae54fd42f01200614db771c5768cf004147..dda2687eea05c9d05b68b4c9adbbb59326ad8d4b 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -369,7 +369,7 @@ static void show_group_stats(struct group_run_stats *rs, int id)
        const char *ddir_str[] = { "   READ", "  WRITE" };
        int i;
 
-       fprintf(f_out, "\nRun status group %d (all jobs):\n", id);
+       log_info("\nRun status group %d (all jobs):\n", id);
 
        for (i = 0; i <= DDIR_WRITE; i++) {
                if (!rs->max_run[i])
@@ -380,7 +380,7 @@ static void show_group_stats(struct group_run_stats *rs, int id)
                p3 = num2str(rs->min_bw[i], 6, 1000, 1);
                p4 = num2str(rs->max_bw[i], 6, 1000, 1);
 
-               fprintf(f_out, "%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[i], rs->max_run[i]);
+               log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[i], rs->max_run[i]);
 
                free(p1);
                free(p2);
@@ -396,7 +396,7 @@ static void show_disk_util(void)
        struct disk_util *du;
        double util;
 
-       fprintf(f_out, "\nDisk stats (read/write):\n");
+       log_info("\nDisk stats (read/write):\n");
 
        list_for_each(entry, &disk_list) {
                du = list_entry(entry, struct disk_util, list);
@@ -406,7 +406,7 @@ static void show_disk_util(void)
                if (util > 100.0)
                        util = 100.0;
 
-               fprintf(f_out, "  %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, in_queue=%u, util=%3.2f%%\n", du->name, dus->ios[0], dus->ios[1], dus->merges[0], dus->merges[1], dus->ticks[0], dus->ticks[1], dus->time_in_queue, util);
+               log_info("  %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, in_queue=%u, util=%3.2f%%\n", du->name, dus->ios[0], dus->ios[1], dus->merges[0], dus->merges[1], dus->ticks[0], dus->ticks[1], dus->time_in_queue, util);
        }
 
        /*
@@ -467,23 +467,23 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
        bw_p = num2str(bw, 6, 1000, 1);
        iops_p = num2str(iops, 6, 1, 0);
 
-       fprintf(f_out, "  %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n", ddir_str[ddir], io_p, bw_p, iops_p, ts->runtime[ddir]);
+       log_info("  %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n", ddir_str[ddir], io_p, bw_p, iops_p, ts->runtime[ddir]);
 
        free(io_p);
        free(bw_p);
        free(iops_p);
 
        if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, "    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
+               log_info("    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
 
        if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, "    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
+               log_info("    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
 
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
                p_of_agg = mean * 100 / (double) rs->agg[ddir];
-               fprintf(f_out, "    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg, mean, dev);
+               log_info("    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg, mean, dev);
        }
 }
 
@@ -499,12 +499,12 @@ static void show_thread_status(struct thread_stat *ts,
                return;
 
        if (!ts->error)
-               fprintf(f_out, "%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->pid);
+               log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->pid);
        else
-               fprintf(f_out, "%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->verror, ts->pid);
+               log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->verror, ts->pid);
 
        if (ts->description)
-               fprintf(f_out, "  Description  : [%s]\n", ts->description);
+               log_info("  Description  : [%s]\n", ts->description);
 
        if (ts->io_bytes[DDIR_READ])
                show_ddir_status(rs, ts, DDIR_READ);
@@ -522,15 +522,15 @@ static void show_thread_status(struct thread_stat *ts,
                sys_cpu = 0;
        }
 
-       fprintf(f_out, "  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, ts->ctx);
+       log_info("  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, ts->ctx);
 
        stat_calc_dist(ts, io_u_dist);
        stat_calc_lat(ts, io_u_lat);
 
-       fprintf(f_out, "  IO depths    : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%, 32=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
+       log_info("  IO depths    : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%, 32=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
 
-       fprintf(f_out, "     lat (msec): 2=%3.1f%%, 4=%3.1f%%, 10=%3.1f%%, 20=%3.1f%%, 50=%3.1f%%, 100=%3.1f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
-       fprintf(f_out, "     lat (msec): 250=%3.1f%%, 500=%3.1f%%, 750=%3.1f%%, 1000=%3.1f%%, >=2000=%3.1f%%\n", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+       log_info("     lat (msec): 2=%3.1f%%, 4=%3.1f%%, 10=%3.1f%%, 20=%3.1f%%, 50=%3.1f%%, 100=%3.1f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
+       log_info("     lat (msec): 250=%3.1f%%, 500=%3.1f%%, 750=%3.1f%%, 1000=%3.1f%%, >=2000=%3.1f%%\n", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
 }
 
 static void show_ddir_status_terse(struct thread_stat *ts,
@@ -544,25 +544,25 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        if (ts->runtime[ddir])
                bw = ts->io_bytes[ddir] / ts->runtime[ddir];
 
-       fprintf(f_out, ";%llu;%llu;%lu", ts->io_bytes[ddir] >> 10, bw, ts->runtime[ddir]);
+       log_info(";%llu;%llu;%lu", ts->io_bytes[ddir] >> 10, bw, ts->runtime[ddir]);
 
        if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, ";%lu;%lu;%f;%f", min, max, mean, dev);
+               log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
        else
-               fprintf(f_out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+               log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
        if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, ";%lu;%lu;%f;%f", min, max, mean, dev);
+               log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
        else
-               fprintf(f_out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+               log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
                p_of_agg = mean * 100 / (double) rs->agg[ddir];
-               fprintf(f_out, ";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
+               log_info(";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
        } else
-               fprintf(f_out, ";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
+               log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
 }
 
 
@@ -573,7 +573,7 @@ static void show_thread_status_terse(struct thread_stat *ts,
        double io_u_lat[FIO_IO_U_LAT_NR];
        double usr_cpu, sys_cpu;
 
-       fprintf(f_out, "%s;%d;%d", ts->name, ts->groupid, ts->error);
+       log_info("%s;%d;%d", ts->name, ts->groupid, ts->error);
 
        show_ddir_status_terse(ts, rs, 0);
        show_ddir_status_terse(ts, rs, 1);
@@ -588,20 +588,20 @@ static void show_thread_status_terse(struct thread_stat *ts,
                sys_cpu = 0;
        }
 
-       fprintf(f_out, ";%f%%;%f%%;%lu", usr_cpu, sys_cpu, ts->ctx);
+       log_info(";%f%%;%f%%;%lu", usr_cpu, sys_cpu, ts->ctx);
 
        stat_calc_dist(ts, io_u_dist);
        stat_calc_lat(ts, io_u_lat);
 
-       fprintf(f_out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
+       log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
 
-       fprintf(f_out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
-       fprintf(f_out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+       log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
+       log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
 
        if (ts->description)
-               fprintf(f_out, ";%s", ts->description);
+               log_info(";%s", ts->description);
 
-       fprintf(f_out, "\n");
+       log_info("\n");
 }
 
 static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)

diff --git a/verify.c b/verify.c
index 643e782010648bd43c53f827a97eb5437194d177..a9441b4179615c83c43056e134a1c92b10c180b8 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -38,8 +38,8 @@ static void hexdump(void *buffer, int len)
        int i;
 
        for (i = 0; i < len; i++)
-               fprintf(f_out, "%02x", p[i]);
-       fprintf(f_out, "\n");
+               log_info("%02x", p[i]);
+       log_info("\n");
 }
 
 static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)