Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4212/?format=api
{ "id": 4212, "url": "https://patches.dpdk.org/api/patches/4212/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1427841218-23352-1-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1427841218-23352-1-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1427841218-23352-1-git-send-email-thomas.monjalon@6wind.com", "date": "2015-03-31T22:33:38", "name": "[dpdk-dev] eal: rename --lcores option to --threads", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "0ba8dacab0734bb846fc9e3373daaf70ae24e6bf", "submitter": { "id": 1, "url": "https://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1427841218-23352-1-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/4212/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/4212/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 19AC96A95;\n\tWed, 1 Apr 2015 00:34:27 +0200 (CEST)", "from mail-wg0-f47.google.com (mail-wg0-f47.google.com\n\t[74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 562906942\n\tfor <dev@dpdk.org>; Wed, 1 Apr 2015 00:34:25 +0200 (CEST)", "by wgbdm7 with SMTP id dm7so34790711wgb.1\n\tfor <dev@dpdk.org>; Tue, 31 Mar 2015 15:34:25 -0700 (PDT)", "from localhost.localdomain (136-92-190-109.dsl.ovh.fr.\n\t[109.190.92.136]) by mx.google.com with ESMTPSA id\n\tr14sm475617wiv.13.2015.03.31.15.34.23 for <dev@dpdk.org>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 31 Mar 2015 15:34:24 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:subject:date:message-id;\n\tbh=CP1N3lq4H4Kz2c6LzCOmkhvyNF45h596gCnuYOUJQBw=;\n\tb=i3GfB5HWtjY0GdNWHrPGm3bLa/YN/6OtmdHPWB4GpfGKJbPA1WpNU3RsrvzPbhAr8Z\n\tgOafQYmju0Rsy2kIgkQUo0atn2rkQKb4+MVpamSra+qAleodp2V0eIv6qpCCSeWF//Ma\n\tK2pHN8zDGKKcTKqQJZGnmByR4Au9HpxxPR6PFdJ/73ap0dO2YF/ZTHgyc/U1cM5Bl5aC\n\tdXz8A7BAebsrVk2GgRT1CaIf3xzNGGTzsHigCDR6T6Oa7BFqFH9rDEBT3Zkg8lK6op21\n\tJz0XnYIhef95NHhLXFZenkorItY4DsEZBuYn4sQuxYmZ2xpBUrYFB9h1xPp8gndUGNQ8\n\tVsQA==", "X-Gm-Message-State": "ALoCoQkKOqaB0acpGOrLuMEhQDS5tS/xUHl3shdWP1QDamXexW90ojRip1dVPTG/7BG3YV0Jr/7P", "X-Received": "by 10.180.82.9 with SMTP id e9mr9292029wiy.88.1427841265169;\n\tTue, 31 Mar 2015 15:34:25 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "dev@dpdk.org", "Date": "Wed, 1 Apr 2015 00:33:38 +0200", "Message-Id": "<1427841218-23352-1-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.2.2", "Subject": "[dpdk-dev] [PATCH] eal: rename --lcores option to --threads", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Threads are no longer strictly assigned to a lcore with a 1:1 map.\nSo they really should be called threads.\nThe term lcore should be reserved for a physical hyperthreaded CPU part.\n\nThis patch only renames the option --lcores to avoid confusion from a\nuser perspective. But a deeper cleanup should be done later in EAL:\ne.g. lcore_id should be renamed to thread_id.\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n app/test/test_eal_flags.c | 34 ++++-----\n doc/guides/prog_guide/env_abstraction_layer.rst | 25 ++++---\n doc/guides/testpmd_app_ug/run_app.rst | 10 +--\n lib/librte_eal/common/eal_common_options.c | 96 ++++++++++++-------------\n lib/librte_eal/common/eal_options.h | 4 +-\n 5 files changed, 84 insertions(+), 85 deletions(-)", "diff": "diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c\nindex 0352f87..1096bea 100644\n--- a/app/test/test_eal_flags.c\n+++ b/app/test/test_eal_flags.c\n@@ -512,7 +512,7 @@ test_missing_c_flag(void)\n \n \t/* -c flag but no coremask value */\n \tconst char *argv1[] = { prgname, prefix, mp_flag, \"-n\", \"3\", \"-c\"};\n-\t/* No -c, -l or --lcores flag at all */\n+\t/* No -c, -l or --threads flag at all */\n \tconst char *argv2[] = { prgname, prefix, mp_flag, \"-n\", \"3\"};\n \t/* bad coremask value */\n \tconst char *argv3[] = { prgname, prefix, mp_flag,\n@@ -538,37 +538,37 @@ test_missing_c_flag(void)\n \tconst char *argv11[] = { prgname, prefix, mp_flag,\n \t\t\t\t \"-n\", \"3\", \"-l\", \"1-2,3\" };\n \n-\t/* --lcores flag but no lcores value */\n+\t/* --threads flag but no lcores value */\n \tconst char *argv12[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\" };\n \tconst char *argv13[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \" \" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \" \" };\n \t/* bad lcores value */\n \tconst char *argv14[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"1-3-5\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"1-3-5\" };\n \tconst char *argv15[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"0-1,,2\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"0-1,,2\" };\n \tconst char *argv16[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"0-,1\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"0-,1\" };\n \tconst char *argv17[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"(0-,2-4)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"(0-,2-4)\" };\n \tconst char *argv18[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"(-1,2)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"(-1,2)\" };\n \tconst char *argv19[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"(2-4)@(2-4-6)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"(2-4)@(2-4-6)\" };\n \tconst char *argv20[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"(a,2)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"(a,2)\" };\n \tconst char *argv21[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"1-3@(1,3)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"1-3@(1,3)\" };\n \tconst char *argv22[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"3@((1,3)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"3@((1,3)\" };\n \tconst char *argv23[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"(4-7)=(1,3)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"(4-7)=(1,3)\" };\n \tconst char *argv24[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\", \"[4-7]@(1,3)\" };\n+\t\t\t\t \"-n\", \"3\", \"--threads\", \"[4-7]@(1,3)\" };\n \t/* sanity check of tests - valid lcores value */\n \tconst char *argv25[] = { prgname, prefix, mp_flag,\n-\t\t\t\t \"-n\", \"3\", \"--lcores\",\n+\t\t\t\t \"-n\", \"3\", \"--threads\",\n \t\t\t\t \"0-1,2@(5-7),(3-5)@(0,2),(0,6),7\"};\n \n \tif (launch_proc(argv1) == 0\n@@ -601,7 +601,7 @@ test_missing_c_flag(void)\n \t\treturn -1;\n \t}\n \n-\t/* start --lcores tests */\n+\t/* start --threads tests */\n \tif (launch_proc(argv12) == 0 || launch_proc(argv13) == 0 ||\n \t launch_proc(argv14) == 0 || launch_proc(argv15) == 0 ||\n \t launch_proc(argv16) == 0 || launch_proc(argv17) == 0 ||\ndiff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst\nindex 1b531e2..8509774 100644\n--- a/doc/guides/prog_guide/env_abstraction_layer.rst\n+++ b/doc/guides/prog_guide/env_abstraction_layer.rst\n@@ -232,35 +232,34 @@ For further flexibility, it is useful to set pthread affinity not only to a CPU\n EAL pthread and lcore Affinity\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-The term \"lcore\" refers to an EAL thread, which is really a Linux/FreeBSD pthread.\n \"EAL pthreads\" are created and managed by EAL and execute the tasks issued by *remote_launch*.\n In each EAL pthread, there is a TLS (Thread Local Storage) called *_lcore_id* for unique identification.\n As EAL pthreads usually bind 1:1 to the physical CPU, the *_lcore_id* is typically equal to the CPU ID.\n \n When using multiple pthreads, however, the binding is no longer always 1:1 between an EAL pthread and a specified physical CPU.\n The EAL pthread may have affinity to a CPU set, and as such the *_lcore_id* will not be the same as the CPU ID.\n-For this reason, there is an EAL long option '--lcores' defined to assign the CPU affinity of lcores.\n+For this reason, there is an EAL long option '--threads' defined to assign the CPU affinity of lcores.\n For a specified lcore ID or ID group, the option allows setting the CPU set for that EAL pthread.\n \n The format pattern:\n-\t--lcores='<lcore_set>[@cpu_set][,<lcore_set>[@cpu_set],...]'\n+\t--threads='<thread_set>[@cpu_set][,<thread_set>[@cpu_set],...]'\n \n-'lcore_set' and 'cpu_set' can be a single number, range or a group.\n+'thread_set' and 'cpu_set' can be a single number, range or a group.\n \n A number is a \"digit([0-9]+)\"; a range is \"<number>-<number>\"; a group is \"(<number|range>[,<number|range>,...])\".\n \n-If a '\\@cpu_set' value is not supplied, the value of 'cpu_set' will default to the value of 'lcore_set'.\n+If a '\\@cpu_set' value is not supplied, the value of 'cpu_set' will default to the value of 'thread_set'.\n \n ::\n \n- \tFor example, \"--lcores='1,2@(5-7),(3-5)@(0,2),(0,6),7-8'\" which means start 9 EAL thread;\n- \t lcore 0 runs on cpuset 0x41 (cpu 0,6);\n- \t lcore 1 runs on cpuset 0x2 (cpu 1);\n- \t lcore 2 runs on cpuset 0xe0 (cpu 5,6,7);\n- \t lcore 3,4,5 runs on cpuset 0x5 (cpu 0,2);\n- \t lcore 6 runs on cpuset 0x41 (cpu 0,6);\n- \t lcore 7 runs on cpuset 0x80 (cpu 7);\n- \t lcore 8 runs on cpuset 0x100 (cpu 8).\n+ \tFor example, \"--threads='1,2@(5-7),(3-5)@(0,2),(0,6),7-8'\" which means start 9 EAL thread;\n+ \t thread 0 runs on cpuset 0x41 (cpu 0,6);\n+ \t thread 1 runs on cpuset 0x2 (cpu 1);\n+ \t thread 2 runs on cpuset 0xe0 (cpu 5,6,7);\n+ \t thread 3,4,5 runs on cpuset 0x5 (cpu 0,2);\n+ \t thread 6 runs on cpuset 0x41 (cpu 0,6);\n+ \t thread 7 runs on cpuset 0x80 (cpu 7);\n+ \t thread 8 runs on cpuset 0x100 (cpu 8).\n \n Using this option, for each given lcore ID, the associated CPUs can be assigned.\n It's also compatible with the pattern of corelist('-l') option.\ndiff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst\nindex 6cbbf40..830df56 100644\n--- a/doc/guides/testpmd_app_ug/run_app.rst\n+++ b/doc/guides/testpmd_app_ug/run_app.rst\n@@ -49,18 +49,18 @@ See the DPDK Getting Started Guide for more information on these options.\n The argument format is <c1>[-c2][,c3[-c4],...]\n where c1, c2, etc are core indexes between 0 and 128\n \n-* --lcores COREMAP\n+* --threads COREMAP\n \n- Map lcore set to physical cpu set\n+ Map thread set to physical cpu set\n \n The argument format is\n- '<lcores[@cpus]>[<,lcores[@cpus]>...]'\n+ '<threads[@cpus]>[<,threads[@cpus]>...]'\n \n- lcores and cpus list are grouped by '(' and ')'\n+ threads and cpus list are grouped by '(' and ')'\n Within the group, '-' is used for range separator,\n ',' is used for single number separator.\n '( )' can be omitted for single element group,\n- '@' can be omitted if cpus and lcores have the same value\n+ '@' can be omitted if cpus and threads have the same value\n \n * --master-lcore ID\n \ndiff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex 8fcb1ab..68799d0 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -74,7 +74,6 @@ eal_long_options[] = {\n \t{OPT_FILE_PREFIX, 1, NULL, OPT_FILE_PREFIX_NUM },\n \t{OPT_HELP, 0, NULL, OPT_HELP_NUM },\n \t{OPT_HUGE_DIR, 1, NULL, OPT_HUGE_DIR_NUM },\n-\t{OPT_LCORES, 1, NULL, OPT_LCORES_NUM },\n \t{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM },\n \t{OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },\n \t{OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },\n@@ -86,6 +85,7 @@ eal_long_options[] = {\n \t{OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM },\n \t{OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM },\n \t{OPT_SYSLOG, 1, NULL, OPT_SYSLOG_NUM },\n+\t{OPT_THREADS, 1, NULL, OPT_THREADS_NUM },\n \t{OPT_VDEV, 1, NULL, OPT_VDEV_NUM },\n \t{OPT_VFIO_INTR, 1, NULL, OPT_VFIO_INTR_NUM },\n \t{OPT_VMWARE_TSC_MAP, 0, NULL, OPT_VMWARE_TSC_MAP_NUM },\n@@ -442,42 +442,42 @@ convert_to_cpuset(rte_cpuset_t *cpusetp,\n }\n \n /*\n- * The format pattern: --lcores='<lcores[@cpus]>[<,lcores[@cpus]>...]'\n- * lcores, cpus could be a single digit/range or a group.\n+ * The format pattern: --threads='<threads[@cpus]>[<,threads[@cpus]>...]'\n+ * threads, cpus could be a single digit/range or a group.\n * '(' and ')' are necessary if it's a group.\n- * If not supply '@cpus', the value of cpus uses the same as lcores.\n+ * If not supply '@cpus', the value of cpus uses the same as threads.\n * e.g. '1,2@(5-7),(3-5)@(0,2),(0,6),7-8' means start 9 EAL thread as below\n- * lcore 0 runs on cpuset 0x41 (cpu 0,6)\n- * lcore 1 runs on cpuset 0x2 (cpu 1)\n- * lcore 2 runs on cpuset 0xe0 (cpu 5,6,7)\n- * lcore 3,4,5 runs on cpuset 0x5 (cpu 0,2)\n- * lcore 6 runs on cpuset 0x41 (cpu 0,6)\n- * lcore 7 runs on cpuset 0x80 (cpu 7)\n- * lcore 8 runs on cpuset 0x100 (cpu 8)\n+ * thread 0 runs on cpuset 0x41 (cpu 0,6)\n+ * thread 1 runs on cpuset 0x2 (cpu 1)\n+ * thread 2 runs on cpuset 0xe0 (cpu 5,6,7)\n+ * thread 3,4,5 runs on cpuset 0x5 (cpu 0,2)\n+ * thread 6 runs on cpuset 0x41 (cpu 0,6)\n+ * thread 7 runs on cpuset 0x80 (cpu 7)\n+ * thread 8 runs on cpuset 0x100 (cpu 8)\n */\n static int\n-eal_parse_lcores(const char *lcores)\n+eal_parse_threads(const char *threads)\n {\n \tstruct rte_config *cfg = rte_eal_get_configuration();\n \tstatic uint16_t set[RTE_MAX_LCORE];\n \tunsigned idx = 0;\n \tint i;\n \tunsigned count = 0;\n-\tconst char *lcore_start = NULL;\n+\tconst char *thread_start = NULL;\n \tconst char *end = NULL;\n \tint offset;\n \trte_cpuset_t cpuset;\n \tint lflags = 0;\n \tint ret = -1;\n \n-\tif (lcores == NULL)\n+\tif (threads == NULL)\n \t\treturn -1;\n \n \t/* Remove all blank characters ahead and after */\n-\twhile (isblank(*lcores))\n-\t\tlcores++;\n-\ti = strlen(lcores);\n-\twhile ((i > 0) && isblank(lcores[i - 1]))\n+\twhile (isblank(*threads))\n+\t\tthreads++;\n+\ti = strlen(threads);\n+\twhile ((i > 0) && isblank(threads[i - 1]))\n \t\ti--;\n \n \tCPU_ZERO(&cpuset);\n@@ -491,27 +491,27 @@ eal_parse_lcores(const char *lcores)\n \n \t/* Get list of cores */\n \tdo {\n-\t\twhile (isblank(*lcores))\n-\t\t\tlcores++;\n-\t\tif (*lcores == '\\0')\n+\t\twhile (isblank(*threads))\n+\t\t\tthreads++;\n+\t\tif (*threads == '\\0')\n \t\t\tgoto err;\n \n-\t\t/* record lcore_set start point */\n-\t\tlcore_start = lcores;\n+\t\t/* record thread_set start point */\n+\t\tthread_start = threads;\n \n \t\t/* go across a complete bracket */\n-\t\tif (*lcore_start == '(') {\n-\t\t\tlcores += strcspn(lcores, \")\");\n-\t\t\tif (*lcores++ == '\\0')\n+\t\tif (*thread_start == '(') {\n+\t\t\tthreads += strcspn(threads, \")\");\n+\t\t\tif (*threads++ == '\\0')\n \t\t\t\tgoto err;\n \t\t}\n \n \t\t/* scan the separator '@', ','(next) or '\\0'(finish) */\n-\t\tlcores += strcspn(lcores, \"@,\");\n+\t\tthreads += strcspn(threads, \"@,\");\n \n-\t\tif (*lcores == '@') {\n+\t\tif (*threads == '@') {\n \t\t\t/* explicit assign cpu_set */\n-\t\t\toffset = eal_parse_set(lcores + 1, set, RTE_DIM(set));\n+\t\t\toffset = eal_parse_set(threads + 1, set, RTE_DIM(set));\n \t\t\tif (offset < 0)\n \t\t\t\tgoto err;\n \n@@ -519,31 +519,31 @@ eal_parse_lcores(const char *lcores)\n \t\t\tif (0 > convert_to_cpuset(&cpuset,\n \t\t\t\t\t\t set, RTE_DIM(set)))\n \t\t\t\tgoto err;\n-\t\t\tend = lcores + 1 + offset;\n+\t\t\tend = threads + 1 + offset;\n \t\t} else { /* ',' or '\\0' */\n \t\t\t/* haven't given cpu_set, current loop done */\n-\t\t\tend = lcores;\n+\t\t\tend = threads;\n \n \t\t\t/* go back to check <number>-<number> */\n-\t\t\toffset = strcspn(lcore_start, \"(-\");\n-\t\t\tif (offset < (end - lcore_start) &&\n-\t\t\t *(lcore_start + offset) != '(')\n+\t\t\toffset = strcspn(thread_start, \"(-\");\n+\t\t\tif (offset < (end - thread_start) &&\n+\t\t\t *(thread_start + offset) != '(')\n \t\t\t\tlflags = 1;\n \t\t}\n \n \t\tif (*end != ',' && *end != '\\0')\n \t\t\tgoto err;\n \n-\t\t/* parse lcore_set from start point */\n-\t\tif (0 > eal_parse_set(lcore_start, set, RTE_DIM(set)))\n+\t\t/* parse thread_set from start point */\n+\t\tif (0 > eal_parse_set(thread_start, set, RTE_DIM(set)))\n \t\t\tgoto err;\n \n-\t\t/* without '@', by default using lcore_set as cpu_set */\n-\t\tif (*lcores != '@' &&\n+\t\t/* without '@', by default using thread_set as cpu_set */\n+\t\tif (*threads != '@' &&\n \t\t 0 > convert_to_cpuset(&cpuset, set, RTE_DIM(set)))\n \t\t\tgoto err;\n \n-\t\t/* start to update lcore_set */\n+\t\t/* start to update thread_set */\n \t\tfor (idx = 0; idx < RTE_MAX_LCORE; idx++) {\n \t\t\tif (!set[idx])\n \t\t\t\tcontinue;\n@@ -562,7 +562,7 @@ eal_parse_lcores(const char *lcores)\n \t\t\t\t sizeof(rte_cpuset_t));\n \t\t}\n \n-\t\tlcores = end + 1;\n+\t\tthreads = end + 1;\n \t} while (*end != '\\0');\n \n \tif (count == 0)\n@@ -777,10 +777,10 @@ eal_parse_common_option(int opt, const char *optarg,\n \t\tconf->log_level = log;\n \t\tbreak;\n \t}\n-\tcase OPT_LCORES_NUM:\n-\t\tif (eal_parse_lcores(optarg) < 0) {\n+\tcase OPT_THREADS_NUM:\n+\t\tif (eal_parse_threads(optarg) < 0) {\n \t\t\tRTE_LOG(ERR, EAL, \"invalid parameter for --\"\n-\t\t\t\tOPT_LCORES \"\\n\");\n+\t\t\t\tOPT_THREADS \"\\n\");\n \t\t\treturn -1;\n \t\t}\n \t\tbreak;\n@@ -822,7 +822,7 @@ eal_check_common_options(struct internal_config *internal_cfg)\n \n \tif (!lcores_parsed) {\n \t\tRTE_LOG(ERR, EAL, \"CPU cores must be enabled with options \"\n-\t\t\t\"-c, -l or --lcores\\n\");\n+\t\t\t\"-c, -l or --threads\\n\");\n \t\treturn -1;\n \t}\n \tif (cfg->lcore_role[cfg->master_lcore] != ROLE_RTE) {\n@@ -876,14 +876,14 @@ eal_common_usage(void)\n \t \" -l CORELIST List of cores to run on\\n\"\n \t \" The argument format is <c1>[-c2][,c3[-c4],...]\\n\"\n \t \" where c1, c2, etc are core indexes between 0 and %d\\n\"\n-\t \" --\"OPT_LCORES\" COREMAP Map lcore set to physical cpu set\\n\"\n+\t \" --\"OPT_THREADS\" COREMAP Map thread set to physical cpu set\\n\"\n \t \" The argument format is\\n\"\n-\t \" '<lcores[@cpus]>[<,lcores[@cpus]>...]'\\n\"\n-\t \" lcores and cpus list are grouped by '(' and ')'\\n\"\n+\t \" '<threads[@cpus]>[<,threads[@cpus]>...]'\\n\"\n+\t \" threads and cpus list are grouped by '(' and ')'\\n\"\n \t \" Within the group, '-' is used for range separator,\\n\"\n \t \" ',' is used for single number separator.\\n\"\n \t \" '( )' can be omitted for single element group,\\n\"\n-\t \" '@' can be omitted if cpus and lcores have the same value\\n\"\n+\t \" '@' can be omitted if cpus and threads have the same value\\n\"\n \t \" --\"OPT_MASTER_LCORE\" ID Core ID that is used as master\\n\"\n \t \" -n CHANNELS Number of memory channels\\n\"\n \t \" -m MB Memory to allocate (see also --\"OPT_SOCKET_MEM\")\\n\"\ndiff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h\nindex f6714d9..d979c62 100644\n--- a/lib/librte_eal/common/eal_options.h\n+++ b/lib/librte_eal/common/eal_options.h\n@@ -53,8 +53,6 @@ enum {\n \tOPT_FILE_PREFIX_NUM,\n #define OPT_HUGE_DIR \"huge-dir\"\n \tOPT_HUGE_DIR_NUM,\n-#define OPT_LCORES \"lcores\"\n-\tOPT_LCORES_NUM,\n #define OPT_LOG_LEVEL \"log-level\"\n \tOPT_LOG_LEVEL_NUM,\n #define OPT_MASTER_LCORE \"master-lcore\"\n@@ -73,6 +71,8 @@ enum {\n \tOPT_SOCKET_MEM_NUM,\n #define OPT_SYSLOG \"syslog\"\n \tOPT_SYSLOG_NUM,\n+#define OPT_THREADS \"threads\"\n+\tOPT_THREADS_NUM,\n #define OPT_VDEV \"vdev\"\n \tOPT_VDEV_NUM,\n #define OPT_VFIO_INTR \"vfio-intr\"\n", "prefixes": [ "dpdk-dev" ] }