[dpdk-dev,v6,1/6] Move common functions in eal_thread.c
Commit Message
Changes in v6
Remove RTE_EXEC_ENV_BSDAPP from eal_common_thread.c file.
Add pthread_setname_np/pthread_set_name_np for Linux/FreeBSD
respectively. Plan to use _getname_ in RTE_LOG when available.
Use existing rte_get_systid() in RTE_LOG to print thread_id.
Changes in v5
Rebase to latest code.
Changes in v4
None
Changes in v3
Changed subject to be more explicit on file name inclusion.
Changes in v2
None
Changes in v1
eal_thread.c has minor differences between Linux and BSD, move
entire file into common directory.
Use RTE_EXEC_ENV_BSDAPP to differentiate on minor differences.
Rename eal_thread.c to eal_common_thread.c
Makefile changes to reflect file move and name change.
Fix checkpatch warnings.
Signed-off-by: Ravi Kerur <rkerur@gmail.com>
---
examples/vhost/main.c | 18 ++-
examples/vhost_xen/main.c | 18 ++-
lib/librte_eal/bsdapp/eal/Makefile | 2 +-
lib/librte_eal/bsdapp/eal/eal.c | 7 +
lib/librte_eal/bsdapp/eal/eal_thread.c | 152 ---------------------
lib/librte_eal/common/eal_common_thread.c | 147 +++++++++++++++++++-
lib/librte_eal/common/eal_thread.h | 5 +
lib/librte_eal/linuxapp/eal/Makefile | 2 +
lib/librte_eal/linuxapp/eal/eal.c | 10 ++
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 11 ++
lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 22 ++-
lib/librte_eal/linuxapp/eal/eal_thread.c | 152 +--------------------
lib/librte_eal/linuxapp/eal/eal_timer.c | 15 +-
13 files changed, 250 insertions(+), 311 deletions(-)
Comments
On Sat, Apr 18, 2015 at 12:43:06PM -0700, Ravi Kerur wrote:
> Changes in v6
> Remove RTE_EXEC_ENV_BSDAPP from eal_common_thread.c file.
> Add pthread_setname_np/pthread_set_name_np for Linux/FreeBSD
> respectively. Plan to use _getname_ in RTE_LOG when available.
> Use existing rte_get_systid() in RTE_LOG to print thread_id.
Hi Ravi
I think the change to add names to the threads might be better in an existing
patch as it is separate from the change of making the code common.
[The code changes for the names also seems to have issues with it, as
described in comments below]
>
> Changes in v5
> Rebase to latest code.
>
> Changes in v4
> None
>
> Changes in v3
> Changed subject to be more explicit on file name inclusion.
>
> Changes in v2
> None
>
> Changes in v1
> eal_thread.c has minor differences between Linux and BSD, move
> entire file into common directory.
> Use RTE_EXEC_ENV_BSDAPP to differentiate on minor differences.
> Rename eal_thread.c to eal_common_thread.c
> Makefile changes to reflect file move and name change.
> Fix checkpatch warnings.
>
> Signed-off-by: Ravi Kerur <rkerur@gmail.com>
> ---
> examples/vhost/main.c | 18 ++-
> examples/vhost_xen/main.c | 18 ++-
> lib/librte_eal/bsdapp/eal/Makefile | 2 +-
> lib/librte_eal/bsdapp/eal/eal.c | 7 +
> lib/librte_eal/bsdapp/eal/eal_thread.c | 152 ---------------------
> lib/librte_eal/common/eal_common_thread.c | 147 +++++++++++++++++++-
> lib/librte_eal/common/eal_thread.h | 5 +
> lib/librte_eal/linuxapp/eal/Makefile | 2 +
> lib/librte_eal/linuxapp/eal/eal.c | 10 ++
> lib/librte_eal/linuxapp/eal/eal_interrupts.c | 11 ++
> lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 22 ++-
> lib/librte_eal/linuxapp/eal/eal_thread.c | 152 +--------------------
> lib/librte_eal/linuxapp/eal/eal_timer.c | 15 +-
> 13 files changed, 250 insertions(+), 311 deletions(-)
>
<<<snip>>>
> --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> @@ -34,6 +34,7 @@
> #include <string.h>
> #include <fcntl.h>
> #include <sys/socket.h>
> +#include <pthread.h>
>
> /* sys/un.h with __USE_MISC uses strlen, which is unsafe */
> #ifdef __USE_MISC
> @@ -54,6 +55,7 @@
>
> #include "eal_filesystem.h"
> #include "eal_pci_init.h"
> +#include "eal_thread.h"
>
> /**
> * @file
> @@ -374,20 +376,36 @@ int
> pci_vfio_mp_sync_setup(void)
> {
> int ret;
> + char thread_name[RTE_THREAD_NAME_LEN];
>
> if (vfio_mp_sync_socket_setup() < 0) {
> RTE_LOG(ERR, EAL, "Failed to set up local socket!\n");
> return -1;
> }
>
> + snprintf(thread_name, RTE_THREAD_NAME_LEN,
> + "pci-vfio-mp-sync");
This string is too long. According to the man page (Fedora Linux):
"The thread name is a meaningful C language string, whose length is restricted to 16 charac‐
ters, including the terminating null byte ('\0')."
I make the string 16+ null, i.e. 17 in total.
> +
> ret = pthread_create(&socket_thread, NULL,
> pci_vfio_mp_sync_thread, NULL);
> if (ret) {
> - RTE_LOG(ERR, EAL, "Failed to create thread for communication with "
> - "secondary processes!\n");
> + RTE_LOG(ERR, EAL,
> + "Failed to create thread for communication with "
> + "secondary processes!\n");
Should not split the error message string across multiple lines as it breaks
git grep searches for the error message.
> + close(mp_socket_fd);
> + return -1;
> + }
> +
> + ret = pthread_setname_np(socket_thread, thread_name);
> +
> + if (ret) {
> + RTE_LOG(ERR, EAL,
> + "Failed to set thread name for "
> + "secondary processes!\n");
> close(mp_socket_fd);
> return -1;
Do we really want to return with an error here. Right now I can't run any apps
since I get an error on init of PCI - due to the name string being too long for
Linux. (Things seem fine on BSD). Failing to name a thread doesn't seem to be
a fatal error IMHO.
Regards,
/Bruce
On Tue, Apr 21, 2015 at 7:25 AM, Bruce Richardson <
bruce.richardson@intel.com> wrote:
> On Sat, Apr 18, 2015 at 12:43:06PM -0700, Ravi Kerur wrote:
> > Changes in v6
> > Remove RTE_EXEC_ENV_BSDAPP from eal_common_thread.c file.
> > Add pthread_setname_np/pthread_set_name_np for Linux/FreeBSD
> > respectively. Plan to use _getname_ in RTE_LOG when available.
> > Use existing rte_get_systid() in RTE_LOG to print thread_id.
>
> Hi Ravi
>
> I think the change to add names to the threads might be better in an
> existing
> patch as it is separate from the change of making the code common.
> [The code changes for the names also seems to have issues with it, as
> described in comments below]
>
Hi Bruce,
Thanks for your comments. Linux/FreeBSD has different APIs
pthread_setname_np and pthread_getname_np in Linux
pthread_set_name_np in FreeBSD. FreeBSD has no "_get_name_" counterpart API.
API signatures are different as well. Current plan is to use
"_setname_"/"_set_name_" appropriately and leave out "_getname_" until it
is available in FreeBSD.
Are you suggesting to use separate patch for set/get pthread names?
More inline.
> >
> > Changes in v5
> > Rebase to latest code.
> >
> > Changes in v4
> > None
> >
> > Changes in v3
> > Changed subject to be more explicit on file name inclusion.
> >
> > Changes in v2
> > None
> >
> > Changes in v1
> > eal_thread.c has minor differences between Linux and BSD, move
> > entire file into common directory.
> > Use RTE_EXEC_ENV_BSDAPP to differentiate on minor differences.
> > Rename eal_thread.c to eal_common_thread.c
> > Makefile changes to reflect file move and name change.
> > Fix checkpatch warnings.
> >
> > Signed-off-by: Ravi Kerur <rkerur@gmail.com>
> > ---
> > examples/vhost/main.c | 18 ++-
> > examples/vhost_xen/main.c | 18 ++-
> > lib/librte_eal/bsdapp/eal/Makefile | 2 +-
> > lib/librte_eal/bsdapp/eal/eal.c | 7 +
> > lib/librte_eal/bsdapp/eal/eal_thread.c | 152
> ---------------------
> > lib/librte_eal/common/eal_common_thread.c | 147
> +++++++++++++++++++-
> > lib/librte_eal/common/eal_thread.h | 5 +
> > lib/librte_eal/linuxapp/eal/Makefile | 2 +
> > lib/librte_eal/linuxapp/eal/eal.c | 10 ++
> > lib/librte_eal/linuxapp/eal/eal_interrupts.c | 11 ++
> > lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 22 ++-
> > lib/librte_eal/linuxapp/eal/eal_thread.c | 152
> +--------------------
> > lib/librte_eal/linuxapp/eal/eal_timer.c | 15 +-
> > 13 files changed, 250 insertions(+), 311 deletions(-)
> >
>
> <<<snip>>>
>
> > --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > @@ -34,6 +34,7 @@
> > #include <string.h>
> > #include <fcntl.h>
> > #include <sys/socket.h>
> > +#include <pthread.h>
> >
> > /* sys/un.h with __USE_MISC uses strlen, which is unsafe */
> > #ifdef __USE_MISC
> > @@ -54,6 +55,7 @@
> >
> > #include "eal_filesystem.h"
> > #include "eal_pci_init.h"
> > +#include "eal_thread.h"
> >
> > /**
> > * @file
> > @@ -374,20 +376,36 @@ int
> > pci_vfio_mp_sync_setup(void)
> > {
> > int ret;
> > + char thread_name[RTE_THREAD_NAME_LEN];
> >
> > if (vfio_mp_sync_socket_setup() < 0) {
> > RTE_LOG(ERR, EAL, "Failed to set up local socket!\n");
> > return -1;
> > }
> >
> > + snprintf(thread_name, RTE_THREAD_NAME_LEN,
> > + "pci-vfio-mp-sync");
>
> This string is too long. According to the man page (Fedora Linux):
> "The thread name is a meaningful C language string, whose length is
> restricted to 16 charac‐
> ters, including the terminating null byte ('\0')."
> I make the string 16+ null, i.e. 17 in total.
>
My mistake, will fix it.
>
> > +
> > ret = pthread_create(&socket_thread, NULL,
> > pci_vfio_mp_sync_thread, NULL);
> > if (ret) {
> > - RTE_LOG(ERR, EAL, "Failed to create thread for
> communication with "
> > - "secondary processes!\n");
> > + RTE_LOG(ERR, EAL,
> > + "Failed to create thread for communication with "
> > + "secondary processes!\n");
>
> Should not split the error message string across multiple lines as it
> breaks
> git grep searches for the error message.
>
Will fix it.
>
> > + close(mp_socket_fd);
> > + return -1;
> > + }
> > +
> > + ret = pthread_setname_np(socket_thread, thread_name);
> > +
> > + if (ret) {
> > + RTE_LOG(ERR, EAL,
> > + "Failed to set thread name for "
> > + "secondary processes!\n");
> > close(mp_socket_fd);
> > return -1;
>
> Do we really want to return with an error here. Right now I can't run any
> apps
> since I get an error on init of PCI - due to the name string being too
> long for
> Linux. (Things seem fine on BSD). Failing to name a thread doesn't seem to
> be
> a fatal error IMHO.
>
>
When I coded understanding was that pthread _set_ APIs should not fail
(excluding bugs whilst calling the API), since _get_ APIs will be called
subsequently for logging and debugging it will not be of any help if I let
program continue after _set_ failure. I will change the code to just log an
error and return success.
Thanks,
Ravi
> Regards,
> /Bruce
>
>
On Tue, Apr 21, 2015 at 12:28:24PM -0700, Ravi Kerur wrote:
> On Tue, Apr 21, 2015 at 7:25 AM, Bruce Richardson <
> bruce.richardson@intel.com> wrote:
>
> > On Sat, Apr 18, 2015 at 12:43:06PM -0700, Ravi Kerur wrote:
> > > Changes in v6
> > > Remove RTE_EXEC_ENV_BSDAPP from eal_common_thread.c file.
> > > Add pthread_setname_np/pthread_set_name_np for Linux/FreeBSD
> > > respectively. Plan to use _getname_ in RTE_LOG when available.
> > > Use existing rte_get_systid() in RTE_LOG to print thread_id.
> >
> > Hi Ravi
> >
> > I think the change to add names to the threads might be better in an
> > existing
> > patch as it is separate from the change of making the code common.
> > [The code changes for the names also seems to have issues with it, as
> > described in comments below]
> >
>
> Hi Bruce,
>
> Thanks for your comments. Linux/FreeBSD has different APIs
>
> pthread_setname_np and pthread_getname_np in Linux
> pthread_set_name_np in FreeBSD. FreeBSD has no "_get_name_" counterpart API.
>
> API signatures are different as well. Current plan is to use
> "_setname_"/"_set_name_" appropriately and leave out "_getname_" until it
> is available in FreeBSD.
>
> Are you suggesting to use separate patch for set/get pthread names?
Yes, I think that would be better. Have one patch just for moving the code
to a common location, then a second patch for adding in thread names since its
really a discrete unit of work. Apart from the bug with Linux vfio thread, the
idea and implementation looks really good, and something we would like to have.
/Bruce
>
> More inline.
>
>
> > >
> > > Changes in v5
> > > Rebase to latest code.
> > >
> > > Changes in v4
> > > None
> > >
> > > Changes in v3
> > > Changed subject to be more explicit on file name inclusion.
> > >
> > > Changes in v2
> > > None
> > >
> > > Changes in v1
> > > eal_thread.c has minor differences between Linux and BSD, move
> > > entire file into common directory.
> > > Use RTE_EXEC_ENV_BSDAPP to differentiate on minor differences.
> > > Rename eal_thread.c to eal_common_thread.c
> > > Makefile changes to reflect file move and name change.
> > > Fix checkpatch warnings.
> > >
> > > Signed-off-by: Ravi Kerur <rkerur@gmail.com>
> > > ---
> > > examples/vhost/main.c | 18 ++-
> > > examples/vhost_xen/main.c | 18 ++-
> > > lib/librte_eal/bsdapp/eal/Makefile | 2 +-
> > > lib/librte_eal/bsdapp/eal/eal.c | 7 +
> > > lib/librte_eal/bsdapp/eal/eal_thread.c | 152
> > ---------------------
> > > lib/librte_eal/common/eal_common_thread.c | 147
> > +++++++++++++++++++-
> > > lib/librte_eal/common/eal_thread.h | 5 +
> > > lib/librte_eal/linuxapp/eal/Makefile | 2 +
> > > lib/librte_eal/linuxapp/eal/eal.c | 10 ++
> > > lib/librte_eal/linuxapp/eal/eal_interrupts.c | 11 ++
> > > lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 22 ++-
> > > lib/librte_eal/linuxapp/eal/eal_thread.c | 152
> > +--------------------
> > > lib/librte_eal/linuxapp/eal/eal_timer.c | 15 +-
> > > 13 files changed, 250 insertions(+), 311 deletions(-)
> > >
> >
> > <<<snip>>>
> >
> > > --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > > @@ -34,6 +34,7 @@
> > > #include <string.h>
> > > #include <fcntl.h>
> > > #include <sys/socket.h>
> > > +#include <pthread.h>
> > >
> > > /* sys/un.h with __USE_MISC uses strlen, which is unsafe */
> > > #ifdef __USE_MISC
> > > @@ -54,6 +55,7 @@
> > >
> > > #include "eal_filesystem.h"
> > > #include "eal_pci_init.h"
> > > +#include "eal_thread.h"
> > >
> > > /**
> > > * @file
> > > @@ -374,20 +376,36 @@ int
> > > pci_vfio_mp_sync_setup(void)
> > > {
> > > int ret;
> > > + char thread_name[RTE_THREAD_NAME_LEN];
> > >
> > > if (vfio_mp_sync_socket_setup() < 0) {
> > > RTE_LOG(ERR, EAL, "Failed to set up local socket!\n");
> > > return -1;
> > > }
> > >
> > > + snprintf(thread_name, RTE_THREAD_NAME_LEN,
> > > + "pci-vfio-mp-sync");
> >
> > This string is too long. According to the man page (Fedora Linux):
> > "The thread name is a meaningful C language string, whose length is
> > restricted to 16 charac‐
> > ters, including the terminating null byte ('\0')."
> > I make the string 16+ null, i.e. 17 in total.
> >
>
> My mistake, will fix it.
>
> >
> > > +
> > > ret = pthread_create(&socket_thread, NULL,
> > > pci_vfio_mp_sync_thread, NULL);
> > > if (ret) {
> > > - RTE_LOG(ERR, EAL, "Failed to create thread for
> > communication with "
> > > - "secondary processes!\n");
> > > + RTE_LOG(ERR, EAL,
> > > + "Failed to create thread for communication with "
> > > + "secondary processes!\n");
> >
> > Should not split the error message string across multiple lines as it
> > breaks
> > git grep searches for the error message.
> >
>
> Will fix it.
>
> >
> > > + close(mp_socket_fd);
> > > + return -1;
> > > + }
> > > +
> > > + ret = pthread_setname_np(socket_thread, thread_name);
> > > +
> > > + if (ret) {
> > > + RTE_LOG(ERR, EAL,
> > > + "Failed to set thread name for "
> > > + "secondary processes!\n");
> > > close(mp_socket_fd);
> > > return -1;
> >
> > Do we really want to return with an error here. Right now I can't run any
> > apps
> > since I get an error on init of PCI - due to the name string being too
> > long for
> > Linux. (Things seem fine on BSD). Failing to name a thread doesn't seem to
> > be
> > a fatal error IMHO.
> >
> >
> When I coded understanding was that pthread _set_ APIs should not fail
> (excluding bugs whilst calling the API), since _get_ APIs will be called
> subsequently for logging and debugging it will not be of any help if I let
> program continue after _set_ failure. I will change the code to just log an
> error and return success.
>
> Thanks,
> Ravi
>
>
> > Regards,
> > /Bruce
> >
> >
On Wed, Apr 22, 2015 at 2:03 AM, Bruce Richardson <
bruce.richardson@intel.com> wrote:
> On Tue, Apr 21, 2015 at 12:28:24PM -0700, Ravi Kerur wrote:
> > On Tue, Apr 21, 2015 at 7:25 AM, Bruce Richardson <
> > bruce.richardson@intel.com> wrote:
> >
> > > On Sat, Apr 18, 2015 at 12:43:06PM -0700, Ravi Kerur wrote:
> > > > Changes in v6
> > > > Remove RTE_EXEC_ENV_BSDAPP from eal_common_thread.c file.
> > > > Add pthread_setname_np/pthread_set_name_np for Linux/FreeBSD
> > > > respectively. Plan to use _getname_ in RTE_LOG when available.
> > > > Use existing rte_get_systid() in RTE_LOG to print thread_id.
> > >
> > > Hi Ravi
> > >
> > > I think the change to add names to the threads might be better in an
> > > existing
> > > patch as it is separate from the change of making the code common.
> > > [The code changes for the names also seems to have issues with it, as
> > > described in comments below]
> > >
> >
> > Hi Bruce,
> >
> > Thanks for your comments. Linux/FreeBSD has different APIs
> >
> > pthread_setname_np and pthread_getname_np in Linux
> > pthread_set_name_np in FreeBSD. FreeBSD has no "_get_name_" counterpart
> API.
> >
> > API signatures are different as well. Current plan is to use
> > "_setname_"/"_set_name_" appropriately and leave out "_getname_" until it
> > is available in FreeBSD.
> >
> > Are you suggesting to use separate patch for set/get pthread names?
>
> Yes, I think that would be better. Have one patch just for moving the code
> to a common location, then a second patch for adding in thread names since
> its
> really a discrete unit of work. Apart from the bug with Linux vfio thread,
> the
> idea and implementation looks really good, and something we would like to
> have.
>
Thanks Bruce. I will take care of removing it from EAL common patch series
and send out a separate patch for this.
>
> /Bruce
>
> >
> > More inline.
> >
> >
> > > >
> > > > Changes in v5
> > > > Rebase to latest code.
> > > >
> > > > Changes in v4
> > > > None
> > > >
> > > > Changes in v3
> > > > Changed subject to be more explicit on file name inclusion.
> > > >
> > > > Changes in v2
> > > > None
> > > >
> > > > Changes in v1
> > > > eal_thread.c has minor differences between Linux and BSD, move
> > > > entire file into common directory.
> > > > Use RTE_EXEC_ENV_BSDAPP to differentiate on minor differences.
> > > > Rename eal_thread.c to eal_common_thread.c
> > > > Makefile changes to reflect file move and name change.
> > > > Fix checkpatch warnings.
> > > >
> > > > Signed-off-by: Ravi Kerur <rkerur@gmail.com>
> > > > ---
> > > > examples/vhost/main.c | 18 ++-
> > > > examples/vhost_xen/main.c | 18 ++-
> > > > lib/librte_eal/bsdapp/eal/Makefile | 2 +-
> > > > lib/librte_eal/bsdapp/eal/eal.c | 7 +
> > > > lib/librte_eal/bsdapp/eal/eal_thread.c | 152
> > > ---------------------
> > > > lib/librte_eal/common/eal_common_thread.c | 147
> > > +++++++++++++++++++-
> > > > lib/librte_eal/common/eal_thread.h | 5 +
> > > > lib/librte_eal/linuxapp/eal/Makefile | 2 +
> > > > lib/librte_eal/linuxapp/eal/eal.c | 10 ++
> > > > lib/librte_eal/linuxapp/eal/eal_interrupts.c | 11 ++
> > > > lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c | 22 ++-
> > > > lib/librte_eal/linuxapp/eal/eal_thread.c | 152
> > > +--------------------
> > > > lib/librte_eal/linuxapp/eal/eal_timer.c | 15 +-
> > > > 13 files changed, 250 insertions(+), 311 deletions(-)
> > > >
> > >
> > > <<<snip>>>
> > >
> > > > --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > > > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
> > > > @@ -34,6 +34,7 @@
> > > > #include <string.h>
> > > > #include <fcntl.h>
> > > > #include <sys/socket.h>
> > > > +#include <pthread.h>
> > > >
> > > > /* sys/un.h with __USE_MISC uses strlen, which is unsafe */
> > > > #ifdef __USE_MISC
> > > > @@ -54,6 +55,7 @@
> > > >
> > > > #include "eal_filesystem.h"
> > > > #include "eal_pci_init.h"
> > > > +#include "eal_thread.h"
> > > >
> > > > /**
> > > > * @file
> > > > @@ -374,20 +376,36 @@ int
> > > > pci_vfio_mp_sync_setup(void)
> > > > {
> > > > int ret;
> > > > + char thread_name[RTE_THREAD_NAME_LEN];
> > > >
> > > > if (vfio_mp_sync_socket_setup() < 0) {
> > > > RTE_LOG(ERR, EAL, "Failed to set up local socket!\n");
> > > > return -1;
> > > > }
> > > >
> > > > + snprintf(thread_name, RTE_THREAD_NAME_LEN,
> > > > + "pci-vfio-mp-sync");
> > >
> > > This string is too long. According to the man page (Fedora Linux):
> > > "The thread name is a meaningful C language string, whose length is
> > > restricted to 16 charac‐
> > > ters, including the terminating null byte ('\0')."
> > > I make the string 16+ null, i.e. 17 in total.
> > >
> >
> > My mistake, will fix it.
> >
> > >
> > > > +
> > > > ret = pthread_create(&socket_thread, NULL,
> > > > pci_vfio_mp_sync_thread, NULL);
> > > > if (ret) {
> > > > - RTE_LOG(ERR, EAL, "Failed to create thread for
> > > communication with "
> > > > - "secondary processes!\n");
> > > > + RTE_LOG(ERR, EAL,
> > > > + "Failed to create thread for communication
> with "
> > > > + "secondary processes!\n");
> > >
> > > Should not split the error message string across multiple lines as it
> > > breaks
> > > git grep searches for the error message.
> > >
> >
> > Will fix it.
> >
> > >
> > > > + close(mp_socket_fd);
> > > > + return -1;
> > > > + }
> > > > +
> > > > + ret = pthread_setname_np(socket_thread, thread_name);
> > > > +
> > > > + if (ret) {
> > > > + RTE_LOG(ERR, EAL,
> > > > + "Failed to set thread name for "
> > > > + "secondary processes!\n");
> > > > close(mp_socket_fd);
> > > > return -1;
> > >
> > > Do we really want to return with an error here. Right now I can't run
> any
> > > apps
> > > since I get an error on init of PCI - due to the name string being too
> > > long for
> > > Linux. (Things seem fine on BSD). Failing to name a thread doesn't
> seem to
> > > be
> > > a fatal error IMHO.
> > >
> > >
> > When I coded understanding was that pthread _set_ APIs should not fail
> > (excluding bugs whilst calling the API), since _get_ APIs will be called
> > subsequently for logging and debugging it will not be of any help if I
> let
> > program continue after _set_ failure. I will change the code to just log
> an
> > error and return success.
> >
> > Thanks,
> > Ravi
> >
> >
> > > Regards,
> > > /Bruce
> > >
> > >
>
@@ -2891,6 +2891,7 @@ main(int argc, char *argv[])
uint8_t portid;
uint16_t queue_id;
static pthread_t tid;
+ char thread_name[RTE_THREAD_NAME_LEN];
/* init EAL */
ret = rte_eal_init(argc, argv);
@@ -3017,8 +3018,21 @@ main(int argc, char *argv[])
memset(&dev_statistics, 0, sizeof(dev_statistics));
/* Enable stats if the user option is set. */
- if (enable_stats)
- pthread_create(&tid, NULL, (void*)print_stats, NULL );
+ if (enable_stats) {
+ snprintf(thread_name, RTE_THREAD_NAME_LEN, "vhost-stats");
+
+ ret = pthread_create(&tid, NULL, (void*)print_stats, NULL );
+
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot create print-stats thread\n");
+
+ ret = pthread_setname_np(tid, thread_name);
+
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot set print-stats name\n");
+ }
/* Launch all data cores. */
if (zero_copy == 0) {
@@ -1433,6 +1433,7 @@ main(int argc, char *argv[])
int ret;
uint8_t portid;
static pthread_t tid;
+ char thread_name[RTE_THREAD_NAME_LEN];
/* init EAL */
ret = rte_eal_init(argc, argv);
@@ -1505,9 +1506,24 @@ main(int argc, char *argv[])
memset(&dev_statistics, 0, sizeof(dev_statistics));
/* Enable stats if the user option is set. */
- if (enable_stats)
+ if (enable_stats) {
+
+ snprintf(thread_name, RTE_THREAD_NAME_LEN,
+ "vhost-xen-stats");
+
pthread_create(&tid, NULL, (void*)print_stats, NULL );
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot create print-stats thread\n");
+
+ ret = pthread_setname_np(tid, thread_name);
+
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot set print-stats name\n");
+ }
+
/* Launch all data cores. */
RTE_LCORE_FOREACH_SLAVE(lcore_id) {
rte_eal_remote_launch(switch_worker, mbuf_pool, lcore_id);
@@ -87,7 +87,7 @@ CFLAGS_eal_common_log.o := -D_GNU_SOURCE
# workaround for a gcc bug with noreturn attribute
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_eal_thread.o += -Wno-return-type
+CFLAGS_eal_common_thread.o += -Wno-return-type
CFLAGS_eal_hpet.o += -Wno-return-type
endif
@@ -437,6 +437,7 @@ rte_eal_init(int argc, char **argv)
int i, fctret, ret;
pthread_t thread_id;
static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
+ char thread_name[RTE_THREAD_NAME_LEN];
char cpuset[RTE_CPU_AFFINITY_STR_LEN];
if (!rte_atomic32_test_and_set(&run_once))
@@ -525,6 +526,9 @@ rte_eal_init(int argc, char **argv)
RTE_LCORE_FOREACH_SLAVE(i) {
+ snprintf(thread_name, RTE_THREAD_NAME_LEN,
+ "lcore-slave-%d", i);
+
/*
* create communication pipes between master thread
* and children
@@ -541,6 +545,9 @@ rte_eal_init(int argc, char **argv)
eal_thread_loop, NULL);
if (ret != 0)
rte_panic("Cannot create thread\n");
+
+ pthread_set_name_np(
+ lcore_config[i].thread_id, (const char *)thread_name);
}
/*
@@ -35,163 +35,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-#include <unistd.h>
-#include <sched.h>
-#include <pthread_np.h>
-#include <sys/queue.h>
#include <sys/thr.h>
-#include <rte_debug.h>
-#include <rte_atomic.h>
-#include <rte_launch.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_per_lcore.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-
#include "eal_private.h"
#include "eal_thread.h"
-RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY;
-RTE_DEFINE_PER_LCORE(unsigned, _socket_id) = (unsigned)SOCKET_ID_ANY;
-RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
-
-/*
- * Send a message to a slave lcore identified by slave_id to call a
- * function f with argument arg. Once the execution is done, the
- * remote lcore switch in FINISHED state.
- */
-int
-rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)
-{
- int n;
- char c = 0;
- int m2s = lcore_config[slave_id].pipe_master2slave[1];
- int s2m = lcore_config[slave_id].pipe_slave2master[0];
-
- if (lcore_config[slave_id].state != WAIT)
- return -EBUSY;
-
- lcore_config[slave_id].f = f;
- lcore_config[slave_id].arg = arg;
-
- /* send message */
- n = 0;
- while (n == 0 || (n < 0 && errno == EINTR))
- n = write(m2s, &c, 1);
- if (n < 0)
- rte_panic("cannot write on configuration pipe\n");
-
- /* wait ack */
- do {
- n = read(s2m, &c, 1);
- } while (n < 0 && errno == EINTR);
-
- if (n <= 0)
- rte_panic("cannot read on configuration pipe\n");
-
- return 0;
-}
-
-/* set affinity for current thread */
-static int
-eal_thread_set_affinity(void)
-{
- unsigned lcore_id = rte_lcore_id();
-
- /* acquire system unique id */
- rte_gettid();
-
- /* update EAL thread core affinity */
- return rte_thread_set_affinity(&lcore_config[lcore_id].cpuset);
-}
-
-void eal_thread_init_master(unsigned lcore_id)
-{
- /* set the lcore ID in per-lcore memory area */
- RTE_PER_LCORE(_lcore_id) = lcore_id;
-
- /* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
- rte_panic("cannot set affinity\n");
-}
-
-/* main loop of threads */
-__attribute__((noreturn)) void *
-eal_thread_loop(__attribute__((unused)) void *arg)
-{
- char c;
- int n, ret;
- unsigned lcore_id;
- pthread_t thread_id;
- int m2s, s2m;
- char cpuset[RTE_CPU_AFFINITY_STR_LEN];
-
- thread_id = pthread_self();
-
- /* retrieve our lcore_id from the configuration structure */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
- if (thread_id == lcore_config[lcore_id].thread_id)
- break;
- }
- if (lcore_id == RTE_MAX_LCORE)
- rte_panic("cannot retrieve lcore id\n");
-
- m2s = lcore_config[lcore_id].pipe_master2slave[0];
- s2m = lcore_config[lcore_id].pipe_slave2master[1];
-
- /* set the lcore ID in per-lcore memory area */
- RTE_PER_LCORE(_lcore_id) = lcore_id;
-
- /* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
- rte_panic("cannot set affinity\n");
-
- ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN);
-
- RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
- lcore_id, thread_id, cpuset, ret == 0 ? "" : "...");
-
- /* read on our pipe to get commands */
- while (1) {
- void *fct_arg;
-
- /* wait command */
- do {
- n = read(m2s, &c, 1);
- } while (n < 0 && errno == EINTR);
-
- if (n <= 0)
- rte_panic("cannot read on configuration pipe\n");
-
- lcore_config[lcore_id].state = RUNNING;
-
- /* send ack */
- n = 0;
- while (n == 0 || (n < 0 && errno == EINTR))
- n = write(s2m, &c, 1);
- if (n < 0)
- rte_panic("cannot write on configuration pipe\n");
-
- if (lcore_config[lcore_id].f == NULL)
- rte_panic("NULL function pointer\n");
-
- /* call the function and store the return value */
- fct_arg = lcore_config[lcore_id].arg;
- ret = lcore_config[lcore_id].f(fct_arg);
- lcore_config[lcore_id].ret = ret;
- rte_wmb();
- lcore_config[lcore_id].state = FINISHED;
- }
-
- /* never reached */
- /* pthread_exit(NULL); */
- /* return NULL; */
-}
-
/* require calling thread tid by gettid() */
int rte_sys_gettid(void)
{
@@ -31,11 +31,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
-#include <pthread.h>
+#include <sys/queue.h>
#include <sched.h>
#include <assert.h>
#include <string.h>
@@ -43,10 +44,21 @@
#include <rte_lcore.h>
#include <rte_memory.h>
#include <rte_log.h>
+#include <rte_debug.h>
+#include <rte_atomic.h>
+#include <rte_launch.h>
+#include <rte_memzone.h>
+#include <rte_per_lcore.h>
+#include <rte_eal.h>
+#include <rte_per_lcore.h>
+#include "eal_private.h"
#include "eal_thread.h"
RTE_DECLARE_PER_LCORE(unsigned , _socket_id);
+RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY;
+RTE_DEFINE_PER_LCORE(unsigned, _socket_id) = (unsigned)SOCKET_ID_ANY;
+RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
unsigned rte_socket_id(void)
{
@@ -155,3 +167,136 @@ exit:
return ret;
}
+
+/*
+ * Send a message to a slave lcore identified by slave_id to call a
+ * function f with argument arg. Once the execution is done, the
+ * remote lcore switch in FINISHED state.
+ */
+int
+rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)
+{
+ int n;
+ char c = 0;
+ int m2s = lcore_config[slave_id].pipe_master2slave[1];
+ int s2m = lcore_config[slave_id].pipe_slave2master[0];
+
+ if (lcore_config[slave_id].state != WAIT)
+ return -EBUSY;
+
+ lcore_config[slave_id].f = f;
+ lcore_config[slave_id].arg = arg;
+
+ /* send message */
+ n = 0;
+ while (n == 0 || (n < 0 && errno == EINTR))
+ n = write(m2s, &c, 1);
+ if (n < 0)
+ rte_panic("cannot write on configuration pipe\n");
+
+ /* wait ack */
+ do {
+ n = read(s2m, &c, 1);
+ } while (n < 0 && errno == EINTR);
+
+ if (n <= 0)
+ rte_panic("cannot read on configuration pipe\n");
+
+ return 0;
+}
+
+/* set affinity for current EAL thread */
+static int
+eal_thread_set_affinity(void)
+{
+ unsigned lcore_id = rte_lcore_id();
+
+ /* acquire system unique id */
+ rte_gettid();
+
+ /* update EAL thread core affinity */
+ return rte_thread_set_affinity(&lcore_config[lcore_id].cpuset);
+}
+
+void eal_thread_init_master(unsigned lcore_id)
+{
+ /* set the lcore ID in per-lcore memory area */
+ RTE_PER_LCORE(_lcore_id) = lcore_id;
+
+ /* set CPU affinity */
+ if (eal_thread_set_affinity() < 0)
+ rte_panic("cannot set affinity\n");
+}
+
+/* main loop of threads */
+__attribute__((noreturn)) void *
+eal_thread_loop(__attribute__((unused)) void *arg)
+{
+ char c;
+ int n, ret;
+ unsigned lcore_id;
+ pthread_t thread_id;
+ int m2s, s2m;
+ char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+
+ thread_id = pthread_self();
+
+ /* retrieve our lcore_id from the configuration structure */
+ RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ if (thread_id == lcore_config[lcore_id].thread_id)
+ break;
+ }
+ if (lcore_id == RTE_MAX_LCORE)
+ rte_panic("cannot retrieve lcore id\n");
+
+ m2s = lcore_config[lcore_id].pipe_master2slave[0];
+ s2m = lcore_config[lcore_id].pipe_slave2master[1];
+
+ /* set the lcore ID in per-lcore memory area */
+ RTE_PER_LCORE(_lcore_id) = lcore_id;
+
+ /* set CPU affinity */
+ if (eal_thread_set_affinity() < 0)
+ rte_panic("cannot set affinity\n");
+
+ ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN);
+
+ RTE_LOG(DEBUG, EAL, "lcore %u is ready (thread=%d;cpuset=[%s%s])\n",
+ lcore_id, rte_sys_gettid(), cpuset, ret == 0 ? "" : "...");
+
+ /* read on our pipe to get commands */
+ while (1) {
+ void *fct_arg;
+
+ /* wait command */
+ do {
+ n = read(m2s, &c, 1);
+ } while (n < 0 && errno == EINTR);
+
+ if (n <= 0)
+ rte_panic("cannot read on configuration pipe\n");
+
+ lcore_config[lcore_id].state = RUNNING;
+
+ /* send ack */
+ n = 0;
+ while (n == 0 || (n < 0 && errno == EINTR))
+ n = write(s2m, &c, 1);
+ if (n < 0)
+ rte_panic("cannot write on configuration pipe\n");
+
+ if (lcore_config[lcore_id].f == NULL)
+ rte_panic("NULL function pointer\n");
+
+ /* call the function and store the return value */
+ fct_arg = lcore_config[lcore_id].arg;
+ ret = lcore_config[lcore_id].f(fct_arg);
+ lcore_config[lcore_id].ret = ret;
+ rte_wmb();
+ lcore_config[lcore_id].state = FINISHED;
+ }
+
+ /* never reached */
+ /* pthread_exit(NULL); */
+ /* return NULL; */
+}
@@ -80,6 +80,11 @@ int eal_cpuset_socket_id(rte_cpuset_t *cpusetp);
#define RTE_CPU_AFFINITY_STR_LEN 256
/**
+ * Default buffer size for thread name
+ */
+#define RTE_THREAD_NAME_LEN 32
+
+/**
* Dump the current pthread cpuset.
* This function is private to EAL.
*
@@ -93,6 +93,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_thread.c
CFLAGS_eal.o := -D_GNU_SOURCE
CFLAGS_eal_interrupts.o := -D_GNU_SOURCE
+CFLAGS_eal_timer.o := -D_GNU_SOURCE
CFLAGS_eal_lcore.o := -D_GNU_SOURCE
CFLAGS_eal_thread.o := -D_GNU_SOURCE
CFLAGS_eal_log.o := -D_GNU_SOURCE
@@ -101,6 +102,7 @@ CFLAGS_eal_hugepage_info.o := -D_GNU_SOURCE
CFLAGS_eal_pci.o := -D_GNU_SOURCE
CFLAGS_eal_pci_uio.o := -D_GNU_SOURCE
CFLAGS_eal_pci_vfio.o := -D_GNU_SOURCE
+CFLAGS_eal_pci_vfio_mp_sync.o := -D_GNU_SOURCE
CFLAGS_eal_common_whitelist.o := -D_GNU_SOURCE
CFLAGS_eal_common_options.o := -D_GNU_SOURCE
CFLAGS_eal_common_thread.o := -D_GNU_SOURCE
@@ -703,6 +703,7 @@ rte_eal_init(int argc, char **argv)
pthread_t thread_id;
static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
struct shared_driver *solib = NULL;
+ char thread_name[RTE_THREAD_NAME_LEN];
const char *logid;
char cpuset[RTE_CPU_AFFINITY_STR_LEN];
@@ -816,6 +817,9 @@ rte_eal_init(int argc, char **argv)
RTE_LCORE_FOREACH_SLAVE(i) {
+ snprintf(thread_name, RTE_THREAD_NAME_LEN,
+ "lcore-slave-%d", i);
+
/*
* create communication pipes between master thread
* and children
@@ -832,6 +836,12 @@ rte_eal_init(int argc, char **argv)
eal_thread_loop, NULL);
if (ret != 0)
rte_panic("Cannot create thread\n");
+
+ ret = pthread_setname_np(
+ lcore_config[i].thread_id, thread_name);
+
+ if (ret != 0)
+ rte_panic("Cannot set name for the thread\n");
}
/*
@@ -66,6 +66,7 @@
#include "eal_private.h"
#include "eal_vfio.h"
+#include "eal_thread.h"
#define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
@@ -838,6 +839,7 @@ int
rte_eal_intr_init(void)
{
int ret = 0;
+ char thread_name[RTE_THREAD_NAME_LEN];
/* init the global interrupt source head */
TAILQ_INIT(&intr_sources);
@@ -849,6 +851,9 @@ rte_eal_intr_init(void)
if (pipe(intr_pipe.pipefd) < 0)
return -1;
+ snprintf(thread_name, RTE_THREAD_NAME_LEN,
+ "eal-intr-thread");
+
/* create the host thread to wait/handle the interrupt */
ret = pthread_create(&intr_thread, NULL,
eal_intr_thread_main, NULL);
@@ -856,6 +861,12 @@ rte_eal_intr_init(void)
RTE_LOG(ERR, EAL,
"Failed to create thread for interrupt handling\n");
+ ret = pthread_setname_np(intr_thread, thread_name);
+
+ if (ret != 0)
+ RTE_LOG(ERR, EAL,
+ "Failed to set thread name for interrupt handling\n");
+
return -ret;
}
@@ -34,6 +34,7 @@
#include <string.h>
#include <fcntl.h>
#include <sys/socket.h>
+#include <pthread.h>
/* sys/un.h with __USE_MISC uses strlen, which is unsafe */
#ifdef __USE_MISC
@@ -54,6 +55,7 @@
#include "eal_filesystem.h"
#include "eal_pci_init.h"
+#include "eal_thread.h"
/**
* @file
@@ -374,20 +376,36 @@ int
pci_vfio_mp_sync_setup(void)
{
int ret;
+ char thread_name[RTE_THREAD_NAME_LEN];
if (vfio_mp_sync_socket_setup() < 0) {
RTE_LOG(ERR, EAL, "Failed to set up local socket!\n");
return -1;
}
+ snprintf(thread_name, RTE_THREAD_NAME_LEN,
+ "pci-vfio-mp-sync");
+
ret = pthread_create(&socket_thread, NULL,
pci_vfio_mp_sync_thread, NULL);
if (ret) {
- RTE_LOG(ERR, EAL, "Failed to create thread for communication with "
- "secondary processes!\n");
+ RTE_LOG(ERR, EAL,
+ "Failed to create thread for communication with "
+ "secondary processes!\n");
+ close(mp_socket_fd);
+ return -1;
+ }
+
+ ret = pthread_setname_np(socket_thread, thread_name);
+
+ if (ret) {
+ RTE_LOG(ERR, EAL,
+ "Failed to set thread name for "
+ "secondary processes!\n");
close(mp_socket_fd);
return -1;
}
+
return 0;
}
@@ -34,163 +34,13 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
#include <unistd.h>
-#include <pthread.h>
-#include <sched.h>
-#include <sys/queue.h>
#include <sys/syscall.h>
-#include <rte_debug.h>
-#include <rte_atomic.h>
-#include <rte_launch.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_per_lcore.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-
#include "eal_private.h"
#include "eal_thread.h"
-RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY;
-RTE_DEFINE_PER_LCORE(unsigned, _socket_id) = (unsigned)SOCKET_ID_ANY;
-RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
-
-/*
- * Send a message to a slave lcore identified by slave_id to call a
- * function f with argument arg. Once the execution is done, the
- * remote lcore switch in FINISHED state.
- */
-int
-rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)
-{
- int n;
- char c = 0;
- int m2s = lcore_config[slave_id].pipe_master2slave[1];
- int s2m = lcore_config[slave_id].pipe_slave2master[0];
-
- if (lcore_config[slave_id].state != WAIT)
- return -EBUSY;
-
- lcore_config[slave_id].f = f;
- lcore_config[slave_id].arg = arg;
-
- /* send message */
- n = 0;
- while (n == 0 || (n < 0 && errno == EINTR))
- n = write(m2s, &c, 1);
- if (n < 0)
- rte_panic("cannot write on configuration pipe\n");
-
- /* wait ack */
- do {
- n = read(s2m, &c, 1);
- } while (n < 0 && errno == EINTR);
-
- if (n <= 0)
- rte_panic("cannot read on configuration pipe\n");
-
- return 0;
-}
-
-/* set affinity for current EAL thread */
-static int
-eal_thread_set_affinity(void)
-{
- unsigned lcore_id = rte_lcore_id();
-
- /* acquire system unique id */
- rte_gettid();
-
- /* update EAL thread core affinity */
- return rte_thread_set_affinity(&lcore_config[lcore_id].cpuset);
-}
-
-void eal_thread_init_master(unsigned lcore_id)
-{
- /* set the lcore ID in per-lcore memory area */
- RTE_PER_LCORE(_lcore_id) = lcore_id;
-
- /* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
- rte_panic("cannot set affinity\n");
-}
-
-/* main loop of threads */
-__attribute__((noreturn)) void *
-eal_thread_loop(__attribute__((unused)) void *arg)
-{
- char c;
- int n, ret;
- unsigned lcore_id;
- pthread_t thread_id;
- int m2s, s2m;
- char cpuset[RTE_CPU_AFFINITY_STR_LEN];
-
- thread_id = pthread_self();
-
- /* retrieve our lcore_id from the configuration structure */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
- if (thread_id == lcore_config[lcore_id].thread_id)
- break;
- }
- if (lcore_id == RTE_MAX_LCORE)
- rte_panic("cannot retrieve lcore id\n");
-
- m2s = lcore_config[lcore_id].pipe_master2slave[0];
- s2m = lcore_config[lcore_id].pipe_slave2master[1];
-
- /* set the lcore ID in per-lcore memory area */
- RTE_PER_LCORE(_lcore_id) = lcore_id;
-
- /* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
- rte_panic("cannot set affinity\n");
-
- ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN);
-
- RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%x;cpuset=[%s%s])\n",
- lcore_id, (int)thread_id, cpuset, ret == 0 ? "" : "...");
-
- /* read on our pipe to get commands */
- while (1) {
- void *fct_arg;
-
- /* wait command */
- do {
- n = read(m2s, &c, 1);
- } while (n < 0 && errno == EINTR);
-
- if (n <= 0)
- rte_panic("cannot read on configuration pipe\n");
-
- lcore_config[lcore_id].state = RUNNING;
-
- /* send ack */
- n = 0;
- while (n == 0 || (n < 0 && errno == EINTR))
- n = write(s2m, &c, 1);
- if (n < 0)
- rte_panic("cannot write on configuration pipe\n");
-
- if (lcore_config[lcore_id].f == NULL)
- rte_panic("NULL function pointer\n");
-
- /* call the function and store the return value */
- fct_arg = lcore_config[lcore_id].arg;
- ret = lcore_config[lcore_id].f(fct_arg);
- lcore_config[lcore_id].ret = ret;
- rte_wmb();
- lcore_config[lcore_id].state = FINISHED;
- }
-
- /* never reached */
- /* pthread_exit(NULL); */
- /* return NULL; */
-}
+#include <rte_log.h>
/* require calling thread tid by gettid() */
int rte_sys_gettid(void)
@@ -54,6 +54,7 @@
#include "eal_private.h"
#include "eal_internal_cfg.h"
+#include "eal_thread.h"
enum timer_source eal_timer_source = EAL_TIMER_HPET;
@@ -186,6 +187,7 @@ int
rte_eal_hpet_init(int make_default)
{
int fd, ret;
+ char thread_name[RTE_THREAD_NAME_LEN];
if (internal_config.no_hpet) {
RTE_LOG(INFO, EAL, "HPET is disabled\n");
@@ -224,16 +226,27 @@ rte_eal_hpet_init(int make_default)
eal_hpet_msb = (eal_hpet->counter_l >> 30);
+ snprintf(thread_name, RTE_THREAD_NAME_LEN, "hpet-msb-inc");
+
/* create a thread that will increment a global variable for
* msb (hpet is 32 bits by default under linux) */
ret = pthread_create(&msb_inc_thread_id, NULL,
(void *(*)(void *))hpet_msb_inc, NULL);
- if (ret < 0) {
+ if (ret != 0) {
RTE_LOG(ERR, EAL, "ERROR: Cannot create HPET timer thread!\n");
internal_config.no_hpet = 1;
return -1;
}
+ ret = pthread_setname_np(msb_inc_thread_id, thread_name);
+
+ if (ret != 0) {
+ RTE_LOG(ERR, EAL,
+ "ERROR: Cannot set HPET timer thread name!\n");
+ internal_config.no_hpet = 1;
+ return -1;
+ }
+
if (make_default)
eal_timer_source = EAL_TIMER_HPET;
return 0;