X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=f19db1be6f024b0a0420f8a298eca863851a01e4;hp=af4c12cbe1815f7119511a6bdb44b39421c85161;hb=fc220349e45144360917db48010b503a9874930d;hpb=fba5c5ff89163062922c3e560e871c087f2177c3

diff --git a/fio.c b/fio.c
index af4c12cb..f19db1be 100644
--- a/fio.c
+++ b/fio.c
@@ -18,92 +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 "smalloc.h"
-
-uintptr_t page_mask;
-uintptr_t page_size;
-
-static int endian_check(void)
-{
-	union {
-		uint8_t c[8];
-		uint64_t v;
-	} u;
-	int le = 0, be = 0;
-
-	u.v = 0x12;
-	if (u.c[7] == 0x12)
-		be = 1;
-	else if (u.c[0] == 0x12)
-		le = 1;
-
-#if defined(CONFIG_LITTLE_ENDIAN)
-	if (be)
-		return 1;
-#elif defined(CONFIG_BIG_ENDIAN)
-	if (le)
-		return 1;
-#else
-	return 1;
-#endif
-
-	if (!le && !be)
-		return 1;
-
-	return 0;
-}
 
 int main(int argc, char *argv[], char *envp[])
 {
-	long ps;
+	int ret = 1;
+
+	compiletime_assert(TD_NR <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
 
-	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;
-	}
 
 #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");
-
-	ps = sysconf(_SC_PAGESIZE);
-	if (ps < 0) {
-		log_err("Failed to get page size\n");
-		return 1;
-	}
+	setvbuf(stdout, NULL, _IOLBF, 0);
 
-	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;
-
-	fio_time_init();
+		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;
 }