Merge branch 'dev' of https://github.com/smartxworks/fio

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index ac026fba8117ed09995ba4cfd398ab1f10bf19d3..f19db1be6f024b0a0420f8a298eca863851a01e4 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -18,94 +18,50 @@
  *
  *  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 "server.h"
-
-uintptr_t page_mask;
-uintptr_t page_size;
 
-static int endian_check(void)
+int main(int argc, char *argv[], char *envp[])
 {
-       union {
-               uint8_t c[8];
-               uint64_t v;
-       } u;
-       int le = 0, be = 0;
+       int ret = 1;
 
-       u.v = 0x12;
-       if (u.c[7] == 0x12)
-               be = 1;
-       else if (u.c[0] == 0x12)
-               le = 1;
-
-#if defined(FIO_LITTLE_ENDIAN)
-       if (be)
-               return 1;
-#elif defined(FIO_BIG_ENDIAN)
-       if (le)
-               return 1;
-#else
-       return 1;
-#endif
+       compiletime_assert(TD_NR <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
 
-       if (!le && !be)
+       if (initialize_fio(envp))
                return 1;
 
-       return 0;
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
-       long ps;
-
-       if (endian_check()) {
-               log_err("fio: endianness settings appear wrong.\n");
-               log_err("fio: please report this to fio@vger.kernel.org\n");
-               return 1;
-       }
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
 
-       arch_init(envp);
+       if (fio_server_create_sk_key())
+               goto done;
 
-       sinit();
+       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();
-       else
-               return fio_backend();
+done_key:
+       fio_server_destroy_sk_key();
+done:
+       deinitialize_fio();
+       return ret;
 }