[v15,10/11] app/test: replace .sh script with .py script
Checks
Commit Message
- Add python script to check if system supports hugepages
- Remove corresponding .sh script
- Replace calling of .sh with corresponding .py in meson.build
Signed-off-by: Jie Zhou <jizh@linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
app/test/has-hugepage.sh | 11 -----------
app/test/has_hugepage.py | 26 ++++++++++++++++++++++++++
app/test/meson.build | 2 +-
3 files changed, 27 insertions(+), 12 deletions(-)
delete mode 100755 app/test/has-hugepage.sh
create mode 100644 app/test/has_hugepage.py
Comments
26/01/2022 06:10, Jie Zhou:
> - Add python script to check if system supports hugepages
> - Remove corresponding .sh script
> - Replace calling of .sh with corresponding .py in meson.build
>
> Signed-off-by: Jie Zhou <jizh@linux.microsoft.com>
> Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
> app/test/has-hugepage.sh | 11 -----------
> app/test/has_hugepage.py | 26 ++++++++++++++++++++++++++
The file MAINTAINERS should be updated with the new file name.
I will do it before merging if the rest is OK.
O Thu, Feb 03, 2022 at 12:15:19PM +0100, Thomas Monjalon wrote:
> 26/01/2022 06:10, Jie Zhou:
> > - Add python script to check if system supports hugepages
> > - Remove corresponding .sh script
> > - Replace calling of .sh with corresponding .py in meson.build
> >
> > Signed-off-by: Jie Zhou <jizh@linux.microsoft.com>
> > Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > ---
> > app/test/has-hugepage.sh | 11 -----------
> > app/test/has_hugepage.py | 26 ++++++++++++++++++++++++++
>
> The file MAINTAINERS should be updated with the new file name.
> I will do it before merging if the rest is OK.
>
Thanks Thomas. If you prefer me to submit a follow up patch to update the maintainers file, just please let me know.
26/01/2022 06:10, Jie Zhou:
> + try:
> + with open("/proc/sys/vm/nr_hugepages") as file_o:
> + content = file_o.read()
> + print(content)
> + except:
> + print("0")
flake8 says this line is over-indented, I will fix.
There is another warning that I won't fix:
app/test/has_hugepage.py:14:5: E722 do not use bare 'except'
deleted file mode 100755
@@ -1,11 +0,0 @@
-#! /bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-if [ "$(uname)" = "Linux" ] ; then
- cat /proc/sys/vm/nr_hugepages || echo 0
-elif [ "$(uname)" = "FreeBSD" ] ; then
- echo 1 # assume FreeBSD always has hugepages
-else
- echo 0
-fi
new file mode 100644
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2021 Microsoft Corporation
+"""This script checks if the system supports huge pages"""
+
+import platform
+import ctypes
+
+os_name = platform.system()
+if os_name == "Linux":
+ try:
+ with open("/proc/sys/vm/nr_hugepages") as file_o:
+ content = file_o.read()
+ print(content)
+ except:
+ print("0")
+
+elif os_name == "FreeBSD":
+ # Assume FreeBSD always has hugepages enabled
+ print("1")
+elif os_name == "Windows":
+ if ctypes.windll.kernel32.GetLargePageMinimum() > 0:
+ print("1")
+ else:
+ print("0")
+else:
+ print("0")
@@ -457,7 +457,7 @@ dpdk_test = executable('dpdk-test',
driver_install_path),
install: true)
-has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
+has_hugepage = run_command(py3, 'has_hugepage.py').stdout().strip() != '0'
message('hugepage availability: @0@'.format(has_hugepage))
# some perf tests (eg: memcpy perf autotest)take very long