From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by dpdk.org (Postfix) with ESMTP id 8B61CC362 for ; Mon, 6 Apr 2015 20:58:46 +0200 (CEST) Received: by pacyx8 with SMTP id yx8so52290055pac.1 for ; Mon, 06 Apr 2015 11:58:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TpZ+qBfoQEEkEmnURZKkmw1pDW18bWiVTqg0L+hI9M4=; b=lGVs1tDa5X45VKaCmJkQ5t6/b2gxDbcPBqlWtm0GEe4Om52MCnbyReF6vs0DWFxbBh laH/QGQB0HguuOyA/OlGpFWaf6s3zmU3P6zd+ZoJMqM4Mc5yenO7HbzHqdxbwb+ozrne tBjuRIPFJMyfXnap6vDt2PaXXX0GQknEHqyf4JJhyiU9+N8PFWTx6Jjp74oWvwMJgxNA deMw2wxv5u4mqAUXcER7nc+d32kbbCtkrWAggfx3jPnCVfEfd2GwfE29rubvaOFWmZdp MkIdRYRJhruEx2l/IAjsu2dggTkbnDCOde8TafIvo8J3GD3rz+KqNNUqJmZY2RRc0Wup PWTA== X-Gm-Message-State: ALoCoQks6mWuT6441S0+cXWvai78j6R1Q99jrU+r4gdW/CBoUTPw7wczEUMAMwNKj/YPMxPeX58t X-Received: by 10.68.254.226 with SMTP id al2mr30041554pbd.44.1428346725994; Mon, 06 Apr 2015 11:58:45 -0700 (PDT) Received: from localhost (7c295ef2.i-revonet.jp. [124.41.94.242]) by mx.google.com with ESMTPSA id ux6sm2818064pab.24.2015.04.06.11.58.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2015 11:58:45 -0700 (PDT) From: Takuya ASADA To: dev@dpdk.org Date: Tue, 7 Apr 2015 03:58:10 +0900 Message-Id: <1428346691-14894-7-git-send-email-syuu@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1428346691-14894-1-git-send-email-syuu@cloudius-systems.com> References: <1428346691-14894-1-git-send-email-syuu@cloudius-systems.com> Subject: [dpdk-dev] [RFC PATCHv3 6/7] app/test: support OSv X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 18:58:47 -0000 Add support OSv EAL. Signed-off-by: Takuya ASADA --- app/test/test_eal_flags.c | 34 +++++++++++++++++----------------- app/test/test_timer_perf.c | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 0352f87..40a5c7e 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -287,7 +287,7 @@ static int test_whitelist_flag(void) { unsigned i; -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -353,7 +353,7 @@ test_whitelist_flag(void) static int test_invalid_b_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -400,7 +400,7 @@ test_invalid_b_flag(void) static int test_invalid_vdev_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ const char * prefix = no_shconf; @@ -454,7 +454,7 @@ test_invalid_vdev_flag(void) static int test_invalid_r_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -498,7 +498,7 @@ test_invalid_r_flag(void) static int test_missing_c_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -629,7 +629,7 @@ test_missing_c_flag(void) static int test_master_lcore_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char *prefix = ""; #else @@ -677,7 +677,7 @@ test_master_lcore_flag(void) static int test_missing_n_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -722,7 +722,7 @@ test_no_hpet_flag(void) { char prefix[PATH_MAX], tmp[PATH_MAX]; -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) return 0; #endif if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { @@ -754,7 +754,7 @@ test_no_hpet_flag(void) static int test_no_huge_flag(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ const char * prefix = no_shconf; @@ -782,7 +782,7 @@ test_no_huge_flag(void) printf("Error - process run ok with --no-huge and -m flags\n"); return -1; } -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target does not support NUMA, hence no --socket-mem tests */ return 0; #endif @@ -870,7 +870,7 @@ static int test_misc_flags(void) { char hugepath[PATH_MAX] = {0}; -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; const char * nosh_prefix = ""; @@ -942,7 +942,7 @@ test_misc_flags(void) const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE, no_shconf, nosh_prefix }; -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) return 0; #endif /* With --huge-dir */ @@ -1007,7 +1007,7 @@ test_misc_flags(void) printf("Error - process did not run ok with --no-shconf flag\n"); return -1; } -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) return 0; #endif if (launch_proc(argv7) != 0) { @@ -1068,7 +1068,7 @@ test_file_prefix(void) * 7. check that only memtest2 hugefiles are present in the hugedir */ -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) return 0; #endif @@ -1175,7 +1175,7 @@ test_file_prefix(void) static int test_memory_flags(void) { -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; #else @@ -1228,7 +1228,7 @@ test_memory_flags(void) char invalid_socket_mem[SOCKET_MEM_STRLEN]; char buf[SOCKET_MEM_STRLEN]; /* to avoid copying string onto itself */ -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) int i, num_sockets = 1; #else int i, num_sockets = get_number_of_sockets(); @@ -1281,7 +1281,7 @@ test_memory_flags(void) return -1; } -#ifdef RTE_EXEC_ENV_BSDAPP +#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP) /* no other tests are applicable to BSD */ return 0; #endif diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c index 3f7ddd3..1edffa8 100644 --- a/app/test/test_timer_perf.c +++ b/app/test/test_timer_perf.c @@ -55,7 +55,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused) #define DELAY_SECONDS 1 -#ifdef RTE_EXEC_ENV_LINUXAPP +#if defined(RTE_EXEC_ENV_LINUXAPP) || defined(RTE_EXEC_ENV_OSVAPP) #define do_delay() usleep(10) #else #define do_delay() rte_pause() -- 2.1.0