fiddlerwoaroof/crawl - Change OIAQU4VDTZ3EHBNC7FZIOW2QEQLTDHZ7O46XW2YWM6JRVBC66UPQC

Put platform dependant crash handling code into crash-X.cc files, and link

against them in the make files like libunix/libgui/etc are.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8675 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on January 21, 2009

OIAQU4VDTZ3EHBNC7FZIOW2QEQLTDHZ7O46XW2YWM6JRVBC66UPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makefile_tiles.unix at line 13 [7.5756330]

B:BD[6.164462] → [2.27093:27196]

OBJECTS += libgui.o tilepick.o tile2.o tilereg.o tilesdl.o tilefont.o tiletex.o tilemcache.o tilebuf.o

[6.164462]

[7.5756631]

OBJECTS += libgui.o tilepick.o tile2.o tilereg.o tilesdl.o tilefont.o tiletex.o tilemcache.o tilebuf.o crash-u.o

Replacement in crawl-ref/source/makefile_tiles.mgw at line 83 [7.5750607]

B:BD[7.5751761] → [2.27198:27312]

OBJECTS := $(OBJECTS) libgui.o tilepick.o tile2.o tilereg.o tilesdl.o tilefont.o tiletex.o tilemcache.o tilebuf.o

[7.5751761]

[7.5751834]

OBJECTS := $(OBJECTS) libgui.o tilepick.o tile2.o tilereg.o tilesdl.o tilefont.o tiletex.o tilemcache.o tilebuf.o crash-w.o

Replacement in crawl-ref/source/makefile.unix at line 13 [8.604320]
B:BD[8.604580] → [8.604580:604601]
```
OBJECTS += libunix.o
```
[8.604580]
[8.604601]
```
OBJECTS += libunix.o crash-u.o
```
Replacement in crawl-ref/source/makefile.mgw at line 58 [9.272908]
B:BD[8.610554] → [8.610554:610586]
```
OBJECTS := $(OBJECTS) libw32c.o
```
[8.610554]
[8.610586]
```
OBJECTS := $(OBJECTS) libw32c.o crash-w.o
```
Replacement in crawl-ref/source/makefile.dos at line 51 [10.2452375]
B:BD[8.613565] → [8.613565:613585]
```
OBJECTS += libdos.o
```
[8.613565]
[8.613585]
```
OBJECTS += libdos.o crash-d.o
```
Deletion in crawl-ref/source/libw32c.h at line 63 [10.2475780]
∅:D[11.427] → [10.2476814:2476815]
∅:D[12.5018] → [10.2476814:2476815]
B:BD[10.2476814] → [10.2476814:2476815]
B:BD[10.2476815] → [13.6240:6355]
```
void init_crash_handler();
void dump_crash_info(FILE* file);
void write_stack_trace(FILE* file, int ignore_count);
```

Deletion in crawl-ref/source/libw32c.cc at line 1149 [10.2476860]

B:BD[14.6420] → [13.6358:6485]


void init_crash_handler()
{
}
void dump_crash_info(FILE* file)
{
}
void write_stack_trace(FILE* file, int ignore_count)
{
}

Deletion in crawl-ref/source/libunix.h at line 70 [10.2548819]

B:BD[12.5811] → [13.6510:6626]


void init_crash_handler();
void dump_crash_info(FILE* file);
void write_stack_trace(FILE* file, int ignore_count);

Deletion in crawl-ref/source/libunix.cc at line 73 [10.2550041]
B:BD[13.6659] → [13.6659:6698]
∅:D[13.6698] → [10.2552279:2552286]
B:BD[10.2552279] → [10.2552279:2552286]
∅:D[15.13750] → [10.2552348:2552349]
∅:D[8.630078] → [10.2552348:2552349]
B:BD[10.2552348] → [10.2552348:2552349]
```
#ifdef __GLIBC__
#include <execinfo.h>
#endif
```

Deletion in crawl-ref/source/libunix.cc at line 1138 [10.2550041]

B:BD[16.392] → [13.6699:6915]

B:BD[13.6915] → [4.2692:2758]

∅:D[4.2758] → [13.6945:7035]

B:BD[13.6945] → [13.6945:7035]

B:BD[13.7035] → [4.2759:2842]

∅:D[4.2842] → [17.3901:3950]

B:BD[13.7035] → [17.3901:3950]

∅:D[17.3950] → [13.7082:7830]

B:BD[13.7082] → [13.7082:7830]

B:BD[13.7830] → [17.3951:4043]

B:BD[17.4043] → [3.2692:2709]

∅:D[3.2709] → [17.4043:4070]

B:BD[17.4043] → [17.4043:4070]

B:BD[17.4070] → [3.2710:2717]

∅:D[3.2717] → [13.7830:8681]

