trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject git commit: TS-2624: Divide by zero check.
Date Thu, 08 May 2014 03:39:46 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 26993fe01 -> bb64b54b7


TS-2624: Divide by zero check.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb64b54b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bb64b54b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bb64b54b

Branch: refs/heads/master
Commit: bb64b54b759af0aa71fb398c2dbe1c8c35d6c2ee
Parents: 26993fe
Author: Phil Sorber <sorber@apache.org>
Authored: Wed May 7 21:29:55 2014 -0600
Committer: Phil Sorber <sorber@apache.org>
Committed: Wed May 7 21:29:55 2014 -0600

----------------------------------------------------------------------
 iocore/eventsystem/UnixEventProcessor.cc | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb64b54b/iocore/eventsystem/UnixEventProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc
index 725c4e6..d7ddb9b 100644
--- a/iocore/eventsystem/UnixEventProcessor.cc
+++ b/iocore/eventsystem/UnixEventProcessor.cc
@@ -131,8 +131,8 @@ EventProcessor::start(int n_event_threads, size_t stacksize)
       obj_name = (char *) "Machine";
   }
 
-    obj_count = hwloc_get_nbobjs_by_type(ink_get_topology(), obj_type);
-    Debug("iocore_thread", "Affinity: %d %ss: %d PU: %d", affinity, obj_name, obj_count,
ink_number_of_processors());
+  obj_count = hwloc_get_nbobjs_by_type(ink_get_topology(), obj_type);
+  Debug("iocore_thread", "Affinity: %d %ss: %d PU: %d", affinity, obj_name, obj_count, ink_number_of_processors());
 
 #endif
   for (i = first_thread; i < n_ethreads; i++) {
@@ -140,17 +140,19 @@ EventProcessor::start(int n_event_threads, size_t stacksize)
     ink_thread tid = all_ethreads[i]->start(thr_name, stacksize);
     (void)tid;
 #if TS_USE_HWLOC
-    obj = hwloc_get_obj_by_type(ink_get_topology(), obj_type, i % obj_count);
+    if (obj_count > 0) {
+      obj = hwloc_get_obj_by_type(ink_get_topology(), obj_type, i % obj_count);
 #if HWLOC_API_VERSION >= 0x00010100
-    int cpu_mask_len = hwloc_bitmap_snprintf(NULL, 0, obj->cpuset) + 1;
-    char *cpu_mask = (char *) alloca(cpu_mask_len);
-    hwloc_bitmap_snprintf(cpu_mask, cpu_mask_len, obj->cpuset);
-    Debug("iocore_thread","EThread: %d %s: %d CPU Mask: %s\n", i, obj_name, obj->logical_index,
cpu_mask);
+      int cpu_mask_len = hwloc_bitmap_snprintf(NULL, 0, obj->cpuset) + 1;
+      char *cpu_mask = (char *) alloca(cpu_mask_len);
+      hwloc_bitmap_snprintf(cpu_mask, cpu_mask_len, obj->cpuset);
+      Debug("iocore_thread","EThread: %d %s: %d CPU Mask: %s\n", i, obj_name, obj->logical_index,
cpu_mask);
 #else
-    Debug("iocore_thread","EThread: %d %s: %d\n", i, obj_name, obj->logical_index);
-#endif
-    hwloc_set_thread_cpubind(ink_get_topology(), tid, obj->cpuset, HWLOC_CPUBIND_STRICT);
-#endif
+      Debug("iocore_thread","EThread: %d %s: %d\n", i, obj_name, obj->logical_index);
+#endif // HWLOC_API_VERSION
+      hwloc_set_thread_cpubind(ink_get_topology(), tid, obj->cpuset, HWLOC_CPUBIND_STRICT);
+    }
+#endif // TS_USE_HWLOC
   }
 
   Debug("iocore_thread", "Created event thread group id %d with %d threads", ET_CALL, n_event_threads);


Mime
View raw message