Repository: trafficserver Updated Branches: refs/heads/4.2.x b85683e2a -> 5c9de0595
TS-2624: Force CPU affinity to 0 to mimic previous behavior in 4.x branch and avoid regression. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5c9de059 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5c9de059 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5c9de059 Branch: refs/heads/4.2.x Commit: 5c9de05956ff4b7d190e2ffabdf6658ae480c7a5 Parents: b85683e Author: Phil Sorber <[email protected]> Authored: Fri Apr 11 15:13:51 2014 -0600 Committer: Phil Sorber <[email protected]> Committed: Fri Apr 11 15:14:48 2014 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ iocore/eventsystem/UnixEventProcessor.cc | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c9de059/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 5dafc38..2c44d87 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.1 + *) [TS-2624] Force CPU affinity to 0 to mimic previous behavior in 4.x branch + and avoid regression. + *) [TS-2564] Fixup MIME presence bits and slot accelerators to recover from WKS_IDX changes, plus config to turn it off manually. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c9de059/iocore/eventsystem/UnixEventProcessor.cc ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc index 29f730a..eb84218 100644 --- a/iocore/eventsystem/UnixEventProcessor.cc +++ b/iocore/eventsystem/UnixEventProcessor.cc @@ -159,7 +159,10 @@ EventProcessor::start(int n_event_threads, size_t stacksize) #if TS_USE_HWLOC int affinity = 0; - REC_ReadConfigInteger(affinity, "proxy.config.exec_thread.affinity"); + // Commenting this out as a fix for 4.2.x only. This reverts the fix + // that exposed another bug and returns to the behavior previous to 4.2.x. + // This is also now fixed in master. + // REC_ReadConfigInteger(affinity, "proxy.config.exec_thread.affinity"); ink_cpuset_t cpuset; int socket = hwloc_get_nbobjs_by_type(ink_get_topology(), HWLOC_OBJ_SOCKET); int cu = hwloc_get_nbobjs_by_type(ink_get_topology(), HWLOC_OBJ_CORE);