∅:D[17.4070] → [13.7830:8681]

B:BD[13.7830] → [13.7830:8681]

    }
}
/////////////////////////////////////////////////////////////////////////////
// Code for printing out debugging info on a crash.
////////////////////////////////////////////////////////////////////////////
static int _crash_signal    = 0;
static int _recursion_depth = 0;
static void _crash_signal_handler(int sig_num)
{
    if (crawl_state.game_crashed)
    {
        if (_recursion_depth > 0)
            return;
        _recursion_depth++;
        fprintf(stderr, "Recursive crash." EOL);
        std::string dir = (!Options.morgue_dir.empty() ? Options.morgue_dir :
                           !SysEnv.crawl_dir.empty()   ? SysEnv.crawl_dir
                                                       : "");
        if (!dir.empty() && dir[dir.length() - 1] != FILE_SEPARATOR)
            dir += FILE_SEPARATOR;
        char name[180];
        sprintf(name, "%scrash-recursive-%s-%d.txt", dir.c_str(),
                you.your_name, (int) time(NULL));
        FILE* file = fopen(name, "w");
        if (file == NULL)
            file = stderr;
        write_stack_trace(file, 0);
        if (file != stderr)
            fclose(file);
        return;
    }
    _crash_signal            = sig_num;
    crawl_state.game_crashed = true;
    // In case the crash dumper is unable to open a file and has to dump
    // to stderr.
#ifndef USE_TILE
    unixcurses_shutdown();
#endif
    do_crash_dump();
    // Now crash for real.
    signal(sig_num, SIG_DFL);
    raise(sig_num);
}
void init_crash_handler()
{
#if defined(USE_UNIX_SIGNALS)
    for (int i = 1; i <= 64; i++)
    {
#ifdef SIGHUP_SAVE
        if (i == SIGHUP)
            continue;
#endif
#ifdef SIGQUIT
        if (i == SIGQUIT)
            continue;
#endif
#ifdef SIGINT
        if (i == SIGINT)
            continue;
#endif
#ifdef SIGCHLD
        if (i == SIGCHLD)
            continue;
#endif
#ifdef SIGTSTP
        if (i == SIGTSTP)
            continue;
#endif
#ifdef SIGCONT
        if (i == SIGCONT)
            continue;
#endif
#ifdef SIGIO
        if (i == SIGIO)
            continue;
#endif
#ifdef SIGPROF
        if (i == SIGPROF)
            continue;
#endif
        if (i == SIGWINCH)
            continue;
        signal(i, _crash_signal_handler);

Deletion in crawl-ref/source/libunix.cc at line 1139 [10.2550041]
B:BD[16.398] → [13.8682:8722]
```
#endif // if defined(USE_UNIX_SIGNALS)
```

Deletion in crawl-ref/source/libunix.cc at line 1141 [10.2550041]

B:BD[13.8725] → [13.8725:8857]

void dump_crash_info(FILE* file)
{
    const char *name = strsignal(_crash_signal);
    if (name == NULL)
        name = "INVALID";

Deletion in crawl-ref/source/libunix.cc at line 1142 [10.2550041]

B:BD[13.8858] → [17.4071:4142]

∅:D[17.4142] → [13.8929:8948]

B:BD[13.8929] → [13.8929:8948]

∅:D[13.8948] → [16.398:400]

B:BD[16.398] → [16.398:400]

B:BD[16.400] → [13.8949:9344]

B:BD[13.9344] → [17.4143:4237]

∅:D[17.4237] → [13.9438:9704]

B:BD[13.9438] → [13.9438:9704]

B:BD[13.9704] → [17.4238:4283]

∅:D[17.4283] → [13.9749:9857]

B:BD[13.9749] → [13.9749:9857]

B:BD[13.9857] → [17.4284:4357]

∅:D[17.4357] → [13.9928:9987]

B:BD[13.9928] → [13.9928:9987]

    fprintf(file, "Crash caused by signal #%d: %s" EOL, _crash_signal,
            name);
}
#ifdef __GLIBC__
// NOTE: This should work on OS X, according to
// http://developer.apple.com/DOCUMENTATION/DARWIN/Reference/ManPages/man3/backtrace_symbols.3.html
void write_stack_trace(FILE* file, int ignore_count)
{
    void* frames[50];
    int num_frames = backtrace(frames, ARRAYSZ(frames));
    char **symbols = backtrace_symbols(frames, num_frames);
    if (symbols == NULL)
    {
        fprintf(stderr, "Out of memroy." EOL);
        fprintf(file,   "Out of memory." EOL);
        // backtrace_symbols_fd() can print out the stack trace even if
        // malloc() can't find any free memory.
        backtrace_symbols_fd(frames, num_frames, fileno(file));
        return;
    }
    for (int i = ignore_count; i < num_frames; i++)
    {
        fprintf(file, "%s" EOL, symbols[i]);
    }
    free(symbols);
}
#else // ifdef __GLIBC__
void write_stack_trace(FILE* file, int ignore_count)
{
    const char* msg = "Unable to get stack trace on this platform." EOL;
    fprintf(stderr, msg);
    fprintf(file, msg);
}
#endif

Deletion in crawl-ref/source/libgui.h at line 75 [7.5789586]

B:BD[6.167378] → [5.2714:2830]


void init_crash_handler();
void dump_crash_info(FILE* file);
void write_stack_trace(FILE* file, int ignore_count);

Deletion in crawl-ref/source/libgui.cc at line 418 [7.5793336]

B:BD[6.170166] → [5.2832:2959]

}
void init_crash_handler()
{
}
void dump_crash_info(FILE* file)
{
}
void write_stack_trace(FILE* file, int ignore_count)
{

Deletion in crawl-ref/source/libdos.h at line 47 [8.630690]
∅:D[18.344] → [19.3717:3718]
∅:D[11.773] → [19.3717:3718]
∅:D[15.16183] → [19.3717:3718]
B:BD[19.3717] → [19.3717:3718]
B:BD[19.3718] → [13.10011:10126]
```
void init_crash_handler();
void dump_crash_info(FILE* file);
void write_stack_trace(FILE* file, int ignore_count);
```

Deletion in crawl-ref/source/libdos.cc at line 140 [8.630803]

B:BD[18.426] → [13.10129:10256]

}
void init_crash_handler()
{
}
void dump_crash_info(FILE* file)
{
}
void write_stack_trace(FILE* file, int ignore_count)
{

Insertion in crawl-ref/source/debug.cc at line 37 [10.4016436]
[12.10430]
[20.570]
```
#include "crash.h"
```

File addition: crash.h (----------)

[21.24]

/*
 *  File:       crash.h
 *  Summary:    Platform specific crash handling functions.
 *  Written by: Matthew cline
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
 */
#ifndef CRASH_H
#define CRASH_H
#include <stdio.h>
void init_crash_handler();
void dump_crash_info(FILE* file);
void write_stack_trace(FILE* file, int ignore_count);
#endif

File addition: crash-w.cc (----------)

[21.24]

/*
 *  File:       crash-w.cc
 *  Summary:    Windows specific crash handling functions.
 *  Written by: ??
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
 */
#include "AppHdr.h"
REVISION("$Rev$");
#include "crash.h"
void init_crash_handler()
{
}
void dump_crash_info(FILE* file)
{
}
void write_stack_trace(FILE* file, int ignore_count)
{
}

File addition: crash-u.cc (----------)

[21.24]

/*
 *  File:       crash-u.cc
 *  Summary:    UNIX specific crash handling functions.
 *  Written by: Matthew Cline
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
 */
#include "AppHdr.h"
REVISION("$Rev$");
#ifdef USE_UNIX_SIGNALS
#include <signal.h>
#endif
#ifdef __GLIBC__
#include <execinfo.h>
#endif
#include "crash.h"
#include "externs.h"
#include "state.h"
#include "initfile.h"
/////////////////////////////////////////////////////////////////////////////
// Code for printing out debugging info on a crash.
////////////////////////////////////////////////////////////////////////////
static int _crash_signal    = 0;
static int _recursion_depth = 0;
static void _crash_signal_handler(int sig_num)
{
    if (crawl_state.game_crashed)
    {
        if (_recursion_depth > 0)
            return;
        _recursion_depth++;
        fprintf(stderr, "Recursive crash." EOL);
        std::string dir = (!Options.morgue_dir.empty() ? Options.morgue_dir :
                           !SysEnv.crawl_dir.empty()   ? SysEnv.crawl_dir
                                                       : "");
        if (!dir.empty() && dir[dir.length() - 1] != FILE_SEPARATOR)
            dir += FILE_SEPARATOR;
        char name[180];
        sprintf(name, "%scrash-recursive-%s-%d.txt", dir.c_str(),
                you.your_name, (int) time(NULL));
        FILE* file = fopen(name, "w");
        if (file == NULL)
            file = stderr;
        write_stack_trace(file, 0);
        if (file != stderr)
            fclose(file);
        return;
    }
    _crash_signal            = sig_num;
    crawl_state.game_crashed = true;
    // In case the crash dumper is unable to open a file and has to dump
    // to stderr.
#ifndef USE_TILE
    unixcurses_shutdown();
#endif
    do_crash_dump();
    // Now crash for real.
    signal(sig_num, SIG_DFL);
    raise(sig_num);
}
void init_crash_handler()
{
#if defined(USE_UNIX_SIGNALS)
    for (int i = 1; i <= 64; i++)
    {
#ifdef SIGHUP_SAVE
        if (i == SIGHUP)
            continue;
#endif
#ifdef SIGQUIT
        if (i == SIGQUIT)
            continue;
#endif
#ifdef SIGINT
        if (i == SIGINT)
            continue;
#endif
#ifdef SIGCHLD
        if (i == SIGCHLD)
            continue;
#endif
#ifdef SIGTSTP
        if (i == SIGTSTP)
            continue;
#endif
#ifdef SIGCONT
        if (i == SIGCONT)
            continue;
#endif
#ifdef SIGIO
        if (i == SIGIO)
            continue;
#endif
#ifdef SIGPROF
        if (i == SIGPROF)
            continue;
#endif
        if (i == SIGWINCH)
            continue;
        signal(i, _crash_signal_handler);
    }
#endif // if defined(USE_UNIX_SIGNALS)
}
void dump_crash_info(FILE* file)
{
    const char *name = strsignal(_crash_signal);
    if (name == NULL)
        name = "INVALID";
    fprintf(file, "Crash caused by signal #%d: %s" EOL, _crash_signal,
            name);
}
#ifdef __GLIBC__
// NOTE: This should work on OS X, according to
// http://developer.apple.com/DOCUMENTATION/DARWIN/Reference/ManPages/man3/backtrace_symbols.3.html
void write_stack_trace(FILE* file, int ignore_count)
{
    void* frames[50];
    int num_frames = backtrace(frames, ARRAYSZ(frames));
    char **symbols = backtrace_symbols(frames, num_frames);
    if (symbols == NULL)
    {
        fprintf(stderr, "Out of memroy." EOL);
        fprintf(file,   "Out of memory." EOL);
        // backtrace_symbols_fd() can print out the stack trace even if
        // malloc() can't find any free memory.
        backtrace_symbols_fd(frames, num_frames, fileno(file));
        return;
    }
    for (int i = ignore_count; i < num_frames; i++)
    {
        fprintf(file, "%s" EOL, symbols[i]);
    }
    free(symbols);
}
#else // ifdef __GLIBC__
void write_stack_trace(FILE* file, int ignore_count)
{
    const char* msg = "Unable to get stack trace on this platform." EOL;
    fprintf(stderr, msg);
    fprintf(file, msg);
}
#endif

File addition: crash-d.cc (----------)

[21.24]

/*
 *  File:       crash-d.cc
 *  Summary:    Dos specific crash handling functions.
 *  Written by: ??
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
 */
#include "AppHdr.h"
REVISION("$Rev$");
#include "crash.h"
void init_crash_handler()
{
}
void dump_crash_info(FILE* file)
{
}
void write_stack_trace(FILE* file, int ignore_count)
{
}

Insertion in crawl-ref/source/acr.cc at line 54 [10.4397395]
[10.4400009]
[22.46859]
```
#include "crash.h"
```

Put platform dependant crash handling code into crash-X.cc files, and link

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/makefile_tiles.unix at line 13 [7.5756330]

Replacement in crawl-ref/source/makefile_tiles.mgw at line 83 [7.5750607]

Replacement in crawl-ref/source/makefile.unix at line 13 [8.604320]

Replacement in crawl-ref/source/makefile.mgw at line 58 [9.272908]

Replacement in crawl-ref/source/makefile.dos at line 51 [10.2452375]

Deletion in crawl-ref/source/libw32c.h at line 63 [10.2475780]

Deletion in crawl-ref/source/libw32c.cc at line 1149 [10.2476860]

Deletion in crawl-ref/source/libunix.h at line 70 [10.2548819]

Deletion in crawl-ref/source/libunix.cc at line 73 [10.2550041]

Deletion in crawl-ref/source/libunix.cc at line 1138 [10.2550041]

Deletion in crawl-ref/source/libunix.cc at line 1139 [10.2550041]

Deletion in crawl-ref/source/libunix.cc at line 1141 [10.2550041]

Deletion in crawl-ref/source/libunix.cc at line 1142 [10.2550041]

Deletion in crawl-ref/source/libgui.h at line 75 [7.5789586]

Deletion in crawl-ref/source/libgui.cc at line 418 [7.5793336]

Deletion in crawl-ref/source/libdos.h at line 47 [8.630690]

Deletion in crawl-ref/source/libdos.cc at line 140 [8.630803]

Insertion in crawl-ref/source/debug.cc at line 37 [10.4016436]

File addition: crash.h (----------)

File addition: crash-w.cc (----------)

File addition: crash-u.cc (----------)

File addition: crash-d.cc (----------)

Insertion in crawl-ref/source/acr.cc at line 54 [10.4397395]