You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/11/22 20:12:59 UTC
svn commit: r1037841 - in /trafficserver/traffic/trunk: iocore/cluster/
iocore/eventsystem/ iocore/hostdb/ libinktomi++/ proxy/ proxy/logging/
proxy/mgmt2/ proxy/mgmt2/utils/
Author: jplevyak
Date: Mon Nov 22 19:12:58 2010
New Revision: 1037841
URL: http://svn.apache.org/viewvc?rev=1037841&view=rev
Log:
TS-552: remove alpha support (it was a nice architecture while it lasted)
Removed:
trafficserver/traffic/trunk/libinktomi++/ink_spill.cc
trafficserver/traffic/trunk/libinktomi++/ink_spill.h
Modified:
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/libinktomi++/Makefile.am
trafficserver/traffic/trunk/libinktomi++/Resource.h
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/libinktomi++/mkdfa.c
trafficserver/traffic/trunk/proxy/ICP.h
trafficserver/traffic/trunk/proxy/ICPConfig.cc
trafficserver/traffic/trunk/proxy/StateEventLogger.cc
trafficserver/traffic/trunk/proxy/StateEventLogger.h
trafficserver/traffic/trunk/proxy/logging/LogObject.cc
trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
trafficserver/traffic/trunk/proxy/signals.cc
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Mon Nov 22 19:12:58 2010
@@ -269,7 +269,7 @@ n_byte_bank(0), byte_bank_size(0), misse
iob_iov = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(size));
char *addr = (char *) align_pointer_forward(iob_iov->data(), pagesize);
-#if (defined(__sparc) || defined(__alpha))
+#if defined(__sparc)
if (mprotect(addr, pagesize, PROT_NONE))
perror("ClusterState mprotect0 failed");
#endif
@@ -285,7 +285,7 @@ n_byte_bank(0), byte_bank_size(0), misse
addr = (char *) align_pointer_forward(msg.iob_descriptor_block->data->data(), pagesize);
-#if (defined(__sparc) || defined(__alpha))
+#if defined(__sparc)
if (mprotect(addr, pagesize, PROT_NONE))
perror("ClusterState mprotect failed");
#endif
@@ -299,11 +299,11 @@ n_byte_bank(0), byte_bank_size(0), misse
ClusterState::~ClusterState()
{
mutex = 0;
-#if (defined(__sparc) || defined(__alpha))
+#if defined(__sparc)
int pagesize = getpagesize();
#endif
if (iov) {
-#if (defined(__sparc) || defined(__alpha))
+#if defined(__sparc)
iov = (IOVec *) ((char *) iov - pagesize);
if (mprotect((char *) iov, pagesize, (PROT_READ | PROT_WRITE)))
perror("~ClusterState mprotect0 failed");
@@ -312,7 +312,7 @@ ClusterState::~ClusterState()
}
if (msg.descriptor) {
-#if (defined(__sparc) || defined(__alpha))
+#if defined(__sparc)
char *a = (char *) msg.descriptor - (sizeof(ClusterMsgHeader) + pagesize);
if (mprotect(a, pagesize, (PROT_READ | PROT_WRITE)))
perror("~ClusterState mprotect failed");
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h Mon Nov 22 19:12:58 2010
@@ -417,7 +417,6 @@ Mutex_trylock(
#endif //LOCK_CONTENTION_PROFILING
#endif //DEBUG
m->nthread_holding++;
- SPILL_ALL_VOLATILES;
return true;
}
@@ -469,7 +468,6 @@ Mutex_trylock_spin(
#endif //LOCK_CONTENTION_PROFILING
#endif //DEBUG
m->nthread_holding++;
- SPILL_ALL_VOLATILES;
return true;
}
@@ -504,7 +502,6 @@ Mutex_lock(
#endif // LOCK_CONTENTION_PROFILING
#endif //DEBUG
m->nthread_holding++;
- SPILL_ALL_VOLATILES;
return true;
}
@@ -531,7 +528,6 @@ Mutex_unlock(ProxyMutex * m, EThread * t
ink_mutex_release(&m->the_mutex);
}
}
- SPILL_ALL_VOLATILES;
}
struct MutexLock
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Mon Nov 22 19:12:58 2010
@@ -1058,11 +1058,7 @@ remove_round_robin(HostDBInfo * r, char
for (int n = 0; n < rr->good; n++) {
unsigned int rr_ip = rr->info[n].ip();
unsigned char *pip = (unsigned char *) &rr_ip;
-#ifdef __alpha
- int nbytes = sprintf(p, "%hhu.%hhu.%hhu.%hhu ", pip[0], pip[1], pip[2], pip[3]);
-#else
int nbytes = snprintf(p, bufsize, "%hhu.%hhu.%hhu.%hhu ", pip[0], pip[1], pip[2], pip[3]);
-#endif
p += nbytes;
bufsize -= nbytes;
}
Modified: trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ trafficserver/traffic/trunk/libinktomi++/Makefile.am Mon Nov 22 19:12:58 2010
@@ -94,8 +94,6 @@ libinktomi___a_SOURCES = \
ink_rwlock.h \
ink_sock.cc \
ink_sock.h \
- ink_spill.cc \
- ink_spill.h \
ink_sprintf.cc \
ink_sprintf.h \
ink_stack_trace.cc \
Modified: trafficserver/traffic/trunk/libinktomi++/Resource.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Resource.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Resource.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Resource.h Mon Nov 22 19:12:58 2010
@@ -32,15 +32,7 @@
#define NEW(mem) _xtrack_helper (mem, RES_MEM_PATH)
-
-#if defined(__alpha)
-extern void *operator
-new(size_t size)
-throw();
-extern void operator
-delete(void *p)
-throw();
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x500)
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x500)
void *operator
new(size_t)
throw(std::bad_alloc);
@@ -52,40 +44,20 @@ extern void *operator new(size_t size);
extern void operator delete(void *p);
#endif
-
-#ifndef __SUNPRO_CC
-
-#ifdef __alpha
-extern void *operator new[] (size_t size) throw();
-extern void operator delete[] (void *p) throw();
-#elif !defined (_WIN64)
+#if !defined(__SUNPRO_CC) && !defined (_WIN64)
extern void *operator new[] (size_t size);
extern void operator delete[] (void *p);
#endif
-#endif /* __SUNPRO_CC */
-
-
template<class T> static inline T *
_xtrack_helper(T * ptr, const char *path)
{
return (T *) _xtrack(ptr, path);
}
-#elif defined(USE_PARTITION_MEMORY) /* VxWorks */
-
-#define NEW(mem) mem
-
-inkcoreapi extern void *operator new(size_t size);
-inkcoreapi extern void operator delete(void *p);
-inkcoreapi extern void *operator new[] (size_t size);
-inkcoreapi extern void operator delete[] (void *p);
-
-#else /* USE_PARTITION_MEMORY */
+#else
#define NEW(mem) mem
-#endif /* USE_PARTITION_MEMORY */
-
-
+#endif
#endif /* __RESOURCE_H__ */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h Mon Nov 22 19:12:58 2010
@@ -250,7 +250,7 @@ ink_get_hrtime_internal()
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return (ts.tv_sec * HRTIME_SECOND + ts.tv_nsec * HRTIME_NSECOND);
-#else /* !defined (__alpha) */
+#else
timeval tv;
gettimeofday(&tv, NULL);
return (tv.tv_sec * HRTIME_SECOND + tv.tv_usec * HRTIME_USECOND);
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Mon Nov 22 19:12:58 2010
@@ -68,7 +68,6 @@
#include "ink_resource.h"
#include "ink_sock.h"
#include "ink_inet.h"
-#include "ink_spill.h"
#include "ink_sprintf.h"
#include "ink_stack_trace.h"
#include "ink_string++.h"
Modified: trafficserver/traffic/trunk/libinktomi++/mkdfa.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/mkdfa.c?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/mkdfa.c (original)
+++ trafficserver/traffic/trunk/libinktomi++/mkdfa.c Mon Nov 22 19:12:58 2010
@@ -28,10 +28,8 @@
#include <string.h>
#include "ink_unused.h"
-#ifndef __alpha
#define TRUE 1
#define FALSE 0
-#endif
#define SIZEOF(t) (sizeof (t) / (sizeof ((t)[0])))
Modified: trafficserver/traffic/trunk/proxy/ICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.h (original)
+++ trafficserver/traffic/trunk/proxy/ICP.h Mon Nov 22 19:12:58 2010
@@ -1118,9 +1118,6 @@ public:
~ICPRequestCont();
void *operator new(size_t size, void *mem);
void operator delete(void *mem);
-#ifdef __alpha
- void operator delete(void *p, void *mem);
-#endif
inline void SetRequestStartTime()
{
_start_time = ink_get_hrtime();
@@ -1239,15 +1236,6 @@ delete(void *mem)
ICPRequestCont_allocator.free((ICPRequestCont *) mem);
}
-#ifdef __alpha
-inline void
- ICPRequestCont::operator
-delete(void *p, void *mem)
-{
- ink_release_assert(!"invalid ICPRequestCont::operator delete(void *p, void *mem)");
-}
-#endif
-
extern struct RecRawStatBlock *icp_rsb;
enum
Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Mon Nov 22 19:12:58 2010
@@ -779,15 +779,8 @@ ICPConfiguration::icp_config_change_call
close(fd);
if (!error) {
- for (int i = 0; i <= MAX_DEFINED_PEERS; i++) {
-#if defined (alpha) || defined(__alpha)
- PeerConfigData *p_cur;
- p_cur = ICPconfig->_peer_cdata_current[i];
- *p_cur = P[i];
-#else
- *ICPconfig->_peer_cdata_current[i] = P[i]; // Broken on DEC
-#endif
- }
+ for (int i = 0; i <= MAX_DEFINED_PEERS; i++)
+ *ICPconfig->_peer_cdata_current[i] = P[i];
}
delete[]P; // free working buffer
if (!startup)
Modified: trafficserver/traffic/trunk/proxy/StateEventLogger.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StateEventLogger.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StateEventLogger.cc (original)
+++ trafficserver/traffic/trunk/proxy/StateEventLogger.cc Mon Nov 22 19:12:58 2010
@@ -253,13 +253,8 @@ test_thread(void *i)
for (j = 0; j < calls; j++) {
(*sel) (TestStateEvent(pi, j));
}
-#ifdef __alpha
-#define LL_FMT "%ld"
-#else
-#define LL_FMT "%lld"
-#endif
finish = ink_get_hrtime();
- printf("StateEventLogger cost = " LL_FMT "ns\n", (finish - start) / (N_THREADS * calls));
+ printf("StateEventLogger cost = %lldns\n", (finish - start) / (N_THREADS * calls));
return NULL;
}
Modified: trafficserver/traffic/trunk/proxy/StateEventLogger.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StateEventLogger.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StateEventLogger.h (original)
+++ trafficserver/traffic/trunk/proxy/StateEventLogger.h Mon Nov 22 19:12:58 2010
@@ -72,23 +72,6 @@
#include "ink_platform.h"
#include <time.h>
-#ifdef __alpha
-// these macros convert to sparc byte ordering from Alpha form.
-#define my_byteorder_int(to,from) \
- to = (((unsigned int)from) >> 16) | (from << 16)
-#define my_byteorder_hrtime(to,from) \
- to = ((from & 0xffff) << 48) | \
- ((from & 0xffff0000) << 16) | \
- ((from & 0xffff00000000) >> 16) | \
- ((from & 0xffff000000000000) >> 48)
-
-#else
-#define my_byteorder_int(to,from) \
- to=from
-#define my_byteorder_hrtime(to,from) \
- to = from
-
-#endif
//#define USE_RINGBUF
// This code is too complex for the minimal I/O system call reduction
@@ -159,18 +142,18 @@ public:
virtual void marshal(char *buf) const
{
ink_hrtime t;
- my_byteorder_hrtime(t, d_ts);
- memcpy(buf, &t, sizeof(t));
- buf += sizeof(t);
+ t = d_ts;
+ memcpy(buf, &t, sizeof(t));
+ buf += sizeof(t);
int x;
- my_byteorder_int(x, d_param1);
- memcpy(buf, &x, sizeof(x));
- buf += sizeof(x);
+ x = d_param1;
+ memcpy(buf, &x, sizeof(x));
+ buf += sizeof(x);
- my_byteorder_int(x, d_param2);
- memcpy(buf, &x, sizeof(x));
+ x = d_param2;
+ memcpy(buf, &x, sizeof(x));
};
#endif
virtual int size() const
Modified: trafficserver/traffic/trunk/proxy/logging/LogObject.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogObject.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogObject.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogObject.cc Mon Nov 22 19:12:58 2010
@@ -320,12 +320,7 @@ LogObject::display(FILE * fd)
{
fprintf(fd, "++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
fprintf(fd, "LogObject [%p]: format = %s (%p)\nbasename = %s\n" "flags = %u\n"
-#ifdef __alpha
- // the DEC does not like %llu
- "signature = %lu\n",
-#else
"signature = %llu\n",
-#endif
this, m_format->name(), m_format, m_basename, m_flags, m_signature);
#ifndef TS_MICRO
if (is_collation_client()) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h Mon Nov 22 19:12:58 2010
@@ -128,10 +128,6 @@ public:
void syslogThrInit();
volatile bool run_proxy;
-#ifdef __alpha
- static bool clean_up;
-#endif
-
volatile time_t manager_started_at;
volatile time_t proxy_started_at;
volatile int proxy_launch_count;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Mon Nov 22 19:12:58 2010
@@ -1126,9 +1126,6 @@ SignalHandler(int sig)
if (lmgmt && !clean) {
clean = 1;
-#ifdef __alpha
- lmgmt->clean_up = true;
-#endif
if (lmgmt->watched_process_pid != -1) {
if (sig == SIGTERM || sig == SIGINT) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc Mon Nov 22 19:12:58 2010
@@ -785,9 +785,7 @@ mgmt_sleep_sec(int seconds)
void
mgmt_sleep_msec(int msec)
{
-#if !defined (alpha) && !defined(__alpha)
usleep(msec * 1000);
-#endif
}
#else
void
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=1037841&r1=1037840&r2=1037841&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Mon Nov 22 19:12:58 2010
@@ -38,16 +38,6 @@
// For backtraces on crash
#include "ink_stack_trace.h"
-
-#ifdef __alpha
-#include <obj.h>
-#include <sym.h>
-#include <demangle.h>
-#include <ucontext.h>
-#include <excpt.h>
-struct obj_list *ObjList;
-#endif
-
#if TS_HAS_PROFILER
#include <google/profiler.h>
#endif
@@ -152,87 +142,6 @@ public:
}
};
-#if defined (__alpha)
-
-void
-print_context(sigcontext & c, int frame)
-{
- unsigned long pc = c.sc_pc;
-
- //
- // Get the object corresponding to this PC
- //
- struct obj *obj = address_to_obj(ObjList, pc);
- char *procedure_name = "<unknown>";
- char *filename = "<unknown>";
- int line_number = -1;
-
- if (obj) {
- //
- // Get the procedure in this object corresponding to this PC.
- //
- unsigned long mldproc = address_to_procedure(obj, pc);
- if (mldproc != OBJ_FAIL) {
- //
- // Get the procedure name
- //
- unsigned long mldsym = procedure_symbol(obj, mldproc);
- if (mldsym != OBJ_FAIL) {
- char proc_name_buf[1024];
-
- procedure_name = symbol_name(obj, mldsym);
-
- //
- // And try to demangle it..
- //
- int result = MLD_demangle_string(procedure_name,
- proc_name_buf, sizeof(proc_name_buf),
- MLD_SHOW_DEMANGLED_NAME | MLD_SHOW_INFO);
-
- if (result == MLD_SOMETHING_RECOGNIZED) {
- procedure_name = proc_name_buf;
- }
- }
-
- long mldfile = procedure_to_file(obj, mldproc);
- if (mldfile != OBJ_FAIL) {
- filename = file_name(obj, mldfile);
- }
-
- long mldline = address_to_line(obj, pc);
- if (mldline != OBJ_FAIL) {
- line_number = mldline;
- }
- }
- }
-
- //
- // See /usr/include/machine/context.h for structure
- //
- fprintf(stderr, "[%d]: '%s', line '%d', file '%s' (0x%x)\n", frame, procedure_name, line_number, filename, c.sc_pc);
-
- fprintf(stderr, "");
- for (int i = 0; i < 32; i++) {
-
- if (((i + 1) % 4) == 0) {
-
- fprintf(stderr, "\tReg[%d] = 0x%x\n", i, c.sc_regs[i]);
-
- } else {
-
- if (c.sc_regs[i] > 0xff || c.sc_regs[i] < 0) {
- fprintf(stderr, "\tReg[%d] = 0x%x", i, c.sc_regs[i]);
- } else {
- fprintf(stderr, "\tReg[%d] = 0x%x\t", i, c.sc_regs[i]);
- }
- }
- }
- fprintf(stderr, "\n");
-}
-
-#endif
-
-
static void
interrupt_handler(int sig)
@@ -255,44 +164,6 @@ signal_handler(int sig, siginfo_t * t, v
sigusr1_received = 1;
return;
}
-#if defined (__alpha)
- sigcontext starting_context;
-
- //
- // Establish the current context. We ought to be
- // able to extract this from the signal handler arguments
- // but the expirements to do so failed for unknown
- // reasons
- //
- exc_capture_context(&starting_context);
-#endif
-
-#ifdef __alpha
- if (sig == SIGUSR2) {
- fprintf(stderr, "Entering pthreads debugger\n");
- pthread_debug();
- return;
- }
-#endif
-
-#ifdef __alpha
- // If stack trace of fatal errors is enabled, dump it out and
- // exit the process
- if (stack_trace_flag) {
- int cur_frame = 0;
- print_context(starting_context, cur_frame++);
-
- for (;;) {
- exc_virtual_unwind(NULL, &starting_context);
- print_context(starting_context, cur_frame++);
- if (starting_context.sc_pc == NULL) {
- fprintf(stderr, "Stack completely unwound\n");
- break;
- }
- }
- _exit(1);
- }
-#endif
char sig_msg[2048];
#if !defined(linux) && !defined(freebsd)
@@ -437,21 +308,8 @@ check_signals()
check_signal(SIGPIPE, (SigActionFunc_t) SIG_IGN);
check_signal(SIGQUIT, (SigActionFunc_t) signal_handler);
check_signal(SIGHUP, (SigActionFunc_t) interrupt_handler);
-
-#if defined (__alpha)
- if (stack_trace_flag) {
- set_signal(SIGABRT, (SigActionFunc_t) signal_handler);
- set_signal(SIGILL, (SigActionFunc_t) signal_handler);
- set_signal(SIGBUS, (SigActionFunc_t) signal_handler);
- set_signal(SIGSEGV, (SigActionFunc_t) signal_handler);
- }
-#endif
-
check_signal(SIGTERM, (SigActionFunc_t) signal_handler);
check_signal(SIGUSR1, (SigActionFunc_t) signal_handler);
-#ifdef __alpha
- check_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
-#endif
}
@@ -501,23 +359,10 @@ init_signals(bool do_stackdump)
// // SIGABRT loop on solaris assert() failures
// set_signal(SIGABRT,(SigActionFunc_t)signal_handler);
//
-#if defined (__alpha)
- if (stack_trace_flag) {
- set_signal(SIGABRT, (SigActionFunc_t) signal_handler);
- set_signal(SIGILL, (SigActionFunc_t) signal_handler);
- set_signal(SIGBUS, (SigActionFunc_t) signal_handler);
- set_signal(SIGSEGV, (SigActionFunc_t) signal_handler);
- }
-#endif
-
#if !defined(freebsd)
set_signal(SIGUSR1, (SigActionFunc_t) signal_handler);
#endif
-#ifdef __alpha
- set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
-#endif
-
#if defined(linux)
set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
#endif