fio: ioengine flag cleanup

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 99d6209adb5bc4c6c6cd6d555ec2a3ac3040c935..3d6ce59703743c9d2313045162a2a0e3b2e20d80 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -18,66 +18,48 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include <unistd.h>
-#include <locale.h>
-#include <time.h>
-
 #include "fio.h"
-#include "hash.h"
-#include "smalloc.h"
-#include "verify.h"
-#include "trim.h"
-#include "diskutil.h"
-#include "profile.h"
-#include "lib/rand.h"
-#include "memalign.h"
-#include "client.h"
-#include "server.h"
-#include "endian_check.h"
-
-unsigned long page_mask;
-unsigned long page_size;
 
 int main(int argc, char *argv[], char *envp[])
 {
-       long ps;
+       int ret = 1;
 
-       if (endian_check()) {
-               log_err("fio: endianness settings appear wrong.\n");
-               log_err("fio: please report this to fio@vger.kernel.org\n");
+       if (initialize_fio(envp))
                return 1;
-       }
 
-       arch_init(envp);
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
 
-       sinit();
+       if (fio_server_create_sk_key())
+               goto done;
+
+       if (parse_options(argc, argv))
+               goto done_key;
 
        /*
-        * We need locale for number printing, if it isn't set then just
-        * go with the US format.
+        * line buffer stdout to avoid output lines from multiple
+        * threads getting mixed
         */
-       if (!getenv("LC_NUMERIC"))
-               setlocale(LC_NUMERIC, "en_US");
+       setvbuf(stdout, NULL, _IOLBF, 0);
 
-       ps = sysconf(_SC_PAGESIZE);
-       if (ps < 0) {
-               log_err("Failed to get page size\n");
-               return 1;
-       }
-
-       page_size = ps;
-       page_mask = ps - 1;
+       fio_time_init();
 
-       fio_keywords_init();
+       if (nr_clients) {
+               set_genesis_time();
 
-       if (parse_options(argc, argv))
-               return 1;
+               if (fio_start_all_clients())
+                       goto done_key;
+               ret = fio_handle_clients(&fio_client_ops);
+       } else
+               ret = fio_backend(NULL);
 
-       if (nr_clients)
-               return fio_handle_clients(&fio_client_ops);
-       else
-               return fio_backend();
+done_key:
+       fio_server_destroy_sk_key();
+done:
+       deinitialize_fio();
+       return ret;
 }