diff mbox series

eal: remove exec-env directory

Message ID 20190401230712.31864-1-thomas@monjalon.net (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series eal: remove exec-env directory |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Thomas Monjalon April 1, 2019, 11:07 p.m. UTC 
  Only one header file (rte_kni_common.h) was in the sub-directory
	include/exec-env/
This file was installed in a sub-directory of the same name.
Source and install directories are moved as below:

   lib/librte_eal/linux/eal/include/exec-env/
-> lib/librte_eal/linux/eal/include/

   build/include/exec-env/
-> build/include/

The consequence is to have a file hierarchy a bit more flat.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/check-includes.sh                                     | 1 -
 kernel/linux/kni/kni_dev.h                                     | 2 +-
 kernel/linux/kni/kni_fifo.h                                    | 2 +-
 kernel/linux/kni/kni_misc.c                                    | 2 +-
 kernel/linux/kni/kni_net.c                                     | 2 +-
 lib/librte_eal/freebsd/eal/Makefile                            | 3 +--
 lib/librte_eal/linux/eal/Makefile                              | 3 +--
 .../linux/eal/include/{exec-env => }/rte_kni_common.h          | 0
 lib/librte_kni/rte_kni.c                                       | 2 +-
 lib/librte_kni/rte_kni.h                                       | 2 +-
 10 files changed, 8 insertions(+), 11 deletions(-)
 rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h (100%)

Comments

Bruce Richardson April 2, 2019, 9:39 a.m. UTC | #1 
On Tue, Apr 02, 2019 at 01:07:12AM +0200, Thomas Monjalon wrote:
> Only one header file (rte_kni_common.h) was in the sub-directory
> 	include/exec-env/
> This file was installed in a sub-directory of the same name.
> Source and install directories are moved as below:
> 
>    lib/librte_eal/linux/eal/include/exec-env/
> -> lib/librte_eal/linux/eal/include/
> 
>    build/include/exec-env/
> -> build/include/
> 
> The consequence is to have a file hierarchy a bit more flat.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  devtools/check-includes.sh                                     | 1 -
>  kernel/linux/kni/kni_dev.h                                     | 2 +-
>  kernel/linux/kni/kni_fifo.h                                    | 2 +-
>  kernel/linux/kni/kni_misc.c                                    | 2 +-
>  kernel/linux/kni/kni_net.c                                     | 2 +-
>  lib/librte_eal/freebsd/eal/Makefile                            | 3 +--
>  lib/librte_eal/linux/eal/Makefile                              | 3 +--
>  .../linux/eal/include/{exec-env => }/rte_kni_common.h          | 0
>  lib/librte_kni/rte_kni.c                                       | 2 +-
>  lib/librte_kni/rte_kni.h                                       | 2 +-
>  10 files changed, 8 insertions(+), 11 deletions(-)
>  rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h (100%)
> 
+1 for flattening our EAL hierarchy.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
David Marchand April 2, 2019, 9:57 a.m. UTC | #2 
On Tue, Apr 2, 2019 at 1:07 AM Thomas Monjalon <thomas@monjalon.net> wrote:

> Only one header file (rte_kni_common.h) was in the sub-directory
>         include/exec-env/
> This file was installed in a sub-directory of the same name.
> Source and install directories are moved as below:
>
>    lib/librte_eal/linux/eal/include/exec-env/
> -> lib/librte_eal/linux/eal/include/
>
>    build/include/exec-env/
> -> build/include/
>
> The consequence is to have a file hierarchy a bit more flat.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  devtools/check-includes.sh                                     | 1 -
>  kernel/linux/kni/kni_dev.h                                     | 2 +-
>  kernel/linux/kni/kni_fifo.h                                    | 2 +-
>  kernel/linux/kni/kni_misc.c                                    | 2 +-
>  kernel/linux/kni/kni_net.c                                     | 2 +-
>  lib/librte_eal/freebsd/eal/Makefile                            | 3 +--
>  lib/librte_eal/linux/eal/Makefile                              | 3 +--
>  .../linux/eal/include/{exec-env => }/rte_kni_common.h          | 0
>  lib/librte_kni/rte_kni.c                                       | 2 +-
>  lib/librte_kni/rte_kni.h                                       | 2 +-
>  10 files changed, 8 insertions(+), 11 deletions(-)
>  rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h
> (100%)
>

Think you missed some bits in meson.
lib/librte_eal/linux/eal/meson.build:install_subdir('include/exec-env',
install_dir: get_option('includedir'))


> diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh
> index ba9d00ba3..3629ab4c7 100755
> --- a/devtools/check-includes.sh
> +++ b/devtools/check-includes.sh
> @@ -80,7 +80,6 @@ include_dir=${1:-build/include}
>         'rte_byteorder_32.h' \
>         'rte_byteorder_64.h' \
>         'generic/*' \
> -       'exec-env/*' \
>         'rte_vhost.h' \
>         'rte_eth_vhost.h' \
>         'rte_eal_interrupts.h' \
> diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
> index 688f574a4..df46aa70e 100644
> --- a/kernel/linux/kni/kni_dev.h
> +++ b/kernel/linux/kni/kni_dev.h
> @@ -24,7 +24,7 @@
>  #include <linux/spinlock.h>
>  #include <linux/list.h>
>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>  #define KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */
>
>  #define MBUF_BURST_SZ 32
> diff --git a/kernel/linux/kni/kni_fifo.h b/kernel/linux/kni/kni_fifo.h
> index 3f4781c2e..5c91b5537 100644
> --- a/kernel/linux/kni/kni_fifo.h
> +++ b/kernel/linux/kni/kni_fifo.h
> @@ -6,7 +6,7 @@
>  #ifndef _KNI_FIFO_H_
>  #define _KNI_FIFO_H_
>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>
>  /* Skip some memory barriers on Linux < 3.14 */
>  #ifndef smp_load_acquire
> diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
> index 04c78eb87..31845e10f 100644
> --- a/kernel/linux/kni/kni_misc.c
> +++ b/kernel/linux/kni/kni_misc.c
> @@ -16,7 +16,7 @@
>  #include <net/net_namespace.h>
>  #include <net/netns/generic.h>
>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>
>  #include "compat.h"
>  #include "kni_dev.h"
> diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
> index 7371b6d58..be9e6b0b9 100644
> --- a/kernel/linux/kni/kni_net.c
> +++ b/kernel/linux/kni/kni_net.c
> @@ -17,7 +17,7 @@
>  #include <linux/kthread.h>
>  #include <linux/delay.h>
>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>  #include <kni_fifo.h>
>
>  #include "compat.h"
> diff --git a/lib/librte_eal/freebsd/eal/Makefile
> b/lib/librte_eal/freebsd/eal/Makefile
> index 5d5abf1bb..55d476e5b 100644
> --- a/lib/librte_eal/freebsd/eal/Makefile
> +++ b/lib/librte_eal/freebsd/eal/Makefile
> @@ -88,7 +88,6 @@ endif
>
>  INC :=  # no bsd specific headers
>
> -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include/exec-env := \
> -       $(addprefix include/exec-env/,$(INC))
> +SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix
> include/,$(INC))
>
>  include $(RTE_SDK)/mk/rte.lib.mk
> diff --git a/lib/librte_eal/linux/eal/Makefile
> b/lib/librte_eal/linux/eal/Makefile
> index 932c93309..2aa6e8c6a 100644
> --- a/lib/librte_eal/linux/eal/Makefile
> +++ b/lib/librte_eal/linux/eal/Makefile
> @@ -95,7 +95,6 @@ endif
>
>  INC := rte_kni_common.h
>
> -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include/exec-env := \
> -       $(addprefix include/exec-env/,$(INC))
> +SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix
> include/,$(INC))
>
>  include $(RTE_SDK)/mk/rte.lib.mk
> diff --git a/lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h
> b/lib/librte_eal/linux/eal/include/rte_kni_common.h
> similarity index 100%
> rename from lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h
> rename to lib/librte_eal/linux/eal/include/rte_kni_common.h
> diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
> index 492e207a3..192f2fed0 100644
> --- a/lib/librte_kni/rte_kni.c
> +++ b/lib/librte_kni/rte_kni.c
> @@ -21,7 +21,7 @@
>  #include <rte_tailq.h>
>  #include <rte_rwlock.h>
>  #include <rte_eal_memconfig.h>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>  #include "rte_kni_fifo.h"
>
>  #define MAX_MBUF_BURST_NUM            32
> diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
> index 02ca43b4b..9a9a7d754 100644
> --- a/lib/librte_kni/rte_kni.h
> +++ b/lib/librte_kni/rte_kni.h
> @@ -22,7 +22,7 @@
>  #include <rte_mempool.h>
>  #include <rte_ether.h>
>
> -#include <exec-env/rte_kni_common.h>
> +#include <rte_kni_common.h>
>
>  #ifdef __cplusplus
>  extern "C" {
> --
> 2.21.0
>
>
The rest lgtm.
Thomas Monjalon April 2, 2019, 10:03 a.m. UTC | #3 
02/04/2019 11:57, David Marchand:
> On Tue, Apr 2, 2019 at 1:07 AM Thomas Monjalon <thomas@monjalon.net> wrote:
> 
> > Only one header file (rte_kni_common.h) was in the sub-directory
> >         include/exec-env/
> > This file was installed in a sub-directory of the same name.
> > Source and install directories are moved as below:
> >
> >    lib/librte_eal/linux/eal/include/exec-env/
> > -> lib/librte_eal/linux/eal/include/
> >
> >    build/include/exec-env/
> > -> build/include/
> >
> > The consequence is to have a file hierarchy a bit more flat.
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
> >  devtools/check-includes.sh                                     | 1 -
> >  kernel/linux/kni/kni_dev.h                                     | 2 +-
> >  kernel/linux/kni/kni_fifo.h                                    | 2 +-
> >  kernel/linux/kni/kni_misc.c                                    | 2 +-
> >  kernel/linux/kni/kni_net.c                                     | 2 +-
> >  lib/librte_eal/freebsd/eal/Makefile                            | 3 +--
> >  lib/librte_eal/linux/eal/Makefile                              | 3 +--
> >  .../linux/eal/include/{exec-env => }/rte_kni_common.h          | 0
> >  lib/librte_kni/rte_kni.c                                       | 2 +-
> >  lib/librte_kni/rte_kni.h                                       | 2 +-
> >  10 files changed, 8 insertions(+), 11 deletions(-)
> >  rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h
> > (100%)
> >
> 
> Think you missed some bits in meson.
> lib/librte_eal/linux/eal/meson.build:install_subdir('include/exec-env',
> install_dir: get_option('includedir'))

You're right. I wonder how I have missed it!
In my poor understanding of meson, I think I just have to remove this line.
Ferruh Yigit April 2, 2019, 2:43 p.m. UTC | #4 
On 4/2/2019 10:39 AM, Bruce Richardson wrote:
> On Tue, Apr 02, 2019 at 01:07:12AM +0200, Thomas Monjalon wrote:
>> Only one header file (rte_kni_common.h) was in the sub-directory
>> 	include/exec-env/
>> This file was installed in a sub-directory of the same name.
>> Source and install directories are moved as below:
>>
>>    lib/librte_eal/linux/eal/include/exec-env/
>> -> lib/librte_eal/linux/eal/include/
>>
>>    build/include/exec-env/
>> -> build/include/
>>
>> The consequence is to have a file hierarchy a bit more flat.
>>
>> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
>> ---
>>  devtools/check-includes.sh                                     | 1 -
>>  kernel/linux/kni/kni_dev.h                                     | 2 +-
>>  kernel/linux/kni/kni_fifo.h                                    | 2 +-
>>  kernel/linux/kni/kni_misc.c                                    | 2 +-
>>  kernel/linux/kni/kni_net.c                                     | 2 +-
>>  lib/librte_eal/freebsd/eal/Makefile                            | 3 +--
>>  lib/librte_eal/linux/eal/Makefile                              | 3 +--
>>  .../linux/eal/include/{exec-env => }/rte_kni_common.h          | 0
>>  lib/librte_kni/rte_kni.c                                       | 2 +-
>>  lib/librte_kni/rte_kni.h                                       | 2 +-
>>  10 files changed, 8 insertions(+), 11 deletions(-)
>>  rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h (100%)
>>
> +1 for flattening our EAL hierarchy.

+1
diff mbox series

Patch

diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh
index ba9d00ba3..3629ab4c7 100755
--- a/devtools/check-includes.sh
+++ b/devtools/check-includes.sh
@@ -80,7 +80,6 @@  include_dir=${1:-build/include}
 	'rte_byteorder_32.h' \
 	'rte_byteorder_64.h' \
 	'generic/*' \
-	'exec-env/*' \
 	'rte_vhost.h' \
 	'rte_eth_vhost.h' \
 	'rte_eal_interrupts.h' \
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 688f574a4..df46aa70e 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -24,7 +24,7 @@ 
 #include <linux/spinlock.h>
 #include <linux/list.h>
 
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 #define KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */
 
 #define MBUF_BURST_SZ 32
diff --git a/kernel/linux/kni/kni_fifo.h b/kernel/linux/kni/kni_fifo.h
index 3f4781c2e..5c91b5537 100644
--- a/kernel/linux/kni/kni_fifo.h
+++ b/kernel/linux/kni/kni_fifo.h
@@ -6,7 +6,7 @@ 
 #ifndef _KNI_FIFO_H_
 #define _KNI_FIFO_H_
 
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 
 /* Skip some memory barriers on Linux < 3.14 */
 #ifndef smp_load_acquire
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 04c78eb87..31845e10f 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -16,7 +16,7 @@ 
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 
 #include "compat.h"
 #include "kni_dev.h"
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 7371b6d58..be9e6b0b9 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -17,7 +17,7 @@ 
 #include <linux/kthread.h>
 #include <linux/delay.h>
 
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 #include <kni_fifo.h>
 
 #include "compat.h"
diff --git a/lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile
index 5d5abf1bb..55d476e5b 100644
--- a/lib/librte_eal/freebsd/eal/Makefile
+++ b/lib/librte_eal/freebsd/eal/Makefile
@@ -88,7 +88,6 @@  endif
 
 INC :=  # no bsd specific headers
 
-SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include/exec-env := \
-	$(addprefix include/exec-env/,$(INC))
+SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC))
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/linux/eal/Makefile b/lib/librte_eal/linux/eal/Makefile
index 932c93309..2aa6e8c6a 100644
--- a/lib/librte_eal/linux/eal/Makefile
+++ b/lib/librte_eal/linux/eal/Makefile
@@ -95,7 +95,6 @@  endif
 
 INC := rte_kni_common.h
 
-SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include/exec-env := \
-	$(addprefix include/exec-env/,$(INC))
+SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC))
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
similarity index 100%
rename from lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h
rename to lib/librte_eal/linux/eal/include/rte_kni_common.h
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 492e207a3..192f2fed0 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -21,7 +21,7 @@ 
 #include <rte_tailq.h>
 #include <rte_rwlock.h>
 #include <rte_eal_memconfig.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 #include "rte_kni_fifo.h"
 
 #define MAX_MBUF_BURST_NUM            32
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 02ca43b4b..9a9a7d754 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -22,7 +22,7 @@ 
 #include <rte_mempool.h>
 #include <rte_ether.h>
 
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
 
 #ifdef __cplusplus
 extern "C" {