Experimental Physics and
Industrial Control System

Till Straumann has proposed merging lp:~strauman/epics-base/stacktrace into lp:epics-base.

Requested reviews:
  EPICS Core Developers (epics-core)

For more details, see:
https://code.launchpad.net/~strauman/epics-base/stacktrace/+merge/76786
-- 
https://code.launchpad.net/~strauman/epics-base/stacktrace/+merge/76786
Your team EPICS Core Developers is requested to review the proposed merge of lp:~strauman/epics-base/stacktrace into lp:epics-base.

=== modified file 'configure/os/CONFIG.Common.linuxCommon'
--- configure/os/CONFIG.Common.linuxCommon	2010-10-05 19:27:37 +0000
+++ configure/os/CONFIG.Common.linuxCommon	2011-09-23 17:40:18 +0000
@@ -20,7 +20,9 @@
 # -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
 OP_SYS_CPPFLAGS += -D_BSD_SOURCE
 OP_SYS_CPPFLAGS += -Dlinux
-OP_SYS_LDLIBS += -lrt -ldl
+# add -rdynamic so that more symbols (all globals, not only
+# cross-referenced ones) are available to 'backtrace'.
+OP_SYS_LDLIBS += -lrt -ldl -rdynamic
 
 # Added here for cross-target builds which include this file
 STATIC_LDFLAGS_YES= -Wl,-Bstatic

=== modified file 'src/libCom/misc/cantProceed.c'
--- src/libCom/misc/cantProceed.c	2010-10-05 19:27:37 +0000
+++ src/libCom/misc/cantProceed.c	2011-09-23 17:40:18 +0000
@@ -19,6 +19,7 @@
 #include "errlog.h"
 #include "cantProceed.h"
 #include "epicsThread.h"
