trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [3/4] git commit: TS-2144 Avoid race on e.g. -Cclear which would crash the process
Date Sun, 06 Oct 2013 15:24:16 GMT
TS-2144 Avoid race on e.g. -Cclear which would crash the process


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

Branch: refs/heads/4.0.x
Commit: 787291407a11565d8ec6e6258ce9a04cc3419aa6
Parents: 4860d7b
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Fri Sep 13 10:45:04 2013 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Sun Oct 6 09:22:44 2013 -0600

----------------------------------------------------------------------
 proxy/Main.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/78729140/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index be52f0a..be85e73 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -1521,17 +1521,13 @@ main(int /* argc ATS_UNUSED */, char **argv)
     Note("using the new remap processor system with %d threads", num_remap_threads);
     remapProcessor.setUseSeparateThread();
   }
-  remapProcessor.start(num_remap_threads, stacksize);
-
-  RecProcessStart(stacksize);
 
   init_signals2();
   // log initialization moved down
 
   if (command_flag) {
-    // pmgmt initialization moved up, needed by RecProcessInit
-    //pmgmt->start();
     int cmd_ret = cmd_mode();
+
     if (cmd_ret != CMD_IN_PROGRESS) {
       if (cmd_ret >= 0)
         _exit(0);               // everything is OK
@@ -1539,6 +1535,8 @@ main(int /* argc ATS_UNUSED */, char **argv)
         _exit(1);               // in error
     }
   } else {
+    remapProcessor.start(num_remap_threads, stacksize);
+    RecProcessStart(stacksize);
     initCacheControl();
     initCongestionControl();
     IpAllow::startup();


Mime
View raw message