Make it work on opensolaris

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index c79fad87600d53f4565bcb96c442938883fc5327..c5926289b34475bd511e8b8b5fadb0ce44b50c06 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -65,8 +65,8 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
        if (td->runstate == runstate)
                return;
 
-       dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
-                                                               runstate);
+       dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid,
+                                               td->runstate, runstate);
        td->runstate = runstate;
 }
 
@@ -80,7 +80,7 @@ static void terminate_threads(int group_id)
        for_each_td(td, i) {
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
-                                                       td->o.name, td->pid);
+                                               td->o.name, (int) td->pid);
                        td->terminate = 1;
                        td->o.start_delay = 0;
 
@@ -101,6 +101,9 @@ static void terminate_threads(int group_id)
 
 static void sig_handler(int sig)
 {
+       if (!threads)
+               return;
+
        switch (sig) {
        case SIGALRM:
                update_io_ticks();
@@ -412,10 +415,10 @@ sync_done:
                 */
                min_events = 0;
                if (queue_full(td) || ret == FIO_Q_BUSY) {
-                       min_events = 1;
-
-                       if (td->cur_depth > td->o.iodepth_low)
+                       if (td->cur_depth >= td->o.iodepth_low)
                                min_events = td->cur_depth - td->o.iodepth_low;
+                       if (!min_events)
+                               min_events = 1;
                }
 
                /*
@@ -545,16 +548,12 @@ sync_done:
                /*
                 * See if we need to complete some commands
                 */
-               if (ret == FIO_Q_QUEUED || ret == FIO_Q_BUSY) {
+               if (queue_full(td) || ret == FIO_Q_BUSY) {
                        min_evts = 0;
-                       if (queue_full(td) || ret == FIO_Q_BUSY) {
+                       if (td->cur_depth >= td->o.iodepth_low)
+                               min_evts = td->cur_depth - td->o.iodepth_low;
+                       if (!min_evts)
                                min_evts = 1;
-
-                               if (td->cur_depth > td->o.iodepth_low)
-                                       min_evts = td->cur_depth
-                                                       - td->o.iodepth_low;
-                       }
-
                        fio_gettime(&comp_time, NULL);
                        bytes_done = io_u_queued_complete(td, min_evts);
                        if (bytes_done < 0)
@@ -824,7 +823,7 @@ static void *thread_main(void *data)
 
        td->pid = getpid();
 
-       dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+       dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
 
        INIT_LIST_HEAD(&td->io_u_freelist);
        INIT_LIST_HEAD(&td->io_u_busylist);
@@ -976,7 +975,7 @@ static void *thread_main(void *data)
 
 err:
        if (td->error)
-               printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error,
+               printf("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error,
                                                        td->verror);
        close_and_free_files(td);
        close_ioengine(td);
@@ -1064,8 +1063,8 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
                ret = waitpid(td->pid, &status, flags);
                if (ret < 0) {
                        if (errno == ECHILD) {
-                               log_err("fio: pid=%d disappeared %d\n", td->pid,
-                                                               td->runstate);
+                               log_err("fio: pid=%d disappeared %d\n",
+                                               (int) td->pid, td->runstate);
                                td_set_runstate(td, TD_REAPED);
                                goto reaped;
                        }
@@ -1076,7 +1075,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 
                                if (sig != SIGQUIT)
                                        log_err("fio: pid=%d, got signal=%d\n",
-                                                               td->pid, sig);
+                                                       (int) td->pid, sig);
                                td_set_runstate(td, TD_REAPED);
                                goto reaped;
                        }
@@ -1162,8 +1161,8 @@ static void run_threads(void)
                if (setup_files(td)) {
                        exit_value++;
                        if (td->error)
-                               log_err("fio: pid=%d, err=%d/%s\n", td->pid,
-                                                       td->error, td->verror);
+                               log_err("fio: pid=%d, err=%d/%s\n",
+                                       (int) td->pid, td->error, td->verror);
                        td_set_runstate(td, TD_REAPED);
                        todo--;
                } else {
@@ -1237,12 +1236,15 @@ static void run_threads(void)
                                if (pthread_detach(td->thread) < 0)
                                        perror("pthread_detach");
                        } else {
+                               pid_t pid;
                                dprint(FD_PROCESS, "will fork\n");
-                               if (!fork()) {
+                               pid = fork();
+                               if (!pid) {
                                        int ret = fork_main(shm_id, i);
 
-                                       exit(ret);
-                               }
+                                       _exit(ret);
+                               } else if (i == fio_debug_jobno)
+                                       *fio_debug_jobp = pid;
                        }
                        fio_mutex_down(startup_mutex);
                }