You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2019/11/12 00:39:17 UTC

[trafficserver] branch 8.0.x updated (4be6906 -> 39ae028)

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from 4be6906  Remove including sys/sysctl.h for Linux
     new d85e29a  Fixed build issues with hwloc 2.x API changes
     new 39ae028  Updated Changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG-8.0.6                          | 3 +++
 iocore/aio/AIO.cc                        | 5 +++++
 iocore/eventsystem/UnixEventProcessor.cc | 9 +++++++++
 3 files changed, 17 insertions(+)


[trafficserver] 01/02: Fixed build issues with hwloc 2.x API changes

Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit d85e29aea224b52b2580c64439cd876ad7c01469
Author: Bryan Call <bc...@apache.org>
AuthorDate: Fri Nov 8 11:37:23 2019 -0800

    Fixed build issues with hwloc 2.x API changes
    
    (cherry picked from commit e655af7faeaaadd182ce17fd5bd617cafc95aff7)
---
 iocore/aio/AIO.cc                        | 5 +++++
 iocore/eventsystem/UnixEventProcessor.cc | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc
index 0e7f15a..0a884eb 100644
--- a/iocore/aio/AIO.cc
+++ b/iocore/aio/AIO.cc
@@ -190,9 +190,14 @@ struct AIOThreadInfo : public Continuation {
     (void)event;
     (void)e;
 #if TS_USE_HWLOC
+#if HWLOC_API_VERSION >= 0x20000
+    hwloc_set_membind(ink_get_topology(), hwloc_topology_get_topology_nodeset(ink_get_topology()), HWLOC_MEMBIND_INTERLEAVE,
+                      HWLOC_MEMBIND_THREAD | HWLOC_MEMBIND_BYNODESET);
+#else
     hwloc_set_membind_nodeset(ink_get_topology(), hwloc_topology_get_topology_nodeset(ink_get_topology()), HWLOC_MEMBIND_INTERLEAVE,
                               HWLOC_MEMBIND_THREAD);
 #endif
+#endif
     aio_thread_main(this);
     delete this;
     return EVENT_DONE;
diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc
index 894f2e5..0e7b69f 100644
--- a/iocore/eventsystem/UnixEventProcessor.cc
+++ b/iocore/eventsystem/UnixEventProcessor.cc
@@ -230,7 +230,11 @@ ThreadAffinityInitializer::alloc_numa_stack(EThread *t, size_t stacksize)
 
   if (mem_policy != HWLOC_MEMBIND_DEFAULT) {
     // Let's temporarily set the memory binding to our destination NUMA node
+#if HWLOC_API_VERSION >= 0x20000
+    hwloc_set_membind(ink_get_topology(), nodeset, mem_policy, HWLOC_MEMBIND_THREAD | HWLOC_MEMBIND_BYNODESET);
+#else
     hwloc_set_membind_nodeset(ink_get_topology(), nodeset, mem_policy, HWLOC_MEMBIND_THREAD);
+#endif
   }
 
   // Alloc our stack
@@ -238,8 +242,13 @@ ThreadAffinityInitializer::alloc_numa_stack(EThread *t, size_t stacksize)
 
   if (mem_policy != HWLOC_MEMBIND_DEFAULT) {
     // Now let's set it back to default for this thread.
+#if HWLOC_API_VERSION >= 0x20000
+    hwloc_set_membind(ink_get_topology(), hwloc_topology_get_topology_nodeset(ink_get_topology()), HWLOC_MEMBIND_DEFAULT,
+                      HWLOC_MEMBIND_THREAD | HWLOC_MEMBIND_BYNODESET);
+#else
     hwloc_set_membind_nodeset(ink_get_topology(), hwloc_topology_get_topology_nodeset(ink_get_topology()), HWLOC_MEMBIND_DEFAULT,
                               HWLOC_MEMBIND_THREAD);
+#endif
   }
 
   hwloc_bitmap_free(nodeset);


[trafficserver] 02/02: Updated Changelog

Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 39ae02830e81968e0c8f9509dd531715207162e7
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon Nov 11 16:38:53 2019 -0800

    Updated Changelog
---
 CHANGELOG-8.0.6 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG-8.0.6 b/CHANGELOG-8.0.6
index 19906f2..bee956c 100644
--- a/CHANGELOG-8.0.6
+++ b/CHANGELOG-8.0.6
@@ -15,6 +15,7 @@ Changes with Apache Traffic Server 8.0.6
   #5434 - gcc9 - Fix I_Store.h
   #5435 - gcc9 - fix HTTPVersion.
   #5462 - gcc9: fixed issue with always printing a null char*
+  #5489 - gcc9: set default value for printing debug message
   #5497 - gcc9: sprintf and strncat fixes in plugins
   #5516 - Make code compilable with BoringSSL
   #5823 - Avoid AWS auth v4 path/query param double encoding
@@ -29,3 +30,5 @@ Changes with Apache Traffic Server 8.0.6
   #6068 - Fixes help message for traffic_top's sleep switch
   #6088 - Local 8.0.x change for gcc9 - Map.h, MemSpan.h, ink_uuid.h
   #6113 - Patch to fix autest issues
+  #6145 - Remove including sys/sysctl.h for Linux
+  #6158 - Fixed build issues with hwloc 2.x API changes