@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <linux/unistd.h>
@@ -85,7 +86,8 @@ struct ThreadData
       ptid.reset();
     }
 
-    muduo::CurrentThread::t_threadName = name_.c_str();
+    muduo::CurrentThread::t_threadName = name_.empty() ? "muduoThread" : name_.c_str();
+    ::prctl(PR_SET_NAME, muduo::CurrentThread::t_threadName);
     try
     {
       func_();
@@ -161,7 +163,7 @@ Thread::Thread(const ThreadFunc& func, const string& n)
     func_(func),
     name_(n)
 {
-  numCreated_.increment();
+  setDefaultName();
 }
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
@@ -173,7 +175,7 @@ Thread::Thread(ThreadFunc&& func, const string& n)
     func_(std::move(func)),
     name_(n)
 {
-  numCreated_.increment();
+  setDefaultName();
 }
 
 #endif
@@ -186,6 +188,17 @@ Thread::~Thread()
   }
 }
 
+void Thread::setDefaultName()
+{
+  int num = numCreated_.incrementAndGet();
+  if (name_.empty())
+  {
+    char buf[32];
+    snprintf(buf, sizeof buf, "Thread%d", num);
+    name_ = buf;
+  }
+}
+
 void Thread::start()
 {
   assert(!started_);
 
@@ -39,6 +39,8 @@ class Thread : boost::noncopyable
   static int numCreated() { return numCreated_.get(); }
 
  private:
+  void setDefaultName();
+
   bool       started_;
   bool       joined_;
   pthread_t  pthreadId_;
 
@@ -39,7 +39,7 @@ void ThreadPool::start(int numThreads)
   for (int i = 0; i < numThreads; ++i)
   {
     char id[32];
-    snprintf(id, sizeof id, "%d", i);
+    snprintf(id, sizeof id, "%d", i+1);
     threads_.push_back(new muduo::Thread(
           boost::bind(&ThreadPool::runInThread, this), name_+id));
     threads_[i].start();
 
@@ -25,7 +25,7 @@ class ThreadPool : boost::noncopyable
  public:
   typedef boost::function<void ()> Task;
 
-  explicit ThreadPool(const string& name = string());
+  explicit ThreadPool(const string& name = string("ThreadPool"));
   ~ThreadPool();
 
   // Must be called before start().
 
@@ -19,7 +19,7 @@ using namespace muduo::net;
 EventLoopThread::EventLoopThread(const ThreadInitCallback& cb)
   : loop_(NULL),
     exiting_(false),
-    thread_(boost::bind(&EventLoopThread::threadFunc, this)),
+    thread_(boost::bind(&EventLoopThread::threadFunc, this), "EventLoopThread"), // FIXME: number it
     mutex_(),
     cond_(mutex_),
     callback_(cb)
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include <errno.h>`
`16`	`16`	`#include <stdio.h>`
`17`	`17`	`#include <unistd.h>`
	`18`	`+#include <sys/prctl.h>`
`18`	`19`	`#include <sys/syscall.h>`
`19`	`20`	`#include <sys/types.h>`
`20`	`21`	`#include <linux/unistd.h>`
`@@ -85,7 +86,8 @@ struct ThreadData`
`85`	`86`	`ptid.reset();`
`86`	`87`	`}`
`87`	`88`
`88`		`- muduo::CurrentThread::t_threadName = name_.c_str();`
	`89`	`+ muduo::CurrentThread::t_threadName = name_.empty() ? "muduoThread" : name_.c_str();`
	`90`	`+ ::prctl(PR_SET_NAME, muduo::CurrentThread::t_threadName);`
`89`	`91`	`try`
`90`	`92`	`{`
`91`	`93`	`func_();`
`@@ -161,7 +163,7 @@ Thread::Thread(const ThreadFunc& func, const string& n)`
`161`	`163`	`func_(func),`
`162`	`164`	`name_(n)`
`163`	`165`	`{`
`164`		`- numCreated_.increment();`
	`166`	`+ setDefaultName();`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`#ifdef __GXX_EXPERIMENTAL_CXX0X__`
`@@ -173,7 +175,7 @@ Thread::Thread(ThreadFunc&& func, const string& n)`
`173`	`175`	`func_(std::move(func)),`
`174`	`176`	`name_(n)`
`175`	`177`	`{`
`176`		`- numCreated_.increment();`
	`178`	`+ setDefaultName();`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`#endif`
`@@ -186,6 +188,17 @@ Thread::~Thread()`
`186`	`188`	`}`
`187`	`189`	`}`
`188`	`190`
	`191`	`+void Thread::setDefaultName()`
	`192`	`+{`
	`193`	`+ int num = numCreated_.incrementAndGet();`
	`194`	`+ if (name_.empty())`
	`195`	`+ {`
	`196`	`+ char buf[32];`
	`197`	`+ snprintf(buf, sizeof buf, "Thread%d", num);`
	`198`	`+ name_ = buf;`
	`199`	`+ }`
	`200`	`+}`
	`201`	`+`
`189`	`202`	`void Thread::start()`
`190`	`203`	`{`
`191`	`204`	`assert(!started_);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void ThreadPool::start(int numThreads)`
`39`	`39`	`for (int i = 0; i < numThreads; ++i)`
`40`	`40`	`{`
`41`	`41`	`char id[32];`
`42`		`- snprintf(id, sizeof id, "%d", i);`
	`42`	`+ snprintf(id, sizeof id, "%d", i+1);`
`43`	`43`	`threads_.push_back(new muduo::Thread(`
`44`	`44`	`boost::bind(&ThreadPool::runInThread, this), name_+id));`
`45`	`45`	`threads_[i].start();`