Changeset 652

Timestamp:

04/04/06 14:13:37 (7 years ago)

Author:

ahu

Message:

remove unused 'title' facility from MTasker - saving a lot of string copies

Location:

trunk/pdns/pdns

Files:

• mtasker.cc (modified) (5 diffs)
• mtasker.hh (modified) (2 diffs)
• pdns_recursor.cc (modified) (3 diffs)

trunk/pdns/pdns/mtasker.cc

@@ -190 +190 @@
 {
   d_runQueue.push(d_tid);
-  if(swapcontext(d_threads[d_tid].first ,&d_kernel) < 0) { // give control to the kernel
+  if(swapcontext(d_threads[d_tid] ,&d_kernel) < 0) { // give control to the kernel
     perror("swapcontext in  yield");
     exit(EXIT_FAILURE);
@@ -230 +230 @@
     \param val A void pointer that can be used to pass data to the thread
 */
-template<class Key, class Val>void MTasker<Key,Val>::makeThread(tfunc_t *start, void* val, const string& name)
+template<class Key, class Val>void MTasker<Key,Val>::makeThread(tfunc_t *start, void* val)
 {
   ucontext_t *uc=new ucontext_t;
@@ -245 +245 @@
   makecontext (uc, (void (*)(void))threadWrapper, 4, this, start, d_maxtid, val);
 #endif
-  d_threads[d_maxtid]=make_pair(uc, name);
+  d_threads[d_maxtid]=uc;
   d_runQueue.push(d_maxtid++); // will run at next schedule invocation
 }
@@ -264 +264 @@
   if(!d_runQueue.empty()) {
     d_tid=d_runQueue.front();
-    if(swapcontext(&d_kernel, d_threads[d_tid].first)) {
+    if(swapcontext(&d_kernel, d_threads[d_tid])) {
       perror("swapcontext in schedule");
       exit(EXIT_FAILURE);
@@ -273 +273 @@
   }
   if(!d_zombiesQueue.empty()) {
-    delete[] (char *)d_threads[d_zombiesQueue.front()].first->uc_stack.ss_sp;
-    delete d_threads[d_zombiesQueue.front()].first;
+    delete[] (char *)d_threads[d_zombiesQueue.front()]->uc_stack.ss_sp;
+    delete d_threads[d_zombiesQueue.front()];
     d_threads.erase(d_zombiesQueue.front());
     d_zombiesQueue.pop();

trunk/pdns/pdns/mtasker.hh

@@ -71 +71 @@
   waiters_t d_waiters;
 
-  typedef std::map<int,pair<ucontext_t*,string> > mthreads_t;
+  typedef std::map<int,ucontext_t* > mthreads_t;
   mthreads_t d_threads;
   int d_tid;
@@ -96 +96 @@
   int sendEvent(const EventKey& key, const EventVal* val=0);
   void getEvents(std::vector<EventKey>& events);
-  void makeThread(tfunc_t *start, void* val, const string& name="");
+  void makeThread(tfunc_t *start, void* val);
   bool schedule();
   bool noProcesses();
   unsigned int numProcesses();
   int getTid(); 
-  void setTitle(const string& name)
-  {
-    d_threads[d_tid].second=name;
-  }
 
 private:

trunk/pdns/pdns/pdns_recursor.cc

@@ -772 +772 @@
       
       if(!((counter++)%500)) 
-        MT->makeThread(houseKeeping,0,"housekeeping");
+        MT->makeThread(houseKeeping,0);
       if(statsWanted) {
         doStats();
@@ -887 +887 @@
                 dc->setSocket(*i);
                 dc->d_tcp=false;
-                MT->makeThread(startDoResolve, (void*) dc, "udp");
+                MT->makeThread(startDoResolve, (void*) dc);
               }
             }
@@ -1037 +1037 @@
                 ++g_stats.qcounter;
                 ++g_stats.tcpqcounter;
-                MT->makeThread(startDoResolve, dc, "tcp");
+                MT->makeThread(startDoResolve, dc);
               }
             }