You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/04/02 23:20:07 UTC

svn commit: r930392 - in /incubator/trafficserver/traffic/branches/2.0.x: ./ STATUS proxy/Main.cc proxy/signals.cc proxy/signals.h

Author: zwoop
Date: Fri Apr  2 21:20:06 2010
New Revision: 930392

URL: http://svn.apache.org/viewvc?rev=930392&view=rev
Log:
Merge TS-272 from trunk. This fixes a segfault in tools like logcat

Modified:
    incubator/trafficserver/traffic/branches/2.0.x/   (props changed)
    incubator/trafficserver/traffic/branches/2.0.x/STATUS
    incubator/trafficserver/traffic/branches/2.0.x/proxy/Main.cc
    incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.cc
    incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.h

Propchange: incubator/trafficserver/traffic/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  2 21:20:06 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:921639,921965,922056,923986
+/incubator/trafficserver/traffic/trunk:921639,921965,922056,923986,926907

Modified: incubator/trafficserver/traffic/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/STATUS?rev=930392&r1=930391&r2=930392&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/STATUS (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/STATUS Fri Apr  2 21:20:06 2010
@@ -73,6 +73,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Jira: https://issues.apache.org/jira/browse/TS-249
     +1: zwoop, sjiang, georgep, bcall
 
+  * core: signals.cc shouldn't require Records support. This crashes
+    tools suchs as logcat and logstats.
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=926907
+    Jira: https://issues.apache.org/jira/browse/TS-272
+    +1: zwoop, georgep, sjiang
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -100,12 +106,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Jira: https://issues.apache.org/jira/browse/TS-268
     +1: sjiang, zwoop, georgep
 
-  * core: signals.cc shouldn't require Records support. This crashes
-    tools suchs as logcat and logstats.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=926907
-    Jira: https://issues.apache.org/jira/browse/TS-272
-    +1: zwoop, georgep, sjiang
-
   * API: ts.h does not compile ANSI C due to bool in 
     INKHttpTxnSetHttpRetBody prototype
     Trunk patch: http://svn.apache.org/viewcvs?view=rev&rev=929862

Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/Main.cc?rev=930392&r1=930391&r2=930392&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/Main.cc Fri Apr  2 21:20:06 2010
@@ -342,7 +342,15 @@ max_out_limit(char *name, int which, boo
 void
 init_system()
 {
-  init_signals();
+  RecInt stackDump;
+  bool found = (RecGetRecordInt("proxy.config.stack_dump_enabled", &stackDump) == REC_ERR_OKAY);
+
+  if(found == false) {
+    Warning("Unable to determine stack_dump_enabled , assuming enabled");
+    stackDump = 1;
+  }
+
+  init_signals(stackDump == 1);
 
   syslog(LOG_NOTICE, "NOTE: --- Server Starting ---");
   syslog(LOG_NOTICE, "NOTE: Server Version: %s", appVersionInfo.FullVersionInfoStr);

Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.cc?rev=930392&r1=930391&r2=930392&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.cc (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.cc Fri Apr  2 21:20:06 2010
@@ -453,17 +453,10 @@ check_signal_thread(void *)
 #endif
 
 void
-init_signals()
+init_signals(bool do_stackdump)
 {
-  RecInt stackDump;
-  bool found = (RecGetRecordInt("proxy.config.stack_dump_enabled", &stackDump) == REC_ERR_OKAY);
-
-  if(found == false) {
-    Warning("Unable to determine stack_dump_enabled , assuming enabled");
-    stackDump = 1;
-  }
-
   sigset_t sigsToBlock;
+
   sigemptyset(&sigsToBlock);
   ink_thread_sigsetmask(SIG_SETMASK, &sigsToBlock, NULL);
 
@@ -472,7 +465,7 @@ init_signals()
   set_signal(SIGTERM, (SigActionFunc_t) signal_handler);
   set_signal(SIGHUP, (SigActionFunc_t) interrupt_handler);
   set_signal(SIGILL, (SigActionFunc_t) signal_handler);
-  if(stackDump == 1) {
+  if(do_stackdump) {
     set_signal(SIGBUS, (SigActionFunc_t) signal_handler);
     set_signal(SIGSEGV, (SigActionFunc_t) signal_handler);
   }

Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.h?rev=930392&r1=930391&r2=930392&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.h (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/signals.h Fri Apr  2 21:20:06 2010
@@ -46,7 +46,7 @@ int register_signal_callback(sig_callbac
  *  Function prototypes
  */
 
-void init_signals();
+void init_signals(bool do_stackdump=true);
 void init_signals2();
 void init_daemon_signals();