combine thread_affinity and cpu_set into one flag

Author: m30070657

src/bthread/task_control.cpp

@@ -42,7 +42,6 @@ DEFINE_int32(task_group_runqueue_capacity, 4096,
 DEFINE_int32(task_group_ntags, 1, "TaskGroup will be grouped by number ntags");
 DEFINE_bool(task_group_set_worker_name, true,
             "Whether to set the name of the worker thread");
-DEFINE_bool(thread_affinity, false, "Whether to Bind Cores");
 DEFINE_string(cpu_set, "",
               "Set of CPUs to which cores are bound, for example, 0-3,5,6-7; default: all");
 
@@ -79,13 +78,6 @@ void run_tagged_worker_startfn(bthread_tag_t tag) {
 struct WorkerThreadArgs {
     WorkerThreadArgs(TaskControl* _c, bthread_tag_t _t) : c(_c), tag(_t) {}
 
-    WorkerThreadArgs* set_cpuId(unsigned _cpuId) {
-        if (FLAGS_thread_affinity) {
-            cpuId = _cpuId;
-        }
-        return this;
-    }
-
     TaskControl* c;
     bthread_tag_t tag;
     unsigned cpuId;
@@ -100,7 +92,7 @@ void* TaskControl::worker_thread(void* arg) {
     auto dummy = static_cast<WorkerThreadArgs*>(arg);
     auto c = dummy->c;
     auto tag = dummy->tag;
-    if (FLAGS_thread_affinity) {
+    if (!_cpus.empty()) {
         bind_thread(pthread_self(), _cpus[dummy->cpuId]);
     }
     delete dummy;
@@ -225,8 +217,8 @@ int TaskControl::init(int concurrency) {
     }
     _concurrency = concurrency;
 
-    if (FLAGS_thread_affinity) {
-        if (parse_cpuset(FLAGS_cpu_set, _cpus) == -1 || _cpus.empty()) {
+    if (!FLAGS_cpu_set.empty()) {
+        if (parse_cpuset(FLAGS_cpu_set, _cpus) == -1) {
             LOG(ERROR) << "invalid cpuset=" << FLAGS_cpu_set;
             return -1;
         }
@@ -264,7 +256,9 @@ int TaskControl::init(int concurrency) {
     _workers.resize(_concurrency);   
     for (int i = 0; i < _concurrency; ++i) {
         auto arg = new WorkerThreadArgs(this, i % FLAGS_task_group_ntags);
-        arg->set_cpuId(i % _cpus.size());
+        if (!_cpus.empty()) {
+            arg->cpuId = i % _cpus.size();
+        }
         const int rc = pthread_create(&_workers[i], NULL, worker_thread, arg);
         if (rc) {
             delete arg;
@@ -308,7 +302,9 @@ int TaskControl::add_workers(int num, bthread_tag_t tag) {
         // _concurrency before create a worker.
         _concurrency.fetch_add(1);
         auto arg = new WorkerThreadArgs(this, tag);
-        arg->set_cpuId((i + old_concurency) % _cpus.size());
+        if (!_cpus.empty()) {
+            arg->cpuId = (i + old_concurency) % _cpus.size();
+        }
         const int rc = pthread_create(
                 &_workers[i + old_concurency], NULL, worker_thread, arg);
         if (rc) {
@@ -339,8 +335,7 @@ int TaskControl::parse_cpuset(std::string value, std::vector<unsigned>& cpus) {
     std::smatch match;
     std::set<unsigned> cpuset;
     if (value.empty()) {
-        cpus = get_current_cpus();
-        return 0;
+        return -1;
     }
     if (std::regex_match(value, match, r)) {
         for (butil::StringSplitter split(value.data(), ','); split; ++split) {

src/bthread/task_control.h

@@ -106,23 +106,6 @@ friend bthread_t init_for_pthread_stack_trace();
         (void)r;
     }
 
-    static inline std::vector<unsigned> get_current_cpus() {
-        cpu_set_t cs;
-        auto r = pthread_getaffinity_np(pthread_self(), sizeof(cs), &cs);
-        if (r != 0) {
-            LOG(ERROR) << "get thread affinity failed";
-            exit(1);
-        }
-        std::vector<unsigned> cpus;
-        unsigned nr = CPU_COUNT(&cs);
-        for (int cpu = 0; cpu < CPU_SETSIZE && cpus.size() < nr; cpu++) {
-            if (CPU_ISSET(cpu, &cs)) {
-                cpus.push_back(cpu);
-            }
-        }
-        return cpus;
-    }
-
 #ifdef BRPC_BTHREAD_TRACER
     // A stacktrace of bthread can be helpful in debugging.
     void stack_trace(std::ostream& os, bthread_t tid);