+#include "epicsStacktrace.h"
 
 epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *msg)
 {
@@ -62,6 +63,11 @@
     
     errlogPrintf("Thread %s (%p) can't proceed, suspending.\n",
             epicsThreadGetNameSelf(), (void *)epicsThreadGetIdSelf());
+
+	errlogPrintf("Dumping a stack trace:\n");
+	epicsStacktrace();
+	errlogPrintf("\n");
+
     errlogFlush();
     
     epicsThreadSleep(1.0);

=== modified file 'src/libCom/osi/Makefile'
--- src/libCom/osi/Makefile	2011-09-06 15:33:56 +0000
+++ src/libCom/osi/Makefile	2011-09-23 17:40:18 +0000
@@ -54,6 +54,7 @@
 INC += epicsStdio.h
 INC += epicsStdioRedirect.h
 INC += epicsGetopt.h
+INC += epicsStacktrace.h
 
 INC += devLib.h
 INC += devLibVME.h
@@ -136,3 +137,11 @@
 Com_SRCS_WIN32 += setThreadName.cpp
 #Com_SRCS_WIN32 += dllmain.cpp
 Com_SRCS_WIN32 += forceBadAllocException.cpp
+
+#Stacktrace support
+Com_SRCS += osdStacktrace.c
+Com_SRCS_Linux  += execinfoStacktrace.c
+Com_SRCS_Darwin += execinfoStacktrace.c
+#we could use execinfoStacktrace.c on freebsd, too, but AFAIK
+#you need libexecinfo.a and execinfo.h. I don't know if that
+#is routinely available so we don't use it for now.

=== modified file 'src/libCom/osi/RULES'
--- src/libCom/osi/RULES	2010-12-10 21:23:42 +0000
+++ src/libCom/osi/RULES	2011-09-23 17:40:18 +0000
@@ -13,3 +13,7 @@
 osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
 osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
 
+execinfoConfig.h:
+	touch $@
+
+execinfoStacktrace$(OBJ): execinfoConfig.h

=== added file 'src/libCom/osi/epicsStacktrace.h'
--- src/libCom/osi/epicsStacktrace.h	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/epicsStacktrace.h	2011-09-23 17:40:18 +0000
@@ -0,0 +1,26 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <[email protected]>, 2011
+ */ 
+
+#ifndef INC_epicsStacktrace_H
+#define INC_epicsStacktrace_H
+
+#include "shareLib.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dump a stacktrace to the errlog */
+epicsShareFunc void epicsStackTrace(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== added file 'src/libCom/osi/execinfoStacktrace.c'
--- src/libCom/osi/execinfoStacktrace.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/execinfoStacktrace.c	2011-09-23 17:40:18 +0000
@@ -0,0 +1,604 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <[email protected]>, 2011
+ */ 
+
+#include "epicsStacktrace.h"
+#include "epicsThread.h"
+#include "epicsMutex.h"
+#include <execinfo.h>
+#include <errlog.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+
+#define MAXDEPTH 100
+
+/* Darwin and GNU have dladdr() but Darwin's backtrace_symbols()
+ * already prints local symbols, too, whereas linux' does not.
+ * Hence, on linux we want to use dladdr() and lookup static
+ * symbols in the ELF symbol table.
+ */
+#define  __USE_GNU
+
+#ifdef   freebsd
+/* Some freebsd versions seem to export dladdr() only if __BSD_VISIBLE */
+#define  __BSD_VISIBLE  1
+#endif
+
+#include <dlfcn.h>
+
+/* Check if we actually have the gnu/darwin extensions           */
+#ifdef RTLD_DEFAULT
+
+#if defined(__linux__) || defined(linux)
+#define USE_ELF
+#define USE_MMAP
+#elif defined(freebsd)
+#define USE_ELF
+#define USE_MMAP
+#endif
+
+#ifdef  USE_ELF
+#include <elf.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#ifdef  USE_MMAP
+#include <sys/mman.h>
+#endif /* USE_MMAP     */
+
+#endif /* USE_ELF      */
+
+#else  /* RTLD_DEFAULT */
+#undef  USE_ELF
+#endif /* RTLD_DEFAULT */
+
+#ifdef USE_ELF
+
+/* Macros to handle elf32 vs. elf64 access to unions etc. */
+
+#define FLD(c,s,f)   (ELFCLASS32==c ? s.e32.f    : s.e64.f   )
+#define ARR(c,s,i,f) (ELFCLASS32==c ? s.e32[i].f : s.e64[i].f)
+
+/* Elf header      */
+typedef union Ehdr_ {
+	Elf32_Ehdr e32;
+	Elf64_Ehdr e64;
+} Ehdr;
+
+/* Section header  */
+typedef union Shdr_ {
+	Elf32_Shdr e32;
+	Elf64_Shdr e64;
+} Shdr;
+
+/* Elf symbol     */
+typedef union Sym_ {
+	void       *raw;
+	Elf32_Sym  *e32;
+	Elf64_Sym  *e64;
+} Sym;
+
+/* Memory mapped portion of a file; we must
+ * keep additional information because the
+ * map's starting address + length must be
+ * page-aligned (man mmap).
+ */
+typedef struct MMap_ {
+	void    *addr;
+	off_t    off;                        /* offset into the map where 'real' data start */
+	size_t   len;
+	void     (*freeMap)(struct MMap_*);  /* 'method' to destroy the mapping             */
+} *MMap;
+
+/* Structure describing symbol information
+ * contained in a file.
+ * We keep these around (so that the file 
+ * doesn't have to be opened + parsed every
+ * time we do a lookup).
+ */
+typedef struct ESyms_ {
+	struct ESyms_ *next;  /* linked list; one struct per executable */
+	const char    *fname; /* file name                              */
+	int            fd;    /* file descriptor                        */
+	uintptr_t      addr;  /* address where file is loaded           */
+	MMap           symMap;
+	MMap           strMap;
+	size_t         nsyms;
+	uint8_t        class;
+} *ESyms;
+
+/* Linked list where we keep all our ESyms */
+static ESyms             elfs       = 0;
+static epicsThreadOnceId elfsInitId = EPICS_THREAD_ONCE_INIT;
+static epicsMutexId      elfsMtx;
+
+static void elfsInit(void *unused)
+{
+	elfsMtx = epicsMutexMustCreate();
+}
+
+static void elfsLock(void)
+{
+	epicsThreadOnce( &elfsInitId, elfsInit, 0 );
+	epicsMutexLock( elfsMtx );
+}
+
+static void elfsUnlock(void)
+{
+	epicsMutexUnlock( elfsMtx );
+}
+
+
+static void
+freeMap(MMap m)
+{
+	if ( m ) {
+		m->freeMap(m);
+		free(m);
+	}
+}
+
+/* Helper to read exactly 'sz' bytes into 'buf'
+ * RETURNS: # chars read or negative value on error.
+ */
+static size_t
+do_read(int fd, void *buf, size_t sz)
+{
+size_t got;
+void   *ptr=buf;
+	while ( sz > 0 ) {
+		if ( (got=read(fd,ptr,sz)) < 0 ) {
+			return got;
+		}
+		ptr+=got;
+		sz -=got;
+	}
+	return ptr-buf;
+}
+
+#ifdef USE_MMAP
+
+/* Destructor for data that is mmap()ed */
+static void
+freeMapMmap(MMap m)
+{
+	if ( MAP_FAILED != m->addr )
+		munmap( m->addr, m->len );
+}
+
+/* Obtain section data with mmap()      */
+static MMap
+getscn(int fd, uint8_t c, Shdr *shdr_p)
+{
+size_t   n;
+MMap     rval = 0;
+size_t   pgsz  = sysconf(_SC_PAGESIZE);
+
+	if ( 0 == (n=FLD(c,(*shdr_p),sh_size)) ) {
+		errlogPrintf("elfRead - getscn() -- no section data\n");
+		goto bail;
+	}
+
+	if ( ! (rval = malloc(sizeof(*rval))) ) {
+		errlogPrintf("elfRead - getscn() -- no memory for section map\n");
+		goto bail;
+	}
+
+	rval->freeMap = freeMapMmap;
+
+	rval->off = FLD(c,(*shdr_p),sh_offset)   & (pgsz-1);
+	rval->len = (n + rval->off + (pgsz - 1)) & ~(pgsz - 1);
+
+	if ( MAP_FAILED == (rval->addr = mmap(0, rval->len, PROT_READ, MAP_SHARED, fd, FLD(c,(*shdr_p),sh_offset) & ~(pgsz-1))) ) {
+		errlogPrintf("elfRead - getscn() -- mapping section contents: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	return rval;
+
+bail:
+	freeMap(rval);
+	return 0;
+}
+
+#else /* USE_MMAP */
+
+/* Destructor for data that is read into a malloc()ed buffer */
+static void
+freeMapMalloc(MMap m)
+{
+	free(m->addr);
+}
+
+/* Read section data into a malloc()ed buffer                */
+static MMap
+getscn(int fd, uint8_t c, Shdr *shdr_p)
+{
+size_t   n;
+MMap     rval = 0;
+
+	if ( 0 == (n=FLD(c,(*shdr_p),sh_size)) ) {
+		errlogPrintf("elfRead - getscn() -- no section data\n");
+		goto bail;
+	}
+
+	if ( ! (rval = malloc(sizeof(*rval))) ) {
+		errlogPrintf("elfRead - getscn() -- no memory for section map\n");
+		goto bail;
+	}
+
+	rval->freeMap = freeMapMalloc;
+
+	if ( ! (rval->addr = malloc(n)) ) {
+		errlogPrintf("elfRead - getscn() -- no memory for section data\n");
+		goto bail;
+	}
+
+	rval->off = 0;
+	rval->len = n;
+
+	/* seek to symbol table contents */
+	if ( (off_t)-1 == lseek(fd, FLD(c,(*shdr_p),sh_offset), SEEK_SET) ) {
+		errlogPrintf("elfRead - getscn() -- seeking to sh_offset: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	if ( n != do_read(fd, rval->addr, n) ) {
+		errlogPrintf("elfRead - getscn() -- reading section contents: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	return rval;
+
+bail:
+	freeMap(rval);
+	return 0;
+}
+#endif /* USE_MMAP */
+
+/* Release resources but keep filename so that
+ * a file w/o symbol table is not read over and over again.
+ */
+static void
+elfSymsRelease(ESyms es)
+{
+	if ( es ) {
+		freeMap(es->symMap);
+		es->symMap = 0;
+		freeMap(es->strMap);
+		es->strMap = 0;
+		if ( es->fd >= 0 )
+			close(es->fd);
+		es->fd     = -1;
+		es->nsyms  = 0;
+	}
+}
+
+static ESyms
+elfRead(const char *fname, uintptr_t fbase)
+{
+int         i,n;
+Ehdr        ehdr;
+Shdr        shdr;
+uint8_t     c;
+ESyms       es;
+
+	if ( !(es = malloc(sizeof(*es))) ) {
+		/* no memory -- give up */
+		return 0;
+	}
+
+	memset(es, 0, sizeof(*es));
+	es->fd    = -1;
+	es->fname = fname;
+
+	if ( (es->fd = open(fname, O_RDONLY)) < 0 ) {
+		errlogPrintf("elfRead() -- unable to open file: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	if ( EI_NIDENT != do_read(es->fd, &ehdr, EI_NIDENT) ) {
+		errlogPrintf("elfRead() -- unable to read ELF e_ident: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	if (    ELFMAG0 != ehdr.e32.e_ident[EI_MAG0]
+	     || ELFMAG1 != ehdr.e32.e_ident[EI_MAG1]
+	     || ELFMAG2 != ehdr.e32.e_ident[EI_MAG2]
+	     || ELFMAG3 != ehdr.e32.e_ident[EI_MAG3] ) {
+		errlogPrintf("bad ELF magic number\n");
+		goto bail;
+	}
+
+	if ( EV_CURRENT != ehdr.e32.e_ident[EI_VERSION] ) {
+		errlogPrintf("bad ELF version\n");
+		goto bail;
+	}
+
+	switch ( (es->class = c = ehdr.e32.e_ident[EI_CLASS]) ) {
+		default:
+			errlogPrintf("bad ELF class\n");
+		goto bail;
+
+		case ELFCLASS32:
+			n = sizeof(Elf32_Ehdr);
+		break;
+		case ELFCLASS64:
+			n = sizeof(Elf64_Ehdr);
+		break;
+	}
+	n -= EI_NIDENT;
+
+	/* read rest */
+	if ( n != do_read(es->fd, ehdr.e32.e_ident + EI_NIDENT, n) ) {
+		errlogPrintf("elfRead() -- unable to read ELF ehdr: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	/* seek to section header table */
+	if ( (off_t)-1 == lseek(es->fd, FLD(c,ehdr,e_shoff), SEEK_SET) ) {
+		errlogPrintf("elfRead() -- unable to seek to shoff: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	n = ELFCLASS32 == c ? sizeof(shdr.e32) : sizeof(shdr.e64);
+
+	for ( i = 0; i<FLD(c,ehdr,e_shnum); i++ ) {
+		if ( n != do_read(es->fd, &shdr, n) ) {
+			errlogPrintf("elfRead() -- unable to read section header: %s\n", strerror(errno));
+			goto bail;
+		}
+		if ( SHT_SYMTAB == FLD(c,shdr,sh_type) )
+			break;
+	}
+
+	if ( i>=FLD(c,ehdr,e_shnum) ) {
+		errlogPrintf("elfRead() -- no symbol table found\n");
+		goto bail;
+	}
+
+	if ( 0 == (n=FLD(c,shdr,sh_size)) ) {
+		errlogPrintf("elfRead() -- no symbol table data\n");
+		goto bail;
+	}
+
+	if ( !(es->symMap = getscn(es->fd, c, &shdr)) ) {
+		errlogPrintf("elfRead() -- unable to read ELF symtab\n");
+		goto bail;
+	}
+
+	es->nsyms = n / (ELFCLASS32==c ? sizeof(Elf32_Sym) : sizeof(Elf64_Sym));
+
+	/* find and read string table */
+	
+	n = ELFCLASS32 == c ? sizeof(shdr.e32) : sizeof(shdr.e64);
+
+	/* seek to section header table */
+	if ( (off_t)-1 == lseek(es->fd, FLD(c,ehdr,e_shoff) + n * FLD(c,shdr,sh_link), SEEK_SET) ) {
+		errlogPrintf("elfRead() -- unable to lseek to ELF e_shoff: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	if ( n != do_read(es->fd, &shdr, n) ) {
+		errlogPrintf("elfRead() -- unable to read ELF strtab section header: %s\n", strerror(errno));
+		goto bail;
+	}
+
+	if ( !(es->strMap = getscn(es->fd,c,&shdr)) ) {
+		errlogPrintf("elfRead() -- unable to read ELF strtab\n");
+		goto bail;
+	}
+
+	switch ( FLD(c,ehdr,e_type) ) {
+		case ET_EXEC:
+			/* Symbols in an executable already has absolute addresses   */
+			es->addr = 0;
+			break;
+		case ET_DYN:
+			/* Symbols in an shared library are relative to base address */
+			es->addr  = fbase;
+			break;
+		default:
+			errlogPrintf("elfLookupAddr(): Unexpected ELF object file type %u\n", FLD(c,ehdr,e_type));
+			goto bail;
+	}
+		
+	return es;
+
+bail:
+	elfSymsRelease(es);
+	return es;
+}
+
+#if 0
+/* IMPLEMENTATION IS INCORRECT: 
+ * with only a single lock 'elfLookupAddr()' would
+ * have to hold that the entire time while accessing
+ * a symbol table. This is inefficient if there are
+ * multiple readers. A better implementation would 
+ * use a 'multiple-readers/single-writer' type of lock
+ * to protect the symbol tables.
+ * 
+ * ATM we simply don't support destroying the
+ * tables (after dumping a stack trace the process is
+ * likely to be terminated anyways).
+ */
+
+/* Destroy a cached ELF symbol table */
+static void
+elfSymsDestroy(ESyms es)
+{
+	if ( es ) {
+		elfSymsRelease(es);
+		free(es);
+	}
+}
+
+/* Destroy all cached ELF symbol tables */
+static void
+elfSymsFlush()
+{
+ESyms es;
+
+	elfsLock();
+	while ( (es = elfs) ) {
+		elfs = es->next; 
+		es->next = 0; /* paranoia */
+		elfSymsDestroy(es);
+	}
+	elfsUnlock();
+
+}
+#endif
+
+static void
+elfLookupAddr(void *addr)
+{
+Dl_info    inf;
+ESyms      es;
+uintptr_t  minoff,off;
+int        i;
+Sym        sym;
+Sym        nearest;
+const char *strtab;
+uint8_t    c;
+
+	if ( ! dladdr(addr, &inf) || (!inf.dli_fname && !inf.dli_sname) ) {
+		/* unable to lookup   */
+		errlogPrintf("[%p]\n", addr);
+		return;
+	}
+
+	if ( inf.dli_sname ) {
+		/* Have a symbol name - just use it and be done */
+		errlogPrintf("%s(%s+0x%lu): [%p]\n", inf.dli_fname ? inf.dli_fname : "", inf.dli_sname, addr - inf.dli_saddr, addr);
+		return;
+	}
+
+	/* No symbol info; try to access ELF file and ready symbol table from there */
+
+	elfsLock();
+
+	/* See if we have loaded this file already */
+	for ( es=elfs; es && strcmp(inf.dli_fname, es->fname); es = es->next )
+		/* nothing else to do */; 
+
+	if ( !es ) {
+		if ( ! (es = elfRead(inf.dli_fname, (uintptr_t)inf.dli_fbase)) )  {
+			elfsUnlock();
+			/* this path can only be taken if there is no memory for '*es' */
+			return;
+		}
+		es->next = elfs;
+		elfs = es;
+	}
+
+	elfsUnlock();
+
+	nearest.raw = 0;
+	minoff      = (uintptr_t)-1LL;
+
+	if ( es->nsyms ) {
+		c       = es->class;
+		sym.raw = es->symMap->addr + es->symMap->off;
+		strtab  = es->strMap->addr + es->strMap->off;
+
+		/* Do a brute-force search through the symbol table; if this is executed 
+		 * very often then it would be worthwhile constructing a sorted list of
+		 * symbol addresses but for the stack trace we don't care...
+		 */
+		//printf("Looking for %p\n", addr);
+
+		if ( ELFCLASS32 == c ) {
+			for ( i=0; i<es->nsyms; i++ ) {
+				if ( STT_FUNC != ELF32_ST_TYPE(sym.e32[i].st_info) )
+					continue;
+				/* don't bother about undefined symbols */
+				if ( 0 == sym.e32[i].st_shndx )
+					continue;
+				//printf("Trying: %s (0x%x)\n", elf_strptr(es->elf, es->idx, es->syms[i].st_name), es->syms[i].st_value + es->addr);
+				if ( (uintptr_t)addr >= (uintptr_t)sym.e32[i].st_value + es->addr ) {
+					off = (uintptr_t)addr - ((uintptr_t)sym.e32[i].st_value + es->addr);
+					if ( off < minoff ) {
+						minoff      = off;
+						nearest.e32 = &sym.e32[i];
+					}
+				}
+			}
+		} else {
+			for ( i=0; i<es->nsyms; i++ ) {
+				if ( STT_FUNC != ELF64_ST_TYPE(sym.e64[i].st_info) )
+					continue;
+				/* don't bother about undefined symbols */
+				if ( 0 == sym.e64[i].st_shndx )
+					continue;
+				//printf("Trying: %s (0x%x)\n", elf_strptr(es->elf, es->idx, es->syms[i].st_name), es->syms[i].st_value + es->addr);
+				if ( (uintptr_t)addr >= (uintptr_t)sym.e64[i].st_value + es->addr ) {
+					off = (uintptr_t)addr - ((uintptr_t)sym.e64[i].st_value + es->addr);
+					if ( off < minoff ) {
+						minoff      = off;
+						nearest.e64 = &sym.e64[i];
+					}
+				}
+			}
+		}
+	}
+
+	if ( nearest.raw ) {
+		errlogPrintf("%s(%s+0x%"PRIxPTR"): [%p]\n", es->fname, strtab + ARR(c,nearest,0,st_name), minoff, addr);
+	} else {
+		errlogPrintf("%s[%p]\n", es->fname, addr);
+	}
+}
+#endif
+
+epicsShareFunc void epicsStacktrace(void)
+{
+void **buf;
+#ifndef USE_ELF
+char **bts;
+#endif
+int    i,n;
+
+	if ( ! (buf = malloc(sizeof(*buf) * MAXDEPTH)) ) {
+		errlogPrintf("epicsStacktrace(): not enough memory for backtrace\n");
+		return;
+	}
+
+	n = backtrace(buf, MAXDEPTH);
+
+	/* backtrace_symbols() only works for global symbols on linux.
+	 * If we have dladdr() and then we can actually lookup local
+	 * symbols, too.
+	 */
+#ifdef USE_ELF
+	for ( i=0; i<n; i++ ) {
+		elfLookupAddr(buf[i]);
+	}
+#if 0
+	elfSymsFlush();
+#endif
+#else
+	if ( (bts = backtrace_symbols(buf, n)) ) {
+		for ( i=0; i<n; i++ ) {
+			errlogPrintf("%s\n", bts[i]);
+		}
+		free(bts);
+	} else {
+		/* failed to create symbolic information; just print addresses */
+		for ( i=0; i<n; i++ ) {
+			errlogPrintf("[%p]\n", buf[i]);
+		}
+	}
+#endif
+
+	free(buf);
+}

=== added file 'src/libCom/osi/os/Darwin/osdStacktrace.c'
--- src/libCom/osi/os/Darwin/osdStacktrace.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/Darwin/osdStacktrace.c	2011-09-23 17:40:18 +0000
@@ -0,0 +1,20 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <[email protected]>, 2011
+ */ 
+
+/* THIS FILE IS INTENTIONALLY EMPTY
+ *
+ * The presence of this file prevents the build
+ * system from using the no-op implementation of
+ * epicsStacktrace() in default/osdStacktrace.c.
+ *
+ * This OS uses a generic implementation which
+ * may be used by various OSes. The source file
+ * of this implementation is listed in the
+ * Makefile.
+ */

=== added file 'src/libCom/osi/os/Linux/osdStacktrace.c'
--- src/libCom/osi/os/Linux/osdStacktrace.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/Linux/osdStacktrace.c	2011-09-23 17:40:18 +0000
@@ -0,0 +1,20 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <[email protected]>, 2011
+ */ 
+
+/* THIS FILE IS INTENTIONALLY EMPTY
+ *
+ * The presence of this file prevents the build
+ * system from using the no-op implementation of
+ * epicsStacktrace() in default/osdStacktrace.c.
+ *
+ * This OS uses a generic implementation which
+ * may be used by various OSes. The source file
+ * of this implementation is listed in the
+ * Makefile.
+ */

=== modified file 'src/libCom/osi/os/default/osdAssert.c'
--- src/libCom/osi/os/default/osdAssert.c	2010-10-05 19:27:37 +0000
+++ src/libCom/osi/os/default/osdAssert.c	2011-09-23 17:40:18 +0000
@@ -20,6 +20,7 @@
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "cantProceed.h"
+#include "epicsStacktrace.h"
 
 
 void epicsAssert (const char *pFile, const unsigned line,
@@ -31,6 +32,12 @@
         "A call to 'assert(%s)'\n"
         "    by thread '%s' failed in %s line %u.\n",
         pExp, epicsThreadGetNameSelf(), pFile, line);
+
+	errlogPrintf("\n"
+		"I'll try to dump a stack trace:\n");
+	epicsStacktrace();
+	errlogPrintf("\n");
+
     errlogPrintf("EPICS Release %s.\n", epicsReleaseVersion);
 
     if (epicsTimeGetCurrent(&current) == 0) {

=== added file 'src/libCom/osi/os/default/osdStacktrace.c'
--- src/libCom/osi/os/default/osdStacktrace.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/default/osdStacktrace.c	2011-09-23 17:40:18 +0000
@@ -0,0 +1,14 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <[email protected]>, 2011
+ */ 
+
+#include "epicsStacktrace.h"
+
+epicsShareFunc void epicsStacktrace(void)
+{
+}

Navigate by Date:

Prev: Re: EPICS and SMP: target board ==> ivme7210 ==> OS ==> vxWorks Ernest L. Williams Jr.

Next: gcc 4.x symbol visibility Andrew Johnson

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <2011>  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: vxWorks 6.8 and "#define _VSB_CONFIG_FILE" Ernest L. Williams Jr.

Next: gcc 4.x symbol visibility Andrew Johnson

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <2011>  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